Merge lp:~agilebg/account-invoice-report/7.0-bug-1284049-hurrinico into lp:~account-core-editors/account-invoice-report/7.0

[Nicola Malcontenti - Agile BG]

https://bugs.launchpad.net/account-invoice-report/+bug/1284049

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM.

Is there any chance I could convince you to write an automated test for this?

review: Approve (code review, no test)

[Nicola Malcontenti - Agile BG (hurrin1c0)]

> LGTM.
>
> Is there any chance I could convince you to write an automated test for this?

Sorry i forgot it, i'll made soon

[lp:~agilebg/account-invoice-report/7.0-bug-1284049-hurrinico]

51. By Hurrinico on 2014-04-10

[FIX] Fixed Tests

[Nicola Malcontenti - Agile BG (hurrin1c0)]

> LGTM.
>
> Is there any chance I could convince you to write an automated test for this?
Hi Alexandre,
Sorry For the late, i have write the automated test for checking the bug.

Regards.
-N.

[Lorenzo Battistini (elbati)]

Nico,

line 74,76: I think you should use 'lot_icecream_0' and 'lot_icecream_1'

line 91: you are writing 'prodlot_id' field with another lot, but I think it's unnecessary, as lots are already assigned by 'stock.move.split' wizard.

line 115: the test is checking if the invoice lines are 2, but the bug said
"Now the 2 different serial number will be repeat for each invoice line, while each line must have only its serial"
So, the test should check if every invoice line has got only one lot

line 112: 'ac' is unnecessary

Thanks

review: Needs Fixing

[lp:~agilebg/account-invoice-report/7.0-bug-1284049-hurrinico]

52. By Hurrinico on 2014-04-14

[FIX] Mod tests

53. By Hurrinico on 2014-04-14

[FIX] Minor fixing

[Lorenzo Battistini (elbati)]

just remove "name = ''" at line 110

Thanks!

review: Approve (code review)

[lp:~agilebg/account-invoice-report/7.0-bug-1284049-hurrinico]

54. By Hurrinico on 2014-04-14

[FIX] Remove name

[Nicola Malcontenti - Agile BG (hurrin1c0)]

Tests should be ready

=== modified file 'account_invoice_production_lot/__openerp__.py'
--- account_invoice_production_lot/__openerp__.py	2014-01-02 10:03:31 +0000
+++ account_invoice_production_lot/__openerp__.py	2014-04-14 15:24:01 +0000
@@ -29,6 +29,7 @@
     "depends": [
         "sale_stock",
         "invoice_webkit",
+        "stock_picking_invoice_link",
         ],
     "author": "Agile Business Group",
     "summary": "Display delivered serial numbers in invoice",

=== modified file 'account_invoice_production_lot/invoice.py'
--- account_invoice_production_lot/invoice.py	2014-01-02 10:03:31 +0000
+++ account_invoice_production_lot/invoice.py	2014-04-14 15:24:01 +0000
@@ -30,10 +30,15 @@
         result = {}
         for line in self.browse(cr, uid, ids, context=context):
             result[line.id] = []
-            for order_line in line.order_lines:
-                for move in order_line.move_ids:
+            if line.move_line_ids:
+                for move in line.move_line_ids:
                     if move.prodlot_id:
                         result[line.id].append(move.prodlot_id.id)
+            else:
+                for order_line in line.order_lines:
+                    for move in order_line.move_ids:
+                        if move.prodlot_id:
+                            result[line.id].append(move.prodlot_id.id)
         return result
 
     _inherit = "account.invoice.line"

=== modified file 'account_invoice_production_lot/test/sale.yml'
--- account_invoice_production_lot/test/sale.yml	2013-10-15 15:40:02 +0000
+++ account_invoice_production_lot/test/sale.yml	2014-04-14 15:24:01 +0000
@@ -75,3 +75,74 @@
     for invoice in order.invoice_ids:
         invoice.load_lines_lots()
         assert invoice.invoice_line[0].formatted_note == '<ul> <li>S/N Lot0 for Ice cream</li> </ul>', "Wrgong formatted note for '%s' line" % invoice.invoice_line[0].name
+-
+  I create a new draft Sale Order
+-
+  !record {model: sale.order, id: sale_order_2}:
+    partner_id: base.res_partner_2
+    partner_invoice_id: base.res_partner_address_3
+    partner_shipping_id: base.res_partner_address_3
+    pricelist_id: 1
+    order_policy: picking
+    order_line:
+      - product_id: product_icecream
+        product_uom_qty: 2.0
+        product_uom: 1
+        price_unit: 100.0
+-
+ !record {model: stock.production.lot, id: lot_icecream_1}:
+    name: Lot1 for Ice cream
+    product_id: product_icecream
+-
+  I confirm the quotation with Invoice based on deliveries policy.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale_order_2}
+-
+  Now, I split serial number.
+-
+    !python {model: stock.picking}: |
+      order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_2"))
+      move_ids = [x.id for x in order.picking_ids[0].move_lines]
+      context.update({'active_model': 'stock.move', 'active_id': move_ids[0], 'active_ids': move_ids})
+-
+  !record {model: stock.move.split, id: split_lot_incomming}:
+    line_ids:
+        - name: lot_icecream_0
+          quantity: 1
+        - name: lot_icecream_1
+          quantity: 1
+
+-
+ !python {model: stock.move.split }: |
+    self.split_lot(cr, uid, [ref('split_lot_incomming')], context=context)
+-
+  Now, I dispatch delivery order.
+-
+  !python {model: stock.partial.picking}: |
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_2"))
+    for pick in order.picking_ids:
+        data = pick.force_assign()
+        if data == True:
+          partial_id = self.create(cr, uid, {}, context={'active_model': 'stock.picking','active_ids': [pick.id]})
+          self.do_partial(cr, uid, [partial_id])
+-
+  I create Invoice from Delivery Order.
+-
+  !python {model: stock.invoice.onshipping}: |
+    sale = self.pool.get('sale.order')
+    sale_order = sale.browse(cr, uid, ref("sale_order_2"))
+    ship_ids = [x.id for x in sale_order.picking_ids]
+    wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')},
+      {'active_ids': ship_ids, 'active_model': 'stock.picking'})
+    self.create_invoice(cr, uid, [wiz_id], {"active_ids": ship_ids, "active_id": ship_ids[0]})
+-
+  I check the invoice lines.
+-
+  !python {model: sale.order}: |
+    order = self.browse(cr, uid, ref("sale_order"))
+    assert order.invoice_ids, "Invoice is not created."
+    for invoice in order.invoice_ids:
+        invoice.load_lines_lots()
+        for line in invoice.invoice_line:
+            assert len(line.prod_lot_ids) == 1,"there must be one lot only"
+