Merge pull request #4069 from expsa/maz_purchace_

Maz purchace

odex25_purchase/odex25_purchase_coc/models/models.py

@@ -62,7 +62,6 @@ class PurchaseOrderLine(models.Model):
     _inherit = 'purchase.order.line'
 
     coc_id = fields.Many2one('purchase.coc')
-    description = fields.Text(string="Order description")
     name = fields.Text(string='Product description')
 
 

odex25_purchase/odex25_purchase_coc/views/views.xml

@@ -12,9 +12,6 @@
             <field name="coc_ids" invisible="1"/>
           </button>
         </xpath>
-         <xpath expr="//field[@name='order_line']/tree//field[@name='name']" position="after">
-             <field name="description"/>
-         </xpath>
         <xpath expr="//field[@name='company_id']" position="after">
           <!-- <field name="need_coc"/>  -->
           <!-- <field name="coc_id" readonly="1"/>    -->

odex25_purchase/purchase_requisition_custom/models/purchase_order.py

@@ -935,6 +935,7 @@ class PurchaseOrderLineCustom(models.Model):
     choosen = fields.Boolean(string='Purchase', default=True)
     department_name = fields.Many2one("hr.department", string="Department Name")
     date_end = fields.Date(string="Date End")
+    description = fields.Text(string="Order description")
 
     def _create_stock_moves(self, picking):
         '''

odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml

@@ -298,6 +298,10 @@
                             attrs="{'invisible':[('state','in',('done','cancel','waiting', 'sign','purchase'))]}"
                             string="Choose All"/>
                 </xpath>
+
+                <xpath expr="//field[@name='order_line']/tree//field[@name='name']" position="after">
+                    <field name="description"/>
+                </xpath>
                 <!-- delete Purchase Order-->
                 <xpath expr="//form//notebook//page//field//tree" position="attributes">
                     <attribute name="delete">true</attribute>