merge

bzr revid: nel@silver-20080909141933-0ulernirfc3vemya

diff --cc addons/stock/stock.py
Simple merge

diff --cc addons/stock/stock_view.xml
index 5293bec,c826d1c..6f8acfa
--- 1/addons/stock/stock_view.xml
--- 2/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@@ -459,13 -472,13 +472,13 @@@
              <field name="type">tree</field>
              <field name="arch" type="xml">
                  <tree color="red:state=='cancel'" string="Packing list">
-                     <field colspan="4" name="name" select="1"/>
+                     <field name="name"/>
 -                    <field name="date"/>
 -                    <field name="address_id"/>
 +                    <field name="address_id" select="1"/>
-                     <field name="invoice_state" readonly="1"/>
-                     <field name="origin" select="1"/>
-                     <field name="state" readonly="1"/>
+                     <field name="invoice_state"/>
+                     <field name="origin"/>
+                     <field name="backorder_id"/>
 -                    <field name="state"/>
 +                   <field name="min_date" select="1"/>
 +                   <field name="max_date" select="1"/>
                  </tree>
              </field>
          </record>
@@@ -477,19 -490,14 +490,19 @@@
                  <form string="Packing list">
                      <notebook>
                          <page string="General Information">
-                             <field name="name" select="1"/>
-                             <field name="address_id" select="2" context="{'context_display':'partner'}"/>
-                             <field name="type" select="2" readonly="1"/>
-                             <field name="name" select="1" readonly="1"/>
-                             <field name="date" select="1"/>
+                             <group colspan="4" col="6">
+                                 <field name="address_id" select="2" context="{'context_display':'partner'}"/>
+                                 <field name="type"/>
+                                 <field name="name"/>
+                                 <field name="date"/>
 -                                <field name="backorder_id"/>
 -                            </group>
 +                            <field name="type" select="2"/>
 +                            <field name="invoice_state" select="2"/>
                              <newline/>
 +                                 <field name="min_date" select="1"/>
 +                                 <field name="max_date" select="1"/>
 +                            <field name="location_id"/>
 +                            <field name="location_dest_id"/>
 +                            <field name="address_id" select="2"/>
                              <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
                                  <form string="Stock Moves">
                                      <separator colspan="4" string="Move Information"/>
@@@ -557,12 -565,12 +570,11 @@@
              <field name="type">tree</field>
              <field name="arch" type="xml">
                  <tree color="red:state=='cancel'" string="Packing list">
-                     <field colspan="4" name="name" select="1"/>
+                     <field name="name"/>
 -                    <field name="date"/>
 -                    <field name="address_id"/>
 +                    <field name="address_id" select="1"/>
-                     <field name="origin" select="1"/>
+                     <field name="origin"/>
 -                    <field name="backorder_id"/>
 -                    <field name="state"/>
 +                   <field name="min_date" select="1"/>
 +                   <field name="max_date" select="1"/>
-                     <field name="state" readonly="1"/>
                  </tree>
              </field>
          </record>
@@@ -572,12 -580,13 +584,13 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Packing list">
 -                    <group colspan="4" col="6">
 -                        <field name="address_id" select="2" context="{'context_display':'partner'}"/>
 -                        <field name="origin" select="2"/>
 -                        <field name="name" select="1" readonly="1"/>
 -                        <field name="date" select="1" readonly="1"/>
 +                    <field name="name" select="1"/>
 +                    <field name="date" select="1"/>
 +                          <field name="min_date" select="1"/>
 +                          <field name="max_date" select="1"/>
 +                    <newline/>
-                     <field name="address_id" select="2"/>
+                         <field name="backorder_id" select="2"/>
+                     </group>
                      <notebook colspan="4">
                          <page string="General Information">
                              <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@@ -713,14 -722,13 +726,13 @@@
              <field name="type">tree</field>
              <field name="arch" type="xml">
                  <tree color="red:state=='cancel'" string="Packing list">
-                     <field colspan="4" name="name" select="1"/>
+                     <field name="name"/>
 -                    <field name="date"/>
 -                    <field name="address_id"/>
 -                    <field name="invoice_state"/>
 -                    <field name="origin"/>
 +                   <field name="min_date" select="1"/>
 +                   <field name="max_date" select="1"/>
 +                    <!--field name="date" select="1"/-->
 +                    <field name="address_id" select="1"/>
-                     <field name="invoice_state" readonly="1"/>
-                     <field name="origin" select="1"/>
-                     <field name="state" readonly="1"/>
+                     <field name="backorder_id"/>
+                     <field name="state"/>
                  </tree>
              </field>
          </record>
@@@ -730,11 -738,13 +742,13 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Packing list">
 -                    <group colspan="4" col="6">
 -                        <field name="address_id" select="2" context="{'context_display':'partner'}"/>
 -                        <field name="date" select="1" readonly="1"/>
 -                        <field name="origin" select="2"/>
 -                        <field name="name" select="1" readonly="1"/>
 +                    <field name="name" select="1"/>
 +                    <field name="address_id" select="2"/>
 +                    <newline/>
 +                   <field name="min_date" select="1"/>
 +                   <field name="max_date" select="1"/>
+                         <field name="backorder_id" select="2"/>
+                     </group>
                      <notebook colspan="4">
                          <page string="General Information">
                              <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
@@@ -868,11 -878,11 +882,12 @@@
              <field name="arch" type="xml">
                  <tree color="red:state=='cancel'" string="Packing list">
                      <field colspan="4" name="name" select="1"/>
 -                    <field name="date" select="1"/>
 -                    <field name="address_id" select="1" context="{'context_display':'partner'}"/>
 +                   <field name="min_date" select="1"/>
 +                   <field name="max_date" select="1"/>
 +                    <field name="address_id" select="1"/>
                      <field name="invoice_state" readonly="1"/>
                      <field name="origin" select="1"/>
+                     <field name="backorder_id" select="2"/>
                      <field name="state" readonly="1"/>
                  </tree>
              </field>
@@@ -883,16 -893,13 +898,17 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Input Packing List">
-                     <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'context_display':'partner'}"/>
-                     <field name="origin" select="2"/>
-                     <field name="invoice_state" select="2" string="Invoice Control"/>
-                     <field name="name" readonly="1" select="1"/>
+                     <group colspan="4" col="6">
+                         <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'context_display':'partner'}"/>
+                         <field name="origin" select="2"/>
+                         <field name="invoice_state" select="2" string="Invoice Control"/>
+                         <field name="name" readonly="1" select="1"/>
 -                        <field name="backorder_id" select="2"/>
 -                    </group>
 +                    <field name="location_id"/>
 +                    <field domain="[('usage','=','internal')]" name="location_dest_id"/>
 +                    <field name="invoice_state" select="2" string="Supplier Invoice Control"/>
 +                    <field name="origin" select="2"/>
 +                   <field name="min_date" select="1"/>
 +                   <field name="max_date" select="1"/>
                      <notebook colspan="4">
                          <page string="General Information">
                              <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">