Merge lp:~openerp-dev/openobject-addons/trunk-opw-576964-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

Issue: -
Problem occurs for Supplier invoice line, when invoice line form has previously filled Unit Price
and we change product then Unit Price is not updated with the cost price. It remains same for
all the products. It works fine for customer invoice.

Steps to reproduce:
1. Create a Supplier invoice
2. Select any product , Unit Price will be 300(cost price of product)
3. Now, select another product, Unit Price should be different (like -500) but it remains same.

-Code is forward port from 6.1

Thanks,
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

I think the current behaviour is correct (s aupplier price is usually provided by the supplier and recorded manually, rather than coming from your own db)

review: Disapprove

[Naresh(OpenERP) (nch-openerp)]

The problem is not about inputting the unit price but the problem is when a user changes the product and the unit price doesn't change.

for eg:

I select a product say PC with unit price 500 Euro then I decided to change the product to keyboard so changing pc--> keyboard doent change the unit price to keyboards price(250 Euro) but keeps the old price i.e of the PC(500 Euro).

@ Fabien : can you please recheck this ?

Thanks,
Naresh

review: Needs Resubmitting

Unmerged revisions

7953. By Mayur Maheshwari(OpenERP) on 2012-11-05

[FIX]account:improved some code for price_unit

7952. By Rifakat (OpenERP) on 2012-11-05

[FIX]account:reverted Unit Price to 0.0 when we remove product from invoice line, reverted back to default value for Unit Price and domain

7951. By Launchpad Translations on behalf of openerp on 2012-11-04

Launchpad automatic translations update.

7950. By Fabien (Open ERP) on 2012-11-03

[MERGE] fix multi-company for pos

7949. By Fabien (Open ERP) on 2012-11-03

[FIX] bug pos

7948. By Fabien (Open ERP) on 2012-11-03

[FIX] POS close session without cash register

7947. By Fabien (Open ERP) on 2012-11-03

[MERGE] trunk

7946. By Fabien (Open ERP) on 2012-11-03

[FIX] POS

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-11-02 09:21:06 +0000
+++ account/account_invoice.py	2012-11-05 11:41:50 +0000
@@ -1417,10 +1417,7 @@
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
-            if type in ('in_invoice', 'in_refund'):
-                return {'value': {}, 'domain':{'product_uom':[]}}
-            else:
-                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
+            return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         fpos_obj = self.pool.get('account.fiscal.position')
         fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
@@ -1449,7 +1446,7 @@
         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} )
+            result.update( {'price_unit': 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