openerp-dev-web team mailing list archive

["sus\(OpenERP\)" <sus@xxxxxxxxxxx>]

sus(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/sus-dev-addons-widget into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #680902 routing field should be widget =m2o, no selection
  https://bugs.launchpad.net/bugs/680902


Remove widget=selection from filed routing_id (mrp.production.form) from mrp/mrp_view.xml.
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/sus-dev-addons-widget/+merge/41831
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/sus-dev-addons-widget into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2010-11-22 18:13:26 +0000
+++ mrp/mrp_view.xml	2010-11-25 07:34:55 +0000
@@ -582,9 +582,15 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
+<<<<<<< TREE
                             <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
                             <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+=======
+                            <field name="routing_id" groups="base.group_extended" select="1"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)" widget="selection"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+>>>>>>> MERGE-SOURCE
                             <separator string="" colspan="4"/>
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
@@ -720,8 +726,8 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='9' colspan='4'>
-                       <filter icon="terp-document-new" string="Draft"
-                           domain="[('state','=','draft')]"
+                       <filter icon="terp-document-new" string="Ready"
+                           domain="[('state','=','ready')]"
                            help="Non confirmed manufacturing orders"/>
                        <filter icon="terp-check" string="Current" name="current"
                            default="1"