ICT bulk

modules/account_invoice/invoice.py

@@ -485,7 +485,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin, InvoiceReportMixin):
                 })
         cls.__rpc__.update({
                 'post': RPC(
-                    readonly=False, instantiate=0, fresh_session=True),
+                    readonly=False, instantiate=0, fresh_session=False),
                 })
 
     @classmethod
@@ -1896,11 +1896,10 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin, InvoiceReportMixin):
         
         moves = []
         for invoice in invoices:
-            if invoice.type == 'in':
-                move = invoice.get_move()
-                if move != invoice.move:
-                    invoice.move = move
-                    moves.append(move)
+            move = invoice.get_move()
+            if move != invoice.move:
+                invoice.move = move
+                moves.append(move)
             invoice.do_lot_invoicing()
         if moves:
             Move.save(moves)

modules/account_invoice/invoice_ict.fodt

@@ -4059,7 +4059,7 @@
       <text:p text:style-name="P13">Controller Name</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau10.A1" office:value-type="string">
-      <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_number&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_reference&gt;</text:placeholder></text:p>
       <text:p text:style-name="P25"/>
       <text:p text:style-name="P25"><text:placeholder text:placeholder-type="text">&lt;invoice.report_controller_name&gt;</text:placeholder></text:p>
      </table:table-cell>

modules/account_invoice/invoice_ict_final.fodt

@@ -3956,7 +3956,7 @@
     </table:table-row>
     <table:table-row table:style-name="Tableau6.1">
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
-      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_nb_bale&gt;</text:placeholder><text:s/></text:p>
+      <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;invoice.report_cndn_nb_bale&gt;</text:placeholder><text:s/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau6.A2" office:value-type="string">
       <text:p text:style-name="P15"><text:placeholder text:placeholder-type="text">&lt;format_number(invoice.report_gross, invoice.party.lang) if invoice.report_gross != &apos;&apos; else &apos;&apos;&gt;</text:placeholder><text:s/></text:p>
@@ -4044,7 +4044,7 @@
       <text:p text:style-name="P13">Controller Name</text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Tableau10.A1" office:value-type="string">
-      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_number&gt;</text:placeholder></text:p>
+      <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;invoice.report_si_reference&gt;</text:placeholder></text:p>
       <text:p text:style-name="P26"/>
       <text:p text:style-name="P26"><text:placeholder text:placeholder-type="text">&lt;invoice.report_controller_name&gt;</text:placeholder></text:p>
      </table:table-cell>

modules/account_invoice/tests/test_module.py

@@ -3,6 +3,7 @@
 
 import datetime
 from decimal import Decimal
+from unittest.mock import Mock, patch
 
 from trytond.modules.account_invoice.exceptions import (
     PaymentTermValidationError)
@@ -251,5 +252,43 @@ class AccountInvoiceTestCase(
                 (datetime.date(2012, 1, 14), Decimal('-1.0')),
                 ])
 
+    def test_post_rpc_does_not_require_fresh_session(self):
+        'posting invoices does not force a fresh session'
+        Invoice = Pool().get('account.invoice')
+
+        self.assertFalse(Invoice.__rpc__['post'].fresh_session)
+
+    @with_transaction()
+    def test_validate_invoice_creates_move_for_customer_invoice(self):
+        'validating customer invoices now creates the account move'
+        Invoice = Pool().get('account.invoice')
+
+        move = Mock()
+        invoice = Invoice()
+        invoice.type = 'out'
+        invoice.move = None
+        invoice.get_move = Mock(return_value=move)
+        invoice.do_lot_invoicing = Mock()
+
+        move_model = Mock()
+
+        with patch.object(Invoice, '_check_taxes'), patch.object(
+                Invoice, '_store_cache'), patch.object(
+                Invoice, 'browse', return_value=[]), patch.object(
+                Invoice, 'cleanMoves') as clean_moves, patch.object(
+                Invoice, 'save') as save_invoices, patch(
+                'trytond.modules.account_invoice.invoice.Pool'
+                ) as PoolMock:
+            PoolMock.return_value.get.return_value = move_model
+
+            Invoice.validate_invoice([invoice])
+
+        self.assertIs(invoice.move, move)
+        invoice.get_move.assert_called_once_with()
+        invoice.do_lot_invoicing.assert_called_once_with()
+        move_model.save.assert_called_once_with([move])
+        clean_moves.assert_called_once_with([move])
+        save_invoices.assert_called()
+
 
 del ModuleTestCase