Merge lp:~openerp-dev/openobject-addons/7.0-bug-1205717-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of description in product_id_change, description_sale should be copied to customer invoice line and description_purchase should be copied to supplier invoice line.

Demo: Account -> Customer Invoice/Supplier Invoice -> Add Invoice line, Description field will having value of product.description field(product.code + product.name + product.description), it should be product.description_sale for customer invoice line and product.description_purchase for supplier invoice line.

Back-ported from trunk.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Schema changes in stable will not be merged. This has already been improved in trunk at 8743 with revision info:<email address hidden>. So I would close this merge proposal.

Thanks,

[Naresh(OpenERP) (nch-openerp)]

sorry my bad its not schema changes but however the sales and purchase order should be improved too to get the related sales and purchase description.

[Naresh(OpenERP) (nch-openerp)]

I mean the product.description

[Naresh(OpenERP) (nch-openerp)]

review: Needs Information

[Naresh(OpenERP) (nch-openerp)]

Ok there is already a merge proposal available for my last comment
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-603905-dhs/+merge/206345

So this seems good and can be merged.

Thanks,

review: Approve

Unmerged revisions

9842. By Mohammed Shekha(OpenERP)<email address hidden> on 2014-02-14

[FIX]Account: Fixed the issue of description in product_id_change, description_sale should be copied to customer invoice line and description_purchase should be copied to supplier invoice line.

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2014-02-05 10:03:24 +0000
+++ account/account_invoice.py	2014-02-14 13:02:58 +0000
@@ -1495,21 +1495,23 @@
         if a:
             result['account_id'] = a
 
+        result['name'] = res.partner_ref
         if type in ('out_invoice', 'out_refund'):
             taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+            if res.description_sale:
+                result['name'] += '\n'+res.description_sale
         else:
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+            if res.description_purchase:
+                result['name'] += '\n'+res.description_purchase
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-        result['name'] = res.partner_ref
 
         result['uos_id'] = uom_id or res.uom_id.id
-        if res.description:
-            result['name'] += '\n'+res.description
 
         domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]}
 

=== modified file 'product/product.py'
--- product/product.py	2013-09-09 14:04:14 +0000
+++ product/product.py	2014-02-14 13:02:58 +0000
@@ -296,9 +296,14 @@
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager'),
-        'description': fields.text('Description',translate=True),
-        'description_purchase': fields.text('Purchase Description',translate=True),
-        'description_sale': fields.text('Sale Description',translate=True),
+        'description': fields.text('Description',translate=True, 
+            help="A precise description of the Product, used only for internal information purposes."),
+        'description_purchase': fields.text('Purchase Description',translate=True,
+            help="A description of the Product that you want to communicate to your customers. "
+                 "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
+        'description_sale': fields.text('Sale Description',translate=True,
+            help="A description of the Product that you want to communicate to your suppliers. "
+                 "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."),
         'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
         'rental': fields.boolean('Can be Rent'),