From ddcb8ad09fc4e673f18bb2b31d08c632fea824ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 18 Dec 2017 19:05:18 +0100
Subject: [PATCH] Make description on purchase requisition line optional

issue6860
review38971002
---
 CHANGELOG                                        |  4 +++-
 purchase.py                                      | 10 ++--------
 view/purchase_requisition_line_form.xml          |  4 ++--
 view/purchase_requisition_line_list.xml          |  1 -
 view/purchase_requisition_line_list_sequence.xml |  1 -
 view/purchase_requisition_tree.xml               |  1 -
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c3296443ea..55d90fa6aa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Make description on purchase requisition line optional
+
 Version 4.6.0 - 2017-10-30
 * Bug fixes (see mercurial logs for details)
 
@@ -5,4 +7,4 @@ Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
 
 Version 4.2.0 - 2016-11-28
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/purchase.py b/purchase.py
index a267a83ef6..12c7cad433 100644
--- a/purchase.py
+++ b/purchase.py
@@ -423,13 +423,7 @@ class PurchaseRequisitionLine(sequence_ordered(), ModelSQL, ModelView):
             ('purchasable', '=', True),
             ],
         states=_states, depends=_depends)
-    description = fields.Text(
-        'Description',
-        states={
-            'readonly': _states['readonly'],
-            'required': ~Eval('product')
-            },
-        depends=['product'] + _depends)
+    description = fields.Text("Description", states=_states, depends=_depends)
     quantity = fields.Float(
         'Quantity', digits=(16, Eval('unit_digits', 2)), required=True,
         states=_states, depends=['unit_digits'] + _depends)
@@ -470,7 +464,7 @@ class PurchaseRequisitionLine(sequence_ordered(), ModelSQL, ModelView):
         if self.requisition:
             return self.requisition.state
 
-    @fields.depends('product', 'unit', 'quantity', 'description', 'supplier')
+    @fields.depends('product', 'unit', 'quantity', 'supplier')
     def on_change_product(self):
         if not self.product:
             return
diff --git a/view/purchase_requisition_line_form.xml b/view/purchase_requisition_line_form.xml
index 6631d62918..efe99e59db 100644
--- a/view/purchase_requisition_line_form.xml
+++ b/view/purchase_requisition_line_form.xml
@@ -12,8 +12,6 @@ this repository contains the full copyright notices and license terms. -->
             <field name="product" view_ids="purchase.product_view_list_purchase_line"/>
             <label name="supplier"/>
             <field name="supplier"/>
-            <label name="description"/>
-            <field name="description" colspan="3" yexpand="0"/>
             <label name="quantity"/>
             <field name="quantity"/>
             <label name="unit"/>
@@ -22,6 +20,8 @@ this repository contains the full copyright notices and license terms. -->
             <field name="unit_price"/>
             <label name="amount"/>
             <field name="amount"/>
+            <separator name="description" colspan="4"/>
+            <field name="description" colspan="4"/>
         </page>
     </notebook>
 </form>
diff --git a/view/purchase_requisition_line_list.xml b/view/purchase_requisition_line_list.xml
index dfcc2c5e92..d35555ff24 100644
--- a/view/purchase_requisition_line_list.xml
+++ b/view/purchase_requisition_line_list.xml
@@ -5,7 +5,6 @@ this repository contains the full copyright notices and license terms. -->
     <field name="requisition"/>
     <field name="product"/>
     <field name="supplier"/>
-    <field name="description"/>
     <field name="quantity"/>
     <field name="unit"/>
     <field name="unit_price"/>
diff --git a/view/purchase_requisition_line_list_sequence.xml b/view/purchase_requisition_line_list_sequence.xml
index 3e1779851d..c2b54c2d20 100644
--- a/view/purchase_requisition_line_list_sequence.xml
+++ b/view/purchase_requisition_line_list_sequence.xml
@@ -5,7 +5,6 @@ this repository contains the full copyright notices and license terms. -->
     <field name="requisition"/>
     <field name="product"/>
     <field name="supplier"/>
-    <field name="description"/>
     <field name="quantity"/>
     <field name="unit"/>
     <field name="unit_price"/>
diff --git a/view/purchase_requisition_tree.xml b/view/purchase_requisition_tree.xml
index d8ebd1be7b..5e9af1e08a 100644
--- a/view/purchase_requisition_tree.xml
+++ b/view/purchase_requisition_tree.xml
@@ -4,7 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="number"/>
     <field name="supply_date"/>
-    <field name="description"/>
     <field name="employee"/>
     <field name="warehouse"/>
     <field name="total_amount"/>