Merge lp:~gkliska/storno-accounting/storno-accounting into lp:storno-accounting

[Goran Kliska]

Initial commit to start with.
Known issues/dilemmas:
  - how to control visible/readonly/mandatory/selection_choices for account_journal.posting_policy from (future) res_company.posting_policy. Dummy field.function() or field.related(), but then we will need lot of them?
  - constraint regarding Tax/Base amount maybe belongs to account-constraints project
  - account_invoice_refund really needs refactoring in core IMO, here attempt to be compatible with Akretion account_journal_sale_refund_link module using same account_journal.refund_journal_id fieldname

[Eric Caudal - www.elico-corp.com (elicoidal)]

Hi Goran,
I am not sure about this and take out the database constraints.
Here is what we could do: create a storno check box at account_move_line
level, invisible that would be check any time a "storno" company uses a
journal in "storno mode". we just need to change the SQL constraint to
something similar to "CHECK (((credit+debit>=0) AND NOT storno) OR
(abs(credit+debit)>=0 AND storno))" (Syntax to be confirmed)

In this case no need to implement complex methods and it could be
compatible with both method at the same time.
your thoughts?
Eric CAUDAL

Eric Caudal
/CEO/
--
*Elico Corporation, Shanghai branch
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 2136 1670
Office: + 86 21 6211 8017/27/37
Skype: elico.corp
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp
On 04/10/2013 05:34 PM, Goran Kliska wrote:
> Goran Kliska has proposed merging lp:~gkliska/storno-accounting/storno-accounting into lp:storno-accounting.
>
> Requested reviews:
> Account Core Editors (account-core-editors)
>
> For more details, see:
> https://code.launchpad.net/~gkliska/storno-accounting/storno-accounting/+merge/158022
>
> Initial commit to start with.
> Known issues/dilemmas:
> - how to control visible/readonly/mandatory/selection_choices for account_journal.posting_policy from (future) res_company.posting_policy. Dummy field.function() or field.related(), but then we will need lot of them?
> - constraint regarding Tax/Base amount maybe belongs to account-constraints project
> - account_invoice_refund really needs refactoring in core IMO, here attempt to be compatible with Akretion account_journal_sale_refund_link module using same account_journal.refund_journal_id fieldname
>

[Goran Kliska (gkliska)]

Hi Eric,
I think OpenERP application constraints are reliable - under transaction control if orm is used.
_check_contra_minus() is not complex - only 5 lines.
Storno check box at account_move_line would be duplication of data - something we tend to avoid.
SQL constraints across tables are not standard SQL.
IMO Application constraint is best option.
Thanks.

[Eric Caudal - www.elico-corp.com (elicoidal)]

Hi Goran,
Having a constraint at SQL centralizes and secures the control (for
additional modules etc) and maintenance is easier.
Duplication of data in aml would allow to avoid cross table SQL
constraint actually. Besides it would log the storno moves inside the
aml (In case at some point a journal is switched on/off storno)
I am not sure as well about performance impacts: I would say the SQL
constraint tends to be much quicker than Python code.
Eric CAUDAL

Eric Caudal
/CEO/
--
*Elico Corporation, Shanghai branch
/OpenERP Premium Certified Training Partner/ *
Cell: + 86 186 2136 1670
Office: + 86 21 6211 8017/27/37
Skype: elico.corp
<email address hidden> <mailto:<email address hidden>>
http://www.elico-corp.com

Elico Corp
On 04/11/2013 12:14 AM, Goran Kliska wrote:
> Hi Eric,
> I think OpenERP application constraints are reliable - under transaction control if orm is used.
> _check_contra_minus() is not complex - only 5 lines.
> Storno check box at account_move_line would be duplication of data - something we tend to avoid.
> SQL constraints across tables are not standard SQL.
> IMO Application constraint is best option.
> Thanks.

Unmerged revisions

1. By Slobodni programi on 2013-04-10

Initial commit

=== added directory 'account_storno'
=== added file 'account_storno/__init__.py'
--- account_storno/__init__.py	1970-01-01 00:00:00 +0000
+++ account_storno/__init__.py	2013-04-10 09:33:20 +0000
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Module: account_storno
+#    Author: Goran Kliska
+#    mail:   gkliskaATgmail.com
+#    Copyright (C) 2011- Slobodni programi d.o.o., Zagreb
+#    Contributions: 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account 
+import invoice 
+import account_invoice_refund
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'account_storno/__openerp__.py'
--- account_storno/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_storno/__openerp__.py	2013-04-10 09:33:20 +0000
@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Module: account_storno
+#    Author: Goran Kliska
+#    mail:   gkliskaATgmail.com
+#    Copyright (C) 2011- Slobodni programi d.o.o., Zagreb
+#                  http://www.slobodni-programi.hr
+#    Contributions: 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Account storno",
+    "description" : """
+
+Author: Goran Kliska @ Slobodni programi d.o.o.
+        http://www.slobodni-programi.hr
+Contributions:
+  Ivan Vađić @ Slobodni programi d.o.o.
+  Tomislav Bošnjaković @ Storm Computers d.o.o.: Bugs report  
+
+Description:
+ Enables Storno Accounting, a business practice commonly used in Eastern European countries.
+ Adds new field "Posting policy" with values Storno/Contra on the Journal.
+ For Storno Journals refund invoices are (usually) done in the same journal with negative *(-1) quantities.
+
+ Countries where Storno accounting is mandatory or considered as best practice:
+     Czech Republic, Poland, Romania, Russia, China, Slovakia, Slovenia, Ukraine, Croatia, Bosnia and Herzegovina, Serbia, Romania, ...
+
+WARNING:
+ This module is managing accounting, invoices, and refund wizard. 
+ Other modules are required for stock, voucher, etc. storno posting.
+
+""",
+    "version" : "13.1",
+    "author" : "Slobodni programi d.o.o.",
+    "category" : "Localisation/Croatia",
+    "website": "http://www.slobodni-programi.hr",
+    'depends': ['account',],
+    'init_xml': [],
+    'update_xml': [ 'account_view.xml',],
+    "demo_xml" : [],
+    'test' : [],
+    "active": False,
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
 
=== added file 'account_storno/account.py'
--- account_storno/account.py	1970-01-01 00:00:00 +0000
+++ account_storno/account.py	2013-04-10 09:33:20 +0000
@@ -0,0 +1,96 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Module: account_storno
+#    Author: Goran Kliska
+#    mail:   gkliskaATgmail.com, 
+#    Copyright (C) 2011- Slobodni programi d.o.o., Zagreb www.slobodni-programi.hr
+#    Contributions: 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv, orm
+from openerp.tools import float_compare
+from openerp.tools.translate import _
+import decimal_precision as dp
+
+class account_journal(osv.osv):
+    _inherit = "account.journal"
+    _columns = {
+        'posting_policy':fields.selection([
+                                           ('contra', 'Contra (debit<->credit)'),
+                                           ('storno', 'Storno (-)'),
+                                           ],
+                                          'Storno or Contra', size=16, required=True,
+                                           help="Storno allows minus postings, Refunds are posted on the same joural/account * (-1).\n"
+                                                "Contra doesn't allow negative posting. Refunds are posted by swaping credit and debit side."
+                                        ),
+        'refund_journal_id':fields.many2one('account.journal', 'Refund journal',
+                                           help="Journal for refunds/returns from this journal. Leave empty to use same journal for normal and refund/return postings.",
+                                            ),
+                }
+    _defaults = {'posting_policy': 'storno', 
+                }
+
+
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+    #Original constraints
+    #_sql_constraints = [
+    #('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
+    #('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
+    #]
+    # credit_debit1 is valid constraint. Clear message   
+    # credit_debit2 is replaced with dummy constraint that is always true.   
+
+    _sql_constraints = [
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry! Either credit or debit must be 0.00.'),
+        ('credit_debit2', 'CHECK (abs(credit+debit)>=0)', 'Wrong credit or debit value in accounting entry !'),
+    ]
+
+    def _check_contra_minus(self, cr, uid, ids, context=None):
+        """ This is to restore credit_debit2 check functionality, for contra journals 
+        """
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.journal_id.posting_policy == 'contra':
+                if l.debit + l.credit < 0.0:
+                    return False
+        return True
+
+    def _check_storno_tax(self, cr, uid, ids, context=None):
+        """For Storno accounting Tax/Base amount is always == (debit + credit)
+           Still trying to find the case where it is not.
+           Maybe for contra check is abs(tax_amount) = abs(debit + credit) ???     
+        """
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.journal_id.posting_policy == 'storno' and l.tax_code_id:
+                if float_compare((l.debit + l.credit), l.tax_amount, precision_digits = 2) != 0:   #precision_digits=dp.get_precision('Account')[1]) 
+                    return False
+        return True
+
+    _constraints = [
+        (_check_contra_minus, _('Negative credit or debit amount is not allowed for "contra" journal policy.'), ['journal_id']),
+        (_check_storno_tax, _('Invalid tax amount. Tax amount can be 0.00 or equal to (Credit + Debit).'), ['journal_id']),
+    ]
+
+
+class account_model_line(osv.osv):
+    _inherit = "account.model.line"
+    _sql_constraints = [
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model! Either credit or debit must be 0.00.'),
+        ('credit_debit2', 'CHECK (abs(credit+debit)>=0)', 'Wrong credit or debit value in accounting entry !'),
+    ]
 
=== added file 'account_storno/account_invoice_refund.py'
--- account_storno/account_invoice_refund.py	1970-01-01 00:00:00 +0000
+++ account_storno/account_invoice_refund.py	2013-04-10 09:33:20 +0000
@@ -0,0 +1,125 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Module: account_storno
+#    Author: Goran Kliska
+#    mail:   gkliskaATgmail.com
+#    Copyright (C) 2011- Slobodni programi d.o.o., Zagreb
+#    Contributions: 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class account_invoice(osv.osv):
+    """Not knowing legal requirements of all storno countries about journals
+       This version is for Croatia, Bih, Serbia...
+       Candidate for new module?  
+    """
+    _inherit = "account.invoice"
+
+    def _journal_invoice_type_dict(self):
+        return {'sale': 'out_invoice', # Customer Invoice
+                'purchase': 'in_invoice', # Customer Refund
+                'sale_refund': 'out_refund',   # Supplier Invoice
+                'purchase_refund': 'in_refund',   # Supplier Refund
+                }
+
+    def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
+        #Where is the context, per invoice method?
+        #This approach is slow, updating after creating, but maybe better than copy-paste whole method
+        res = super(account_invoice, self).refund(cr, uid, ids, date=date, period_id=period_id, description=description, journal_id=journal_id)
+        for invoice in self.pool.get('account.invoice').browse(cr, uid, res):
+            self.pool.get('account.invoice').write(cr, uid, [invoice.id],
+                  {'type': self._journal_invoice_type_dict()[invoice.journal_id.type] })
+            if invoice.journal_id.posting_policy == 'storno':
+                for inv_line in invoice.invoice_line:
+                    self.pool.get('account.invoice.line').write(cr, uid, 
+                                [inv_line.id],
+                                {'quantity': inv_line.quantity * (-1) })
+                for tax_line in invoice.tax_line:
+                    if tax_line.manual or True:
+                        self.pool.get('account.invoice.tax').write(cr, uid, 
+                                    [tax_line.id],
+                                    {'base': tax_line.base * (-1),
+                                     'amount': tax_line.amount * (-1),
+                                     'base_amount': tax_line.base_amount * (-1),
+                                     'tax_amount': tax_line.tax_amount * (-1), 
+                                     })
+        return res
+
+    
+class account_invoice_refund(osv.osv_memory):
+    _inherit = "account.invoice.refund"
+
+    def _get_journal(self, cr, uid, context=None):
+            """"in Croatia, for out invoice refunds must go to same journal  #TODO for localization
+            """
+            #borrowed from Akretion account_journal_sale_refund_link
+            #compatibility with crm_claim_rma module
+            invoice_id = context.get('invoice_ids', [context['active_id']])[0]
+            invoice = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
+            refund_journal_id = invoice.journal_id.refund_journal_id
+            if refund_journal_id:
+                return refund_journal_id.id
+            elif invoice.journal_id.posting_policy == 'storno':
+                return False  #meaning: same journal as original 
+            else:
+                return super(account_invoice_refund, self)._get_journal(cr, uid, context)
+
+    _defaults = {
+        'journal_id': _get_journal,
+        'filter_refund': 'modify',
+        }
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        journal_obj = self.pool.get('account.journal')
+        user_obj = self.pool.get('res.users')
+        res = super(account_invoice_refund,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        company_id = user_obj.browse(cr, uid, uid, context=context).company_id.id
+        #I would love to have invoice.journal_id.posting_policy here
+        invoice_type = context.get('type', 'all')
+        if invoice_type in ('out_invoice', 'out_refund'):
+            journal_types = ('sale','sale_refund')
+        elif invoice_type in ('in_invoice', 'in_refund'):
+            journal_types = ('purchase','purchase_refund')
+        else:
+            journal_types = ('sale','sale_refund','purchase','purchase_refund') 
+        journal_select = journal_obj._name_search(cr, uid, '', [('type', 'in', journal_types), ('company_id','child_of',[company_id])], context=context)
+        #original for loop needed??? 
+        res['fields']['journal_id']['selection'] = journal_select
+        return res
+
+    def compute_refund(self, cr, uid, ids, mode='refund', context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        res = super(account_invoice_refund,self).compute_refund(cr, uid, ids, mode=mode, context=context)
+        last_inv_id = res['domain'][1][2][-1]  #yupiii here is last created invoice id, great hook
+        inv = self.pool.get('account.invoice').browse(cr, uid, [last_inv_id])[0]
+        xml_id = (inv.type == 'out_refund') and 'action_invoice_tree3' or \
+                 (inv.type == 'in_refund') and 'action_invoice_tree4' or \
+                 (inv.type == 'out_invoice') and 'action_invoice_tree1' or \
+                 (inv.type == 'in_invoice') and 'action_invoice_tree2'
+        result = mod_obj.get_object_reference(cr, uid, 'account', xml_id)
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, id, context=context)
+        invoice_domain = eval(result['domain'])
+        invoice_domain.append(('id', 'in', res['domain'][1][2] ))
+        result['domain'] = invoice_domain
+        return result
 
=== added file 'account_storno/account_view.xml'
--- account_storno/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_storno/account_view.xml	2013-04-10 09:33:20 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+	<record id="view_account_journal_form_posting_policy" model="ir.ui.view">
+		<field name="name">account.journal.form.storno</field>
+		<field name="model">account.journal</field>
+		<field name="type">form</field>
+		<field name="inherit_id" ref="account.view_account_journal_form" />
+		<field name="arch" type="xml">
+		    <field name="centralisation" position="after">
+		          <field name="posting_policy" groups="account.group_account_manager"/>
+		          <field name="refund_journal_id" groups="account.group_account_manager"/>
+		    </field>                    
+		</field>
+	</record>
+ </data>
+</openerp>
 \ No newline at end of file
 
=== added directory 'account_storno/i18n'
=== added file 'account_storno/i18n/account_storno.pot'
--- account_storno/i18n/account_storno.pot	1970-01-01 00:00:00 +0000
+++ account_storno/i18n/account_storno.pot	2013-04-10 09:33:20 +0000
@@ -0,0 +1,212 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_storno
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1beta\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-04 12:30+0000\n"
+"PO-Revision-Date: 2012-01-04 12:30+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:212
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "Can not %s draft/proforma/cancel invoice."
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Company must be the same for its related account and period."
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:45
+#, python-format
+msgid "No Invoice Lines !"
+msgstr "No Invoice Lines !"
+
+#. module: account_storno
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "The name of the journal must be unique per company !"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:62
+#, python-format
+msgid "Bad total !"
+msgstr "Bad total !"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:73
+#, python-format
+msgid "Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount."
+msgstr "Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount."
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:45
+#, python-format
+msgid "Please create some invoice lines."
+msgstr "Please create some invoice lines."
+
+#. module: account_storno
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr "Wrong credit or debit value in model, they must be positive!"
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:212
+#: code:addons/account_storno/account_invoice_refund.py:214
+#: code:addons/account_storno/invoice.py:43
+#: code:addons/account_storno/invoice.py:73
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_storno
+#: selection:account.journal,posting_policy:0
+msgid "Contra (debit<->credit)"
+msgstr "Contra (debit<->credit)"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:43
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Please define sequence on invoice journal"
+
+#. module: account_storno
+#: field:account.journal,refund_journal_id:0
+msgid "Invoice refund journal"
+msgstr "Invoice refund journal"
+
+#. module: account_storno
+#: selection:account.journal,posting_policy:0
+msgid "Storno (-)"
+msgstr "Storno (-)"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Items"
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "You can not create journal items on an account of type view."
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:161
+#, python-format
+msgid "You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu."
+msgstr "You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu."
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:250
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr "No Period found on Invoice!"
+
+#. module: account_storno
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Account Model Entries"
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "You can not create journal items on closed account."
+
+#. module: account_storno
+#: constraint:account.journal:0
+msgid "Configuration error! The currency chosen should be shared by the default accounts too."
+msgstr "Configuration error! The currency chosen should be shared by the default accounts too."
+
+#. module: account_storno
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Wrong credit or debit value in accounting entry !"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:160
+#, python-format
+msgid "UserError"
+msgstr "UserError"
+
+#. module: account_storno
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Invoice Number must be unique per Company!"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:62
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Invoice Refund"
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:249
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Data Insufficient !"
+
+#. module: account_storno
+#: field:account.journal,posting_policy:0
+msgid "Storno or Contra"
+msgstr "Storno or Contra"
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+msgstr "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+msgstr "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:214
+#, python-format
+msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
+msgstr "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
+
+#. module: account_storno
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "The code of the journal must be unique per company !"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: account_storno
+#: help:account.journal,posting_policy:0
+msgid "Contra doesn't allow negative posting by swaping credit and debit side. Storno allows minus postings."
+msgstr "Contra doesn't allow negative posting by swaping credit and debit side. Storno allows minus postings."
+
 
=== added file 'account_storno/i18n/hr.po'
--- account_storno/i18n/hr.po	1970-01-01 00:00:00 +0000
+++ account_storno/i18n/hr.po	2013-04-10 09:33:20 +0000
@@ -0,0 +1,212 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_storno
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1beta\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-04 12:30+0000\n"
+"PO-Revision-Date: 2012-01-04 12:30+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:212
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr "Can not %s draft/proforma/cancel invoice."
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Company must be the same for its related account and period."
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:45
+#, python-format
+msgid "No Invoice Lines !"
+msgstr "No Invoice Lines !"
+
+#. module: account_storno
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "The name of the journal must be unique per company !"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:62
+#, python-format
+msgid "Bad total !"
+msgstr "Bad total !"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:73
+#, python-format
+msgid "Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount."
+msgstr "Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount."
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:45
+#, python-format
+msgid "Please create some invoice lines."
+msgstr "Please create some invoice lines."
+
+#. module: account_storno
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr "Wrong credit or debit value in model, they must be positive!"
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:212
+#: code:addons/account_storno/account_invoice_refund.py:214
+#: code:addons/account_storno/invoice.py:43
+#: code:addons/account_storno/invoice.py:73
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_storno
+#: selection:account.journal,posting_policy:0
+msgid "Contra (debit<->credit)"
+msgstr "Contra (debit<->credit)"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:43
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr "Please define sequence on invoice journal"
+
+#. module: account_storno
+#: field:account.journal,refund_journal_id:0
+msgid "Invoice refund journal"
+msgstr "Invoice refund journal"
+
+#. module: account_storno
+#: selection:account.journal,posting_policy:0
+msgid "Storno (-)"
+msgstr "Storno (-)"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Items"
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "You can not create journal items on an account of type view."
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:161
+#, python-format
+msgid "You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu."
+msgstr "You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu."
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:250
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr "No Period found on Invoice!"
+
+#. module: account_storno
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_model_line
+msgid "Account Model Entries"
+msgstr "Account Model Entries"
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "You can not create journal items on closed account."
+
+#. module: account_storno
+#: constraint:account.journal:0
+msgid "Configuration error! The currency chosen should be shared by the default accounts too."
+msgstr "Configuration error! The currency chosen should be shared by the default accounts too."
+
+#. module: account_storno
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Wrong credit or debit value in accounting entry !"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:160
+#, python-format
+msgid "UserError"
+msgstr "UserError"
+
+#. module: account_storno
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Invoice Number must be unique per Company!"
+
+#. module: account_storno
+#: code:addons/account_storno/invoice.py:62
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Invoice Refund"
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:249
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Data Insufficient !"
+
+#. module: account_storno
+#: field:account.journal,posting_policy:0
+msgid "Storno or Contra"
+msgstr "Storno or Contra"
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+msgstr "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+
+#. module: account_storno
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+msgstr "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
+
+#. module: account_storno
+#: code:addons/account_storno/account_invoice_refund.py:214
+#, python-format
+msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
+msgstr "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
+
+#. module: account_storno
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "The code of the journal must be unique per company !"
+
+#. module: account_storno
+#: model:ir.model,name:account_storno.model_account_invoice
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: account_storno
+#: help:account.journal,posting_policy:0
+msgid "Contra doesn't allow negative posting by swaping credit and debit side. Storno allows minus postings."
+msgstr "Contra doesn't allow negative posting by swaping credit and debit side. Storno allows minus postings."
+
 
=== added file 'account_storno/invoice.py'
--- account_storno/invoice.py	1970-01-01 00:00:00 +0000
+++ account_storno/invoice.py	2013-04-10 09:33:20 +0000
@@ -0,0 +1,88 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Module: account_storno
+#    Author: Goran Kliska
+#    mail:   gkliskaATgmail.com
+#    Copyright (C) 2013- Slobodni programi d.o.o., Zagreb
+#    Contributions: 
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv, orm
+import time
+from tools.translate import _ 
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def action_move_create(self, cr, uid, ids, context=None):
+        """Creates invoice related analytics and financial move lines
+           We have to go one by one to inject invoice to line_get_convert
+        """
+        if context is None:
+            context = {}
+        for inv in self.browse(cr, uid, ids, context=context):
+            context.update({'brw_invoice': inv})
+            super(account_invoice,self).action_move_create(cr, uid, [inv.id], context=context)
+        return True
+
+    def line_get_convert(self, cr, uid, x, part, date, context=None):
+        res =super(account_invoice,self).line_get_convert(cr, uid, x, part, date, context=context)
+        if context is None:
+            context = {}
+        invoice = context.get('brw_invoice',False)
+        if invoice and invoice.journal_id.posting_policy=='storno':
+            credit = debit = 0.0
+            if invoice.type in ('out_invoice', 'out_refund'):
+                if x.get('type','src') in ('dest'):
+                    debit  = x['price']   # for OUT_invoice dest (tot. amount goes to debit)
+                else: # in('src','tax')    
+                    credit  = x['price'] * (-1)
+            else: #in ('in_invoice', 'in_refund')
+                if x.get('type','src') in ('dest'):
+                    credit  = x['price']  * (-1) 
+                else:    
+                    debit  = x['price']
+            res['debit']  = debit
+            res['credit'] = credit
+        return res
+
+    def group_lines(self, cr, uid, iml, line, inv):
+        """Merge account move lines (and hence analytic lines) if invoice line hashcodes are equals"""
+        if inv.journal_id.group_invoice_lines:
+            if inv.journal_id.posting_policy == 'contra':
+                return super(account_invoice,self).group_lines(cr, uid, iml, line, inv)
+            if inv.journal_id.posting_policy == 'storno':
+                line2 = {}
+                for x, y, l in line:
+                    hash = self.inv_line_characteristic_hashcode(inv, l)
+                    side = l['debit'] > 0 and 'debit' or 'credit'
+                    tmp = '-'.join((hash,side))
+                    if tmp in line2:
+                        line2[tmp]['debit'] += l['debit'] or 0.0
+                        line2[tmp]['credit'] += l['credit'] or 0.00
+                        line2[tmp]['tax_amount'] += l['tax_amount']
+                        line2[tmp]['analytic_lines'] += l['analytic_lines']
+                        line2[tmp]['amount_currency'] += l['amount_currency']
+                        line2[tmp]['quantity'] += l['quantity']
+                    else:
+                        line2[tmp] = l
+                line = []
+                for key, val in line2.items():
+                    line.append((0,0,val))
+        return line