From 8fc5d631b9108bbcec7635d7b0278a08baa856a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Fri, 7 Feb 2025 16:25:03 +0100
Subject: [PATCH] Add quotation expiration date to purchase

---
 modules/purchase/CHANGELOG              |  1 +
 modules/purchase/purchase.py            |  5 +++++
 modules/purchase/view/purchase_form.xml | 24 +++++++++++++++---------
 modules/purchase/view/purchase_tree.xml |  1 +
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/modules/purchase/CHANGELOG b/modules/purchase/CHANGELOG
index c43674c923..09708de0eb 100644
--- a/modules/purchase/CHANGELOG
+++ b/modules/purchase/CHANGELOG
@@ -1,3 +1,4 @@
+* Add quotation expiration date
 
 Version 7.4.0 - 2024-11-04
 --------------------------
diff --git a/modules/purchase/purchase.py b/modules/purchase/purchase.py
index ac2fc25b46..3c0955e72c 100644
--- a/modules/purchase/purchase.py
+++ b/modules/purchase/purchase.py
@@ -89,6 +89,11 @@ class Purchase(
     number = fields.Char("Number", readonly=True)
     reference = fields.Char("Reference")
     description = fields.Char('Description', size=None, states=_states)
+    quotation_expire = fields.Date(
+        "Quotation Expire",
+        states={
+            'invisible': ~Eval('state').in_(['draft', 'quotation']),
+            })
     purchase_date = fields.Date('Purchase Date',
         states={
             'readonly': ~Eval('state').in_(['draft', 'quotation']),
diff --git a/modules/purchase/view/purchase_form.xml b/modules/purchase/view/purchase_form.xml
index 5604e30ff0..1481998852 100644
--- a/modules/purchase/view/purchase_form.xml
+++ b/modules/purchase/view/purchase_form.xml
@@ -18,18 +18,23 @@ this repository contains the full copyright notices and license terms. -->
     <label name="reference"/>
     <field name="reference"/>
     <notebook colspan="6">
-        <page string="Purchase" id="purchase">
+        <page string="Purchase" id="purchase" col="6">
             <label name="purchase_date"/>
             <field name="purchase_date"/>
             <label name="payment_term"/>
             <field name="payment_term"/>
-            <label name="warehouse"/>
-            <field name="warehouse"/>
             <label name="currency"/>
             <field name="currency"/>
-            <field name="lines" colspan="4"
-                view_ids="purchase.purchase_line_view_tree_sequence"/>
-            <group col="2" colspan="2" id="states" yfill="1">
+
+            <label name="warehouse"/>
+            <field name="warehouse"/>
+            <label name="delivery_date"/>
+            <field name="delivery_date"/>
+            <label name="quotation_expire"/>
+            <field name="quotation_expire"/>
+
+            <field name="lines" colspan="6" view_ids="purchase.purchase_line_view_tree_sequence"/>
+            <group col="2" colspan="3" id="states" yfill="1">
                 <label name="invoice_state"/>
                 <field name="invoice_state"/>
                 <label name="shipment_state"/>
@@ -37,7 +42,7 @@ this repository contains the full copyright notices and license terms. -->
                 <label name="state"/>
                 <field name="state"/>
             </group>
-            <group col="2" colspan="2" id="amount" yfill="1">
+            <group col="2" colspan="3" id="amount" yfill="1">
                 <label name="untaxed_amount" xalign="1.0" xexpand="1" xfill="0"/>
                 <field name="untaxed_amount" xalign="1.0" xexpand="0"/>
                 <label name="tax_amount" xalign="1.0" xexpand="1" xfill="0"/>
@@ -51,10 +56,11 @@ this repository contains the full copyright notices and license terms. -->
             <field name="company"/>
             <label name="origin"/>
             <field name="origin"/>
+
             <label name="invoice_method"/>
             <field name="invoice_method"/>
-            <label name="delivery_date"/>
-            <field name="delivery_date"/>
+            <newline/>
+
             <label name="quoted_by"/>
             <field name="quoted_by"/>
             <label name="confirmed_by"/>
diff --git a/modules/purchase/view/purchase_tree.xml b/modules/purchase/view/purchase_tree.xml
index 5528c776ad..77cde61ac4 100644
--- a/modules/purchase/view/purchase_tree.xml
+++ b/modules/purchase/view/purchase_tree.xml
@@ -5,6 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="company" expand="1" optional="1"/>
     <field name="number" expand="1"/>
     <field name="reference" expand="1" optional="0"/>
+    <field name="quotation_expire" optional="1"/>
     <field name="purchase_date" optional="0"/>
     <field name="party" expand="2"/>
     <field name="warehouse" optional="1"/>