[IMP]: resolved all conflicts

[odoo/odoo.git] / addons / stock / stock_view.xml

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 30c26bd..2b3e4ee 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -908,12 +908,12 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
+                    <field name="partner_id"/>
                     <field name="origin"/>
-                    <field name="date"/>
                     <field name="min_date"/>
                     <field name="backorder_id"/>
+                    <field name="stock_journal_id"/>
                     <field name="invoice_state"/>
-                    <field name="stock_journal_id" widget="selection"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -1027,6 +1027,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
+                    <field name="partner_id"/>
                     <field name="backorder_id"/>
                     <field name="origin"/>
                     <field name="date"/>