From 2405f334e2e39f06e2de569b86042b2693400d8b Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Wed, 7 Jul 2010 17:29:09 +0200
Subject: [PATCH 1/6] [FIX] account: wrong invoice number sequence for fiscal
 year in a certain case [FIX] account: context not initialized correctly in
 sequence

lp bug: https://launchpad.net/bugs/602188 fixed

bzr revid: ls@numerigraphe.fr-20100707152909-ocjbj6c784oqeg54
---
 addons/account/invoice.py  |  8 ++++++--
 addons/account/sequence.py | 11 ++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 62f998fa751..6e2ff2a7baa 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -923,12 +923,16 @@ class account_invoice(osv.osv):
         obj_inv = self.browse(cr, uid, ids)[0]
         for (id, invtype, number, move_id, reference) in cr.fetchall():
             if not number:
+                tmp_context = {
+                    'fiscalyear_id': inv.period_id.fiscalyear_id.id
+                }
                 if obj_inv.journal_id.invoice_sequence_id:
                     sid = obj_inv.journal_id.invoice_sequence_id.id
                     number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
                 else:
-                    number = self.pool.get('ir.sequence').get(cr, uid,
-                            'account.invoice.' + invtype)
+                    number = obj_seq.get_id(cr, uid,
+                                            'account.invoice.%s' % invtype,
+                                            'code=%s', context=tmp_context)
                 if invtype in ('in_invoice', 'in_refund'):
                     ref = reference
                 else:
diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index c90e9ef93c7..1186d4b8c7f 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 
 class ir_sequence_fiscalyear(osv.osv):
     _name = 'account.sequence.fiscalyear'
@@ -31,7 +31,7 @@ class ir_sequence_fiscalyear(osv.osv):
     }
 
     _sql_constraints = [
-        ('main_id', 'CHECK (sequence_main_id != sequence_id)',  'Main Sequence must be different from current !'),
+        ('main_id', 'CHECK (sequence_main_id != sequence_id)', 'Main Sequence must be different from current !'),
     ]
 
 ir_sequence_fiscalyear()
@@ -41,15 +41,16 @@ class ir_sequence(osv.osv):
     _columns = {
         'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context={}):
+    def get_id(self, cr, uid, sequence_id, test='id', context=None):
+        if context is None:
+            context = {}
         cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
             for line in self.browse(cr, uid, res['id'], context=context).fiscal_ids:
                 if line.fiscalyear_id.id==context.get('fiscalyear_id', False):
                     return super(ir_sequence, self).get_id(cr, uid, line.sequence_id.id, test="id", context=context)
-        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context)
+        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context=context)
 ir_sequence()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From dbf34fd87eed009dfecf0c15c42430d1c42a0231 Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Wed, 7 Jul 2010 17:33:14 +0200
Subject: [PATCH 2/6] [REF] account: code formating in sequence

bzr revid: ls@numerigraphe.fr-20100707153314-thxkmi5k9my09eq4
---
 addons/account/sequence.py | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/addons/account/sequence.py b/addons/account/sequence.py
index 1186d4b8c7f..b75e7f3e34e 100644
--- a/addons/account/sequence.py
+++ b/addons/account/sequence.py
@@ -25,13 +25,17 @@ class ir_sequence_fiscalyear(osv.osv):
     _name = 'account.sequence.fiscalyear'
     _rec_name = "sequence_main_id"
     _columns = {
-        "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True, ondelete='cascade'),
-        "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence', required=True, ondelete='cascade'),
-        "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, ondelete='cascade')
+        "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True,
+            ondelete='cascade'),
+        "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence',
+            required=True, ondelete='cascade'),
+        "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year',
+            required=True, ondelete='cascade')
     }
 
     _sql_constraints = [
-        ('main_id', 'CHECK (sequence_main_id != sequence_id)', 'Main Sequence must be different from current !'),
+        ('main_id', 'CHECK (sequence_main_id != sequence_id)',
+            'Main Sequence must be different from current !'),
     ]
 
 ir_sequence_fiscalyear()
@@ -39,18 +43,25 @@ ir_sequence_fiscalyear()
 class ir_sequence(osv.osv):
     _inherit = 'ir.sequence'
     _columns = {
-        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences')
+        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear',
+            'sequence_main_id', 'Sequences')
     }
     def get_id(self, cr, uid, sequence_id, test='id', context=None):
         if context is None:
             context = {}
-        cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,))
+        cr.execute('select id from ir_sequence where ' 
+                   + test + '=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
-            for line in self.browse(cr, uid, res['id'], context=context).fiscal_ids:
-                if line.fiscalyear_id.id==context.get('fiscalyear_id', False):
-                    return super(ir_sequence, self).get_id(cr, uid, line.sequence_id.id, test="id", context=context)
-        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context=context)
+            for line in self.browse(cr, uid, res['id'],
+                                    context=context).fiscal_ids:
+                if line.fiscalyear_id.id == context.get('fiscalyear_id', False):
+                    return super(ir_sequence, self).get_id(cr, uid,
+                                                           line.sequence_id.id,
+                                                           test="id",
+                                                           context=context)
+        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
+                                               context=context)
 ir_sequence()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 4dc7691b1a6840b26d13350edeed29ed78c55dc8 Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Mon, 12 Jul 2010 12:12:41 +0200
Subject: [PATCH 3/6] [FIX] account: wrong variable name

bzr revid: ls@numerigraphe.fr-20100712101241-cn1unvdzds3dy2ol
---
 addons/account/invoice.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 6e2ff2a7baa..05ca7d5d36e 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -920,15 +920,15 @@ class account_invoice(osv.osv):
                     'FROM account_invoice ' \
                     'WHERE id IN %s',
                     (tuple(ids),))
-        obj_inv = self.browse(cr, uid, ids)[0]
+        inv = self.browse(cr, uid, ids)[0]
         for (id, invtype, number, move_id, reference) in cr.fetchall():
             if not number:
                 tmp_context = {
                     'fiscalyear_id': inv.period_id.fiscalyear_id.id
                 }
-                if obj_inv.journal_id.invoice_sequence_id:
-                    sid = obj_inv.journal_id.invoice_sequence_id.id
-                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
+                if inv.journal_id.invoice_sequence_id:
+                    sid = inv.journal_id.invoice_sequence_id.id
+                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': inv.period_id.fiscalyear_id.id})
                 else:
                     number = obj_seq.get_id(cr, uid,
                                             'account.invoice.%s' % invtype,
@@ -1578,4 +1578,4 @@ class res_partner(osv.osv):
 
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 3dec5629c96aab45601f8277e2c1264fcca32d3b Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Mon, 12 Jul 2010 12:40:05 +0200
Subject: [PATCH 4/6] [FIX] account: wrong variable name [IMP] account:
 sequence view [REF] account: small cleanup

lp bug: https://launchpad.net/bugs/602188 fixed

bzr revid: ls@numerigraphe.fr-20100712104005-4vkqdu4lcsqgzt21
---
 addons/account/invoice.py        | 14 +++++++++-----
 addons/account/sequence_view.xml |  4 ++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 05ca7d5d36e..d475a2e19b4 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -927,12 +927,16 @@ class account_invoice(osv.osv):
                     'fiscalyear_id': inv.period_id.fiscalyear_id.id
                 }
                 if inv.journal_id.invoice_sequence_id:
-                    sid = inv.journal_id.invoice_sequence_id.id
-                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': inv.period_id.fiscalyear_id.id})
+                    sequence_id = inv.journal_id.invoice_sequence_id.id
+                    number = self.pool.get('ir.sequence').get_id(cr, uid, 
+                                                                 sequence_id,
+                                                                 'id',
+                                                                 context=tmp_context)
                 else:
-                    number = obj_seq.get_id(cr, uid,
-                                            'account.invoice.%s' % invtype,
-                                            'code=%s', context=tmp_context)
+                    number = self.pool.get('ir.sequence').get_id(cr, uid,
+                                                                 'account.invoice.%s' % invtype,
+                                                                 'code',
+                                                                 context=tmp_context)
                 if invtype in ('in_invoice', 'in_refund'):
                     ref = reference
                 else:
diff --git a/addons/account/sequence_view.xml b/addons/account/sequence_view.xml
index 2d4d159cb41..565725d5d71 100644
--- a/addons/account/sequence_view.xml
+++ b/addons/account/sequence_view.xml
@@ -14,6 +14,10 @@
                                 <field name="fiscalyear_id"/>
                                 <field name="sequence_id"/>
                             </tree>
+                            <form string="Fiscal Year Sequence">
+                                <field name="fiscalyear_id"/>
+                                <field name="sequence_id"/>
+                            </form>
                         </field>
                     </page>
                 </page>

From 0b510c279838bd48f26bed5d80a7bc5c1f20fcf0 Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Tue, 13 Jul 2010 10:58:52 +0200
Subject: [PATCH 5/6] [ADD] test for bug 602188: wrong invoice number sequence
 for fiscal year in a certain case

bzr revid: ls@numerigraphe.fr-20100713085852-mkvywgcdmx2ule58
---
 addons/account/__openerp__.py                 |  1 +
 .../account/test/sequence_bug602188_test.xml  | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 addons/account/test/sequence_bug602188_test.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index d3a58272b89..c663ed29e06 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -124,6 +124,7 @@ module named account_vouchers
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'account_unit_test.xml',
+        'test/sequence_bug602188_test.xml',
         'board_account_demo.xml',
     ],
     'test': [
diff --git a/addons/account/test/sequence_bug602188_test.xml b/addons/account/test/sequence_bug602188_test.xml
new file mode 100644
index 00000000000..3a9200b98e6
--- /dev/null
+++ b/addons/account/test/sequence_bug602188_test.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!--
+            Make sure bug #602188 is fixed: Wrong invoice number sequence for
+            fiscal year in a certain case
+        -->
+        <!-- This file must be loaded  _after_  account_demo.xml ! -->
+
+        <!-- New invoice sequence for a fiscal year -->
+        <record id="seq_out_invoice_bug602188" model="ir.sequence">
+            <field eval="'Account Invoice Out for Fiscal Year '+time.strftime('%Y')"
+                name="name" />
+            <field name="code">account.invoice.out_invoice</field>
+            <field name="padding" eval="3" />
+            <field name="prefix">TEST-</field>
+            <field name="suffix">-bug602188</field>
+            <field name="number_next" eval="42" />
+            <field name="active" eval="True" />
+        </record>
+        <record id="seq_out_invoice_bug602188_fy" model="account.sequence.fiscalyear">
+            <field name="sequence_id" ref="seq_out_invoice_bug602188" />
+            <field name="sequence_main_id" ref="seq_out_invoice" />
+            <field name="fiscalyear_id" ref="data_fiscalyear" />
+        </record>
+
+        <!-- New invoice using the sequence -->
+        <record id="invoice_bug602188" model="account.invoice">
+            <field name="currency_id" ref="base.EUR" />
+            <field name="company_id" ref="base.main_company" />
+            <field name="address_invoice_id" ref="base.res_partner_address_tang" />
+            <field name="partner_id" ref="base.res_partner_asus" />
+            <field name="journal_id" ref="account.sales_journal" />
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv" />
+            <field name="name">lp:602188</field>
+            <field name="address_contact_id" ref="base.res_partner_address_tang" />
+            <field name="period_id" ref="period_1" />
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="invoice_bug602188" />
+        <assert id="invoice_bug602188" model="account.invoice" severity="error"
+            string="Invoice lp:602188 got the right number">
+            <test expr="state">open</test>
+            <test expr="number">TEST-042-bug602188</test>
+        </assert>
+
+        <!-- Deactivate the sequence to not make other tests fail -->
+        <record id="seq_out_invoice_bug602188" model="ir.sequence">
+            <field name="active" eval="False" />
+        </record>
+    </data>
+</openerp>

From a9a8c13e68a3a8d75a61d625cc783e523de054db Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Tue, 13 Jul 2010 17:53:13 +0200
Subject: [PATCH 6/6] [REF] account: rewrite the sequence test in YAML

bzr revid: ls@numerigraphe.fr-20100713155313-cw7e9l5gjhfkba70
---
 addons/account/__openerp__.py                 |  2 +-
 addons/account/test/account_sequence_test.yml | 45 ++++++++++++++++
 .../account/test/sequence_bug602188_test.xml  | 53 -------------------
 3 files changed, 46 insertions(+), 54 deletions(-)
 create mode 100644 addons/account/test/account_sequence_test.yml
 delete mode 100644 addons/account/test/sequence_bug602188_test.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index c663ed29e06..09e51486ad2 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -124,10 +124,10 @@ module named account_vouchers
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'account_unit_test.xml',
-        'test/sequence_bug602188_test.xml',
         'board_account_demo.xml',
     ],
     'test': [
+        'test/account_sequence_test.yml',
         'test/account_customer_invoice.yml',
         'test/account_supplier_invoice.yml',
         'test/account_change_currency.yml',
diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml
new file mode 100644
index 00000000000..3be824d2ca0
--- /dev/null
+++ b/addons/account/test/account_sequence_test.yml
@@ -0,0 +1,45 @@
+- In order to test the invoice numbering, I create a sequence for out invoices.
+- !record {model: ir.sequence, id: seq_out_invoice_test}:
+    name: Account Invoice Out for the demonstration Fiscal Year # XXX indicate the name of the fiscal year
+    code: account.invoice.out_invoice
+    padding: 3
+    prefix: FY-
+    suffix: -TEST
+    number_next: 42
+
+- I link the new sequence to the demo sequence and the demo fiscal years.
+- !record {model: account.sequence.fiscalyear, id: seq_out_invoice_test_fy}:
+    sequence_id: seq_out_invoice_test
+    sequence_main_id: seq_out_invoice
+    fiscalyear_id: data_fiscalyear
+
+- I create a draft customer invoice in a period of the demo fiscal year
+- !record {model: account.invoice, id: invoice_seq_test}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_zen
+    address_invoice_id: base.res_partner_address_zen
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC3] Medium PC'
+        price_unit: 900.0
+        quantity: 10.0
+        product_id: product.product_product_pc3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    period_id: period_1
+    
+- I create the invoice, as is I clicked on the "Create" button
+- !workflow {model: account.invoice, action: invoice_open, ref: invoice_seq_test}
+
+- I check that the invoice state is "Open"
+- !assert {model: account.invoice, id: invoice_seq_test}:
+    - state == 'open'
+    
+- I check that the invoice got the right number using our sequence
+  # This used to fail because of bug #602188
+- !assert {model: account.invoice, id: invoice_seq_test}:
+    - number == 'FY-042-TEST'
diff --git a/addons/account/test/sequence_bug602188_test.xml b/addons/account/test/sequence_bug602188_test.xml
deleted file mode 100644
index 3a9200b98e6..00000000000
--- a/addons/account/test/sequence_bug602188_test.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <!--
-            Make sure bug #602188 is fixed: Wrong invoice number sequence for
-            fiscal year in a certain case
-        -->
-        <!-- This file must be loaded  _after_  account_demo.xml ! -->
-
-        <!-- New invoice sequence for a fiscal year -->
-        <record id="seq_out_invoice_bug602188" model="ir.sequence">
-            <field eval="'Account Invoice Out for Fiscal Year '+time.strftime('%Y')"
-                name="name" />
-            <field name="code">account.invoice.out_invoice</field>
-            <field name="padding" eval="3" />
-            <field name="prefix">TEST-</field>
-            <field name="suffix">-bug602188</field>
-            <field name="number_next" eval="42" />
-            <field name="active" eval="True" />
-        </record>
-        <record id="seq_out_invoice_bug602188_fy" model="account.sequence.fiscalyear">
-            <field name="sequence_id" ref="seq_out_invoice_bug602188" />
-            <field name="sequence_main_id" ref="seq_out_invoice" />
-            <field name="fiscalyear_id" ref="data_fiscalyear" />
-        </record>
-
-        <!-- New invoice using the sequence -->
-        <record id="invoice_bug602188" model="account.invoice">
-            <field name="currency_id" ref="base.EUR" />
-            <field name="company_id" ref="base.main_company" />
-            <field name="address_invoice_id" ref="base.res_partner_address_tang" />
-            <field name="partner_id" ref="base.res_partner_asus" />
-            <field name="journal_id" ref="account.sales_journal" />
-            <field name="state">draft</field>
-            <field name="type">out_invoice</field>
-            <field name="account_id" ref="account.a_recv" />
-            <field name="name">lp:602188</field>
-            <field name="address_contact_id" ref="base.res_partner_address_tang" />
-            <field name="period_id" ref="period_1" />
-        </record>
-        <workflow action="invoice_open" model="account.invoice" ref="invoice_bug602188" />
-        <assert id="invoice_bug602188" model="account.invoice" severity="error"
-            string="Invoice lp:602188 got the right number">
-            <test expr="state">open</test>
-            <test expr="number">TEST-042-bug602188</test>
-        </assert>
-
-        <!-- Deactivate the sequence to not make other tests fail -->
-        <record id="seq_out_invoice_bug602188" model="ir.sequence">
-            <field name="active" eval="False" />
-        </record>
-    </data>
-</openerp>