Saurang Suthar(OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-addons14_warehouse_issue-ssu into 
lp:openobject-addons.

Requested reviews:
  Purnendu Singh (OpenERP) (psi-tinyerp)
  Saurang Suthar(OpenERP) (ssu-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons14_warehouse_issue-ssu/+merge/128187

Hello sir,

I have fixed the issue of "Can be Sold", "Can be Purchased", "Event 
Subscription", "Can Constitute an Expense" fields displays in proper line in 
product form in warehouse.

Kindly review it.

Thank you.
  SSU
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons14_warehouse_issue-ssu/+merge/128187
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-addons14_warehouse_issue-ssu.
=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml	2012-10-03 13:14:14 +0000
+++ event_sale/event_sale_view.xml	2012-10-12 12:51:26 +0000
@@ -6,9 +6,11 @@
              <field name="model">product.product</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
-                <div name="options" position="inside">
+                <div>
+                <xpath expr="//field[@name='sale_ok']" position="after">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                     <label for="event_ok"/>
+                </xpath>
                 </div>
                 <field name='default_code' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2012-10-10 20:38:18 +0000
+++ hr_expense/hr_expense_view.xml	2012-10-12 12:51:26 +0000
@@ -196,10 +196,10 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <div name="options" position="inside">
+                <xpath expr="//field[@name='sale_ok']" position="before">
                     <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
                     <label for="hr_expense_ok"/>
-                </div>
+                </xpath>
             </field>
         </record>
 

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2012-10-11 17:13:28 +0000
+++ purchase/purchase_view.xml	2012-10-12 12:51:26 +0000
@@ -591,9 +591,11 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <div name="options" position="inside">
+                <div>
+                <xpath expr="//field[@name='sale_ok']" position="after">
                     <field name="purchase_ok"/>
                     <label for="purchase_ok"/>
+                </xpath>
                 </div>
                 <group name="procurement" position="after">
                      <separator string="Suppliers"/>

_______________________________________________
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

Reply via email to