Merge lp:~factorlibre/account-invoicing/account-invoicing-fix-merge-7.0 into lp:~account-core-editors/account-invoicing/7.0

[Hugo Santos (Factorlibre)]

UoS Maybe not defined in invoice line so is not possible to obtain the factor from there. In that case factor must be 1.0 like when assigning o_line['uom_factor']

[Leonardo Pistone (lepistone)]

Hi Hugo.

can you include an automated test to show which situation breaks and is fixed with the patch?

review: Needs Fixing

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-invoicing. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

50. By Hugo Santos (Factorlibre) on 2014-07-02

[Fix] invoice line uos_id maybe not defined so factor can't be used from there

=== modified file 'account_invoice_merge/invoice.py'
--- account_invoice_merge/invoice.py	2014-03-19 12:17:03 +0000
+++ account_invoice_merge/invoice.py	2014-07-02 08:34:34 +0000
@@ -129,7 +129,8 @@
                 o_line = invoice_infos['invoice_line'].setdefault(line_key, {})
                 if o_line:
                     # merge the line with an existing line
-                    o_line['quantity'] += invoice_line.quantity * invoice_line.uos_id.factor / o_line['uom_factor']
+                    uos_factor = invoice_line.uos_id and invoice_line.uos_id.factor or 1.0
+                    o_line['quantity'] += invoice_line.quantity * uos_factor / o_line['uom_factor']
                 else:
                     # append a new "standalone" line
                     for field in ('quantity', 'uos_id'):