[Openerp-dev-gtk] [Merge] lp:~openerp-dev/openobject-addons/7.0-bug-1095753-hip into lp:openobject-addons/7.0

[Hiral Patel (OpenERP)]

Hiral Patel (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/7.0-bug-1095753-hip into 
lp:openobject-addons/7.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #1095753 in OpenERP Addons: "[trunk/7.0][sale] sale order shouldn't 
propose MTS when stock module not installed"
  https://bugs.launchpad.net/openobject-addons/+bug/1095753

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1095753-hip/+merge/142648
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-bug-1095753-hip/+merge/142648
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/7.0-bug-1095753-hip.

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2012-12-26 14:25:24 +0000
+++ sale/sale_view.xml	2013-01-10 08:45:26 +0000
@@ -204,7 +204,7 @@
                                         </group>
                                         <group>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <field name="type"/>
+                                            <field name="type" invisible="1"/>
                                             <field name="th_weight"/>
                                             <!-- we should put a config wizard for these two fields -->
                                             <field name="address_allotment_id"/>

=== modified file 'sale_stock/sale_stock_view.xml'
--- sale_stock/sale_stock_view.xml	2012-11-30 12:42:52 +0000
+++ sale_stock/sale_stock_view.xml	2013-01-10 08:45:26 +0000
@@ -84,6 +84,9 @@
                        <label for="move_ids"/>
                        <field name="move_ids" widget="many2many"/>
                    </xpath>
+                   <xpath expr="//field[@name='type']" position="replace">
+                        <field name="type"/>
+                   </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='sequence']" position="after">
                        <field name="delay" invisible="1"/>
                    </xpath>


_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp