Merge lp:~borjals/openobject-addons/5.0-bugfix-509204 into lp:openobject-addons/5.0

[Borja López Soilán (NeoPolus)]

Fixes the bug 509204 that is critical for some countries (like Spain; where it is a legal requirement having separate invoice and invoice refund sequences)

It adds a new field to the journals, to let the user specify a
different sequence for refund invoices (if he wants).

(The problem was that if no invoice sequence was specified for the
jornal, then OpenERP used automatically one invoice sequence or one
refund invoice sequence given the current invoice type.
But if an invoice sequence was defined for the jornal, OpenERP used it
always, for both the invoices and refunds.)

[Borja López Soilán (NeoPolus) (borjals)]

Jordi Esteve wrote:
> No tengo claro que este merge que propones sea necesario, o sea añadir en los
> diarios una nueva secuencia para las facturas rectificativas, pues esta
> funcionalidad ya está implementada de serie en el módulo account.

Thanks for your review Jordi (even if it is in Spanish :) )

> Si debes usar 2 secuencias distintas, una para facturas normales y otra para
> las rectificativas, puedes definir dos diarios distintos, cada uno con su
> secuencia distinta, los dos diarios de tipo Venta, y en uno marcas la casilla
> Diario de reintegro y en el otro no. Lo mismo haríamos definiendo 2 diarios
> de tipo Compra, uno con la casilla Diario de reintegro marcada y en el otro
> no y cada uno con secuencias distintas. Creo que lo probé y funcionaba.

If you take a look at the bug report you will see a note about that: I know that if you can set a journal as "refund journal". But when you create refund invoices from normal invoices (you select an invoice you wish to refund, and use the Credit Note ("Factura de abono" on Spanish), the refund invoices are created on the same journal as the original invoice (if the original invoice was on the Sales Journal, the new invoice is on the Sales Journal too). That's why I proposed having the option to set the sequence to use for this kind of "refund invoices on the same journal".

Another option I can propose, is having the "Credit Note" (account.invoice.refund) wizard search for the "refund journal" of the same type of the current one (so if you have a Sales Journal, it should use the Sales Refunds Journal for the created invoices).

> Por tanto es posible q te denieguen el merge. No lo
> explico en inglés pq voy muy escaso de tiempo, ya lo probarás y lo comentarás.
> PD: La otra propuesta de merge si me parece muy acertada.
>
> Jordi

Ok, I marked this Merge status as "Work in progress" just to wait until somebody else puts his two cents :)

Should I propose the other option too?

review: Needs Information

[Jordi Esteve (www.zikzakmedia.com) (jesteve-zikzakmedia)]

Thanks for your explanation, Borja, now I see better the real problem:

When you create refund invoices from normal invoices (you select an invoice you wish to refund, and use the Credit Note wizard), the refund invoices are created on the same journal as the original invoice, instead of the refund journal, so they cannot take into account a different invoice sequence.

Maybe the second solution, the "Credit Note" (account.invoice.refund) wizard must search for the "refund journal" of the same type of the current one (sale -> sale refund, purchase -> purchase refund) is better as it does not affect the kernel of account module. IMHO the current "Credit Note" wizard has a bug if it cannot select the proper "refund" journal.

Unmerged revisions

2739. By Borja López Soilán (NeoPolus) on 2010-05-19

[FIX] account: Refund invoices didn't support sequences by fiscal year

  It was not possible to use a sequence by fiscal year for the invoices,
  and a different sequence by fiscal year for the refund invoices.

  This is a legal requirement on some countries (like Spain).

  The problem was that if no invoice sequence was specified for the
  jornal, then OpenERP used automatically one invoice sequence or one
  refund invoice sequence given the current invoice type.
  But if an invoice sequence was defined for the jornal, OpenERP used it
  always, for both the invoices and refunds.

  This fix adds a new field to the journals, to let the user specify a
  different sequence for refund invoices (if he wants).

=== modified file 'account/account.py'
--- account/account.py	2010-04-29 09:49:15 +0000
+++ account/account.py	2010-05-19 08:32:27 +0000
@@ -537,6 +537,8 @@
         'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"),
         'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
             help="The sequence used for invoice numbers in this journal."),
+        'refund_sequence_id': fields.many2one('ir.sequence', 'Refund Sequence', \
+            help="The sequence used for refund invoice numbers in this journal."),
     }
 
     _defaults = {

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2010-04-05 08:57:54 +0000
+++ account/account_view.xml	2010-05-19 08:32:27 +0000
@@ -263,7 +263,9 @@
                             <field name="view_id"/>
                             <field name="currency"/>
                             <field name="sequence_id"/>
+                            <newline/>
                             <field name="invoice_sequence_id"/>
+                            <field name="refund_sequence_id"/>
                             <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="user_id" groups="base.group_extended"/>

=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2010-05-05 14:48:06 +0000
+++ account/i18n/account.pot	2010-05-19 08:32:27 +0000
@@ -2354,6 +2354,11 @@
 msgstr ""
 
 #. module: account
+#: field:account.journal,refund_sequence_id:0
+msgid "Refund Inv. Sequence"
+msgstr ""
+
+#. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
 msgstr ""

=== modified file 'account/i18n/es_ES.po'
--- account/i18n/es_ES.po	2010-05-05 14:48:06 +0000
+++ account/i18n/es_ES.po	2010-05-19 08:32:27 +0000
@@ -2351,7 +2351,12 @@
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr "factura de secuencia"
+msgstr "Secuencia de factura"
+
+#. module: account
+#: field:account.journal,refund_sequence_id:0
+msgid "Refund Inv. Sequence"
+msgstr "Secuencia de fact. rect."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0

=== modified file 'account/invoice.py'
--- account/invoice.py	2010-04-30 11:20:11 +0000
+++ account/invoice.py	2010-05-19 08:32:27 +0000
@@ -744,9 +744,14 @@
         obj_inv = self.browse(cr, uid, ids)[0]
         for (id, invtype, number, move_id, reference) in cr.fetchall():
             if not number:
-                if obj_inv.journal_id.invoice_sequence_id:
+                if invtype in ('in_invoice', 'out_invoice') \
+                        and 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=%s', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
+                elif invtype in ('in_refund', 'out_refund') \
+                        and obj_inv.journal_id.refund_sequence_id:
+                    sid = obj_inv.journal_id.refund_sequence_id.id
+                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id=%s', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
                 else:
                     number = self.pool.get('ir.sequence').get(cr, uid,
                             'account.invoice.' + invtype)