Merge PR #102 into 12.0

Signed-off-by legalsylvain
grap · Nov 18, 2024 · 05b4122 · 05b4122
2 parents a009ab1 + 7a691a9
commit 05b4122
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/joint_buying_product/views/view_joint_buying_purchase_order.xml b/joint_buying_product/views/view_joint_buying_purchase_order.xml
@@ -35,7 +35,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                 <field name="customer_id" invisible="context.get('invisible_customer_id', False)"/>
                 <field name="start_date"/>
                 <field name="end_date" options="{'bg_color': 'orange: state == &quot;in_progress_near&quot;; red: state == &quot;in_progress_imminent&quot;'}"/>
-                <field name="deposit_date"/>
+                <field name="request_arrival_date"/>
                 <field name="total_weight" sum="Total Brut Weight"/>
                 <field name="amount_untaxed" sum="Total Amount Untaxed"/>
                 <field name="purchase_state" invisible="1"/>
@@ -220,7 +220,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="mode">primary</field>
         <field name="arch" type="xml">
             <xpath expr="//tree" position="attributes">
-                <attribute name="default_order">deposit_date desc, supplier_id</attribute>
+                <attribute name="default_order">request_arrival_date desc, supplier_id</attribute>
             </xpath>
         </field>
     </record>

diff --git a/joint_buying_product/views/view_joint_buying_purchase_order_grouped.xml b/joint_buying_product/views/view_joint_buying_purchase_order_grouped.xml
@@ -43,7 +43,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                 <field name="category_ids" widget="many2many_tags" string="Cat."/>
                 <field name="start_date"/>
                 <field name="end_date" options="{'bg_color': 'orange: state == &quot;in_progress_near&quot;; red: state == &quot;in_progress_imminent&quot;'}"/>
-                <field name="deposit_date"/>
                 <field name="entry_rate_description" string="Entry"/>
                 <field name="total_weight" sum="Total Brut Weight"/>
                 <field name="amount_untaxed" sum="Total Amount Untaxed"/>