Merge lp:~vauxoo/openobject-addons/7.0-purchase_requisition-add_name-dev-moylop260 into lp:openobject-addons/7.0

[Moisés López - http://www.vauxoo.com]

Add name to purchase requisition line for add a particular description

[Yanina Aular (Vauxoo) (yanina-aular)]

Hey guys, I need this change, will it be possible to merge right now?

Unmerged revisions

9190. By Moisés López - http://www.vauxoo.com on 2013-06-01

[IMP][purchase_requisition] Add name & add required to product_id

=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py	2012-12-20 11:47:30 +0000
+++ purchase_requisition/purchase_requisition.py	2013-06-01 08:44:27 +0000
@@ -152,7 +152,7 @@
                 taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
                 purchase_order_line.create(cr, uid, {
                     'order_id': purchase_id,
-                    'name': product.partner_ref,
+                    'name': line.name,
                     'product_qty': qty,
                     'product_id': product.id,
                     'product_uom': default_uom_po_id,
@@ -168,10 +168,10 @@
 
     _name = "purchase.requisition.line"
     _description="Purchase Requisition Line"
-    _rec_name = 'product_id'
 
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product' ),
+        'name': fields.text('Description', required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
@@ -187,9 +187,12 @@
         value = {'product_uom_id': ''}
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            value = {'product_uom_id': prod.uom_id.id,'product_qty':1.0}
+            prod_name = prod.name_get()[0][1]
+            if prod.description_purchase:
+                prod_name += '\n' + prod.description_purchase
+            value = {'product_uom_id': prod.uom_id.id, 'product_qty':1.0, 'name': prod_name}
         return {'value': value}
-
+        
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition.line', context=c),
     }

=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml	2013-02-25 13:38:04 +0000
+++ purchase_requisition/purchase_requisition_view.xml	2013-06-01 08:44:27 +0000
@@ -63,12 +63,14 @@
                         <field name="line_ids">
                             <tree string="Products" editable="bottom">
                                 <field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
+                                <field name="name"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom_id" groups="product.group_uom"/>
                             </tree>
                             <form string="Products" version="7.0">
                                 <group>
                                     <field name="product_id" />
+                                    <field name="name"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom_id" />
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>