Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-usability_fixes-mma into
lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind.
Requested reviews:
OpenERP's Framework R&D (openerp-dev-framework)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability_fixes-mma/+merge/78207
Hello,
improve all usability issue of bug qualification event from server
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability_fixes-mma/+merge/78207
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2011-10-05 06:53:56 +0000
+++ openerp/addons/base/ir/ir.xml 2011-10-05 07:13:25 +0000
@@ -961,7 +961,11 @@
<group expand="0" string="Group By...">
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_extended"/>
+<<<<<<< TREE
<filter string="Company" help="Group by Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+=======
+ <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+>>>>>>> MERGE-SOURCE
<separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
</group>
=== modified file 'openerp/addons/base/publisher_warranty/publisher_warranty_view.xml'
--- openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2011-04-19 13:11:54 +0000
+++ openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2011-10-05 07:13:25 +0000
@@ -22,25 +22,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Publisher Warranty Contract">
- <group col="3" colspan="4">
- <group col="2">
+ <group >
+ <group col="4">
<field name="name"/>
- </group>
- <group col="2">
+ <field name="kind"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="check_support"/>
- </group>
- <group col="2">
+ <field name="check_opw"/>
<field name="state"/>
- <field name="kind"/>
- <field name="check_opw"/>
- </group>
- <group col="2" colspan="3">
- <button name="check_validity" icon="camera_test.png
-" string="Validate" type="object"
+ <button name="check_validity" icon="terp-camera_test" string="Validate" type="object"
attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/>
- <button name="check_validity" icon="camera_test.png" string="Refresh Validation Dates" type="object"
+ <button name="check_validity" icon="terp-camera_test" string="Refresh Validation Dates" type="object"
attrs="{'invisible':[('state','in',['unvalidated'])]}"/>
</group>
</group>
=== modified file 'openerp/addons/base/res/res_bank_view.xml'
--- openerp/addons/base/res/res_bank_view.xml 2011-08-28 00:13:14 +0000
+++ openerp/addons/base/res/res_bank_view.xml 2011-10-05 07:13:25 +0000
@@ -69,8 +69,10 @@
<form string="Bank Account Type">
<field name="name"/>
<field name="code"/>
- <field name="field_ids" colspan="4"/>
- <field name="format_layout" colspan="4"/>
+ <separator colspan="4" string="Type fields"/>
+ <field name="field_ids" colspan="4" nolabel="1"/>
+ <separator colspan="4" string="Format Layout"/>
+ <field name="format_layout" colspan="4" nolabel="1"/>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/res/res_request_view.xml'
--- openerp/addons/base/res/res_request_view.xml 2011-09-11 13:25:14 +0000
+++ openerp/addons/base/res/res_request_view.xml 2011-10-05 07:13:25 +0000
@@ -187,7 +187,8 @@
<field name="act_to"/>
<field name="date_sent"/>
<newline/>
- <field colspan="4" name="body"/>
+ <separator colspan="4" string="Request"/>
+ <field colspan="4" name="body" nolabel="1"/>
</form>
</field>
</record>
=== modified file 'openerp/addons/base/res/wizard/partner_sms_send_view.xml'
--- openerp/addons/base/res/wizard/partner_sms_send_view.xml 2011-07-20 11:02:57 +0000
+++ openerp/addons/base/res/wizard/partner_sms_send_view.xml 2011-10-05 07:13:25 +0000
@@ -14,7 +14,7 @@
<field name="mobile_to"/>
<field name="app_id"/>
<field name="user"/>
- <field name="password"/>
+ <field name="password" password="True"/>
<separator string="Message" colspan="4" />
<field name="text" colspan="4" nolabel="1"/>
<separator string="" colspan="4" />
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
