Merge lp:~openerp-dev/openobject-addons/6.0-opw-6000-nep into lp:openobject-addons/6.0

[Nehal Panchal (OpenERP)]

Hello,

The price calculation based on the Unit Of Sale is corrected.

Thanks.

[lp:~openerp-dev/openobject-addons/6.0-opw-6000-nep]

4622. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the onchange methods for sale order line and invoice line(Ref : Case 5998)

4623. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[MERGE] Merged RGO's branch for the fix of Stock : Corrected _defaults for date/time fields

4624. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[FIX] Project_scrum/Purchase_requisition : Corrected _defaults for date/datetime values

4625. By Jay Vora (Serpent Consulting Services) on 2011-06-02

[FIX/REF] Minor but Important fixes

4626. By Launchpad Translations on behalf of openerp on 2011-06-02

Launchpad automatic translations update.

[Nehal Panchal (OpenERP) (nep-openerp)]

Hello,

There were few issues with sale and invoicing.

1.If UoS quantity is changed, UoM quantity will be as it is in sale order line.

2. Problem in subtotal, It should be based on UoS It was considering UoM.

3. Problem in Price calculation in Customer Invoice.

This fixes the issue.

Thanks.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-6000-nep]

4627. By Launchpad Translations on behalf of openerp on 2011-06-03

Launchpad automatic translations update.

4628. By Anup(SerpentCS) on 2011-06-03

[FIX] account_invoice_layout : Fixed the issue with the account in invoice lines when multicompany environment is used(Case:5805)

[Anup(SerpentCS) (anup-serpent)]

Hello Nehal,

   There are still some problems.

1. What if UoM->UoS ratio is not defined.
2. If Product UoS is greater than product_UoM the quantities are not respecting. Say for example UoM is PCE and UoS is Packet. Then The quantity remains the same. It should be divided by 4 as 1 Packet = 4 PCE.
3. Correct on_change method and consider UoM and UoM quantities too, UoM and UoS should vice versa.

Thanks.

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.0-opw-6000-nep]

4629. By Launchpad Translations on behalf of openerp on 2011-06-04

Launchpad automatic translations update.

4630. By Launchpad Translations on behalf of openerp on 2011-06-05

Launchpad automatic translations update.

4631. By Launchpad Translations on behalf of openerp on 2011-06-06

Launchpad automatic translations update.

4632. By Jay Vora (Serpent Consulting Services) on 2011-06-06

[FIX] account_followup: corrected the followup report getting called from wizard

4633. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[FIX] Backported the fix from trunk for the module Audittrail : audit_trail settings should be readable by everyone, not just the user in employee group

4634. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[MERGE] Merged from Parent branch

4635. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[MERGE] Merged Oliver Dony's branch for the fixes of share module

4636. By Mohammed Shekha(Open ERP) on 2011-06-07

[FIX] Domain should be in list.

[Nehal Panchal (OpenERP) (nep-openerp)]

Hello sir,

I have made the changes as per your suggestion.

Thanks.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-6000-nep]

4637. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[REVERTER] Reverted MSH's fix for share module

4638. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[MERGE] Merged the branch for the fix of hr_holidays

4639. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[MERGE] Merged Rifakat's branch to set the default security days as 0 for company

4640. By Jay Vora (Serpent Consulting Services) on 2011-06-07

[MERGE] Merged Stefan Rijnhart (Therp)' branch for the fix of journal creation from templates

4641. By Nehal Panchal (OpenERP) on 2011-06-08

[FIX] sale : Price calculation corrected based on unit of sale

[Nehal Panchal (OpenERP) (nep-openerp)]

Hello,

Fixed the problem of tax calculation in sale order line based on UoS.

Thanks.

review: Needs Resubmitting

Unmerged revisions

4641. By Nehal Panchal (OpenERP) on 2011-06-08

[FIX] sale : Price calculation corrected based on unit of sale

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-05-17 11:44:45 +0000
+++ sale/sale.py	2011-06-08 12:43:57 +0000
@@ -64,7 +64,7 @@
 
     def _amount_line_tax(self, cr, uid, line, context=None):
         val = 0.0
-        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uos_qty or line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
             val += c.get('amount', 0.0)
         return val
 
@@ -821,7 +821,7 @@
             context = {}
         for line in self.browse(cr, uid, ids, context=context):
             price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
-            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uos_qty or line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
@@ -930,7 +930,7 @@
                 uos_id = _get_line_uom(line)
                 pu = 0.0
                 if uosqty:
-                    pu = round(line.price_unit * line.product_uom_qty / uosqty,
+                    pu = round(line.price_unit,
                             self.pool.get('decimal.precision').precision_get(cr, uid, 'Sale Price'))
                 fpos = line.order_id.fiscal_position or False
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
@@ -993,6 +993,11 @@
         }
         # FIXME must depend on uos/uom of the product and not only of the coeff.
         try:
+            uom = self.pool.get('product.uom').browse(cr,uid,product.uom_id.id,context=None)
+            uos = self.pool.get('product.uom').browse(cr,uid,product_uos,context=None)
+            if product.uos_coeff == 1.00:
+                if product.uos_id.id != product.uom_id.id:
+                    product.uos_coeff = uos.factor / uom.factor
             value.update({
                 'product_uom_qty': product_uos_qty / product.uos_coeff,
                 'th_weight': product_uos_qty / product.uos_coeff * product.weight
@@ -1155,6 +1160,19 @@
         if not uom:
             res['value']['price_unit'] = 0.0
         return res
+    
+    def product_uos_change(self, cursor, user, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False):
+        res = self.product_id_change(cursor, user, ids, pricelist, product,
+            qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
+            partner_id=partner_id, lang=lang, update_tax=update_tax,
+            date_order=date_order)
+        if 'product_uos' in res['value']:
+            del res['value']['product_uos']
+        if not uos:
+            res['value']['price_unit'] = 0.0
+        return res
 
     def unlink(self, cr, uid, ids, context=None):
         if context is None:

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2011-05-20 09:49:07 +0000
+++ sale/sale_view.xml	2011-06-08 12:43:57 +0000
@@ -135,8 +135,8 @@
                                                 name="product_uom_qty"
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
                                                 />
-                                                <field groups="product.group_uos" name="product_uos_qty"/>
-                                                <field groups="product.group_uos" name="product_uos"/>
+                                                <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
+                                                <field groups="product.group_uos" name="product_uos" 														on_change="product_uos_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
                                             <field name="product_uom"
                                                 on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
                                             <field