Merge lp:~sandi-dirntis/openerpsl/20140717_1 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[MOD] Code cleanup

[lp:~sandi-dirntis/openerpsl/20140717_1]

434. By Dušan Laznik (Mentis) on 2014-07-18

[MOD] Code cleanup

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-07-17 08:32:41 +0000
@@ -0,0 +1,1 @@
+./.git

=== modified file 'account_slovenian/__init__.py'
--- account_slovenian/__init__.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/__init__.py	2014-07-17 08:32:41 +0000
@@ -21,12 +21,5 @@
 ##############################################################################
 
 import stock_picking
-import stock_move
 import purchase_order
-import account_invoice
 import account_invoice_line
-import account_move_line
-import account_model_line
-import account_voucher
-import account_voucher_line
-import account_journal

=== modified file 'account_slovenian/__openerp__.py'
--- account_slovenian/__openerp__.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/__openerp__.py	2014-07-17 08:32:41 +0000
@@ -22,25 +22,21 @@
 
 {
     'name': 'Slovenian Accounting',
-    'version': '0.10',
+    'version': '0.9',
     'author': 'Mentis d.o.o.',
     'website': 'http://www.mentis.si/openerp',
-    'description': """
-This module supports expands accounting according to Slovenian legislation
-=====================================================================================================
-
-- implemented negative values for refund journals and vouchers
-- input and output interim accounts and written on proper sides and in positive or negative numbers
-
+    'description':
+"""
+This module supports expands the Anglo-Saxon accounting methodology according to Slovenian legislation
+======================================================================================================
 Slovenian accounting expansion uses same input and output interim accounts depending if it is supplier
+or customer document.
 """,
     'images': [],
-    'depends': ['account','account_voucher','account_anglo_saxon'],
+    'depends': ['account_anglo_saxon'],
     'category': 'Accounting & Finance',
     'demo': [],
-    'data': [
-#        'account_voucher_view.xml'
-    ],
+    'data': [],
     'auto_install': False,
     'installable': True,
 }
\ No newline at end of file

=== removed file 'account_slovenian/account_invoice.py'
--- account_slovenian/account_invoice.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_invoice.py	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv, fields
-
-class account_invoice(osv.Model):
-    _inherit = "account.invoice"
-
-    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
-        move_lines = super(account_invoice, self).finalize_invoice_move_lines(cr, uid, invoice_browse, move_lines)
-
-        if invoice_browse.type in ('in_refund', 'out_refund'):
-            _move_lines = []
-            for line in move_lines:
-                if line[2]['credit'] and line[2]['credit'] != 0.0:
-                    _debit = line[2]['credit'] * -1
-                    _credit = False
-                else:
-                    _credit = line[2]['debit'] * -1
-                    _debit = False
-                line[2]['credit'] = _credit
-                line[2]['debit'] = _debit
-                _move_lines.append(line)
-            return _move_lines
-        else:
-            return move_lines

=== modified file 'account_slovenian/account_invoice_line.py'
--- account_slovenian/account_invoice_line.py	2014-04-02 13:42:12 +0000
+++ account_slovenian/account_invoice_line.py	2014-07-17 08:32:41 +0000
@@ -22,6 +22,7 @@
 
 from openerp.osv import osv
 
+
 class account_invoice_line(osv.Model):
     _inherit = "account.invoice.line"
 
@@ -35,12 +36,11 @@
         _res = []
         for _line in res:
             if _line.get('product_id', False):
-                _product_id = self.pool.get('product.product').browse(cr, uid, _line ['product_id'], context)
+                _product_id = self.pool.get('product.product').browse(cr, uid, _line['product_id'], context)
                 if _product_id and _product_id.valuation == 'real_time':
-
                     acc_out = _product_id.property_stock_account_output and _product_id.property_stock_account_output.id
                     if not acc_out:
-                        acc_out = _product_id.categ_id.property_stock_account_output_categ and _product_id.categ_id.property_stock_account_output_categ.id                    
+                        acc_out = _product_id.categ_id.property_stock_account_output_categ and _product_id.categ_id.property_stock_account_output_categ.id
 
                     acc_in = _product_id.property_stock_account_input and _product_id.property_stock_account_input.id
                     if not acc_in:
@@ -67,5 +67,5 @@
             if oa:
                 fpos = fposition_id and fiscal_pool.browse(cr, uid, fposition_id, context=context) or False
                 a = fiscal_pool.map_account(cr, uid, fpos, oa)
-                res['value'].update({'account_id':a})
+                res['value'].update({'account_id': a})
         return res

=== removed file 'account_slovenian/account_journal.py'
--- account_slovenian/account_journal.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_journal.py	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv, fields
-import openerp.addons.decimal_precision as dp
-
-class account_journal(osv.Model):
-    _inherit = "account.journal"
-
-    _columns = {
-        'type': fields.selection([('sale', 'Sale'),
-                                  ('sale_refund','Sale Refund'),
-                                  ('purchase', 'Purchase'),
-                                  ('purchase_refund','Purchase Refund'),
-                                  ('cash', 'Cash'),
-                                  ('bank', 'Bank and Checks'),
-                                  ('reconcile', 'Reconciliation'),
-                                  ('general', 'General'),
-                                  ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
-                                 help="Select 'Sale' for customer invoices journals."\
-                                 " Select 'Purchase' for supplier invoices journals."\
-                                 " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
-                                 " Select 'Reconciliation' for journals used for reconciling receivable and payable entries."\
-                                 " Select 'General' for miscellaneous operations journals."\
-                                 " Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
-    }

=== removed file 'account_slovenian/account_model_line.py'
--- account_slovenian/account_model_line.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_model_line.py	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv, fields
-import openerp.addons.decimal_precision as dp
-
-class account_model_line(osv.Model):
-    _inherit = "account.model.line"
-
-    _sql_constraints = [
-        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
-        ('credit_debit2', 'CHECK (ABS(credit+debit)>=0)', 'Wrong credit or debit value in accounting entry !'),
-    ]

=== removed file 'account_slovenian/account_move_line.py'
--- account_slovenian/account_move_line.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_move_line.py	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv, fields
-import openerp.addons.decimal_precision as dp
-
-class account_move_line(osv.Model):
-    _inherit = "account.move.line"
-
-    def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
-        """
-           This function returns the residual amount on a receivable or payable account.move.line.
-           By default, it returns an amount in the currency of this journal entry (maybe different
-           of the company currency), but if you pass 'residual_in_company_currency' = True in the
-           context then the returned amount will be in company currency.
-        """
-        res = {}
-        if context is None:
-            context = {}
-        cur_obj = self.pool.get('res.currency')
-        for move_line in self.browse(cr, uid, ids, context=context):
-            res[move_line.id] = {
-                'amount_residual': 0.0,
-                'amount_residual_currency': 0.0,
-            }
-
-            if move_line.reconcile_id:
-                continue
-            if not move_line.account_id.type in ('payable', 'receivable'):
-                #this function does not support to be used on move lines not related to payable or receivable accounts
-                continue
-
-            if move_line.currency_id:
-                move_line_total = move_line.amount_currency
-                sign = move_line.amount_currency < 0 and -1 or 1
-            else:
-                move_line_total = move_line.debit - move_line.credit
-                sign = (move_line.debit - move_line.credit) < 0 and -1 or 1
-            line_total_in_company_currency = move_line.debit - move_line.credit
-            context_unreconciled = context.copy()
-            if move_line.reconcile_partial_id:
-                for payment_line in move_line.reconcile_partial_id.line_partial_ids:
-                    if payment_line.id == move_line.id:
-                        continue
-                    if payment_line.currency_id and move_line.currency_id and payment_line.currency_id.id == move_line.currency_id.id:
-                            move_line_total += payment_line.amount_currency
-                    else:
-                        if move_line.currency_id:
-                            context_unreconciled.update({'date': payment_line.date})
-                            amount_in_foreign_currency = cur_obj.compute(cr, uid, move_line.company_id.currency_id.id, move_line.currency_id.id, (payment_line.debit - payment_line.credit), round=False, context=context_unreconciled)
-                            move_line_total += amount_in_foreign_currency
-                        else:
-                            move_line_total += (payment_line.debit - payment_line.credit)
-                    line_total_in_company_currency += (payment_line.debit - payment_line.credit)
-
-            result = move_line_total
-            res[move_line.id]['amount_residual_currency'] =  sign * (move_line.currency_id and self.pool.get('res.currency').round(cr, uid, move_line.currency_id, result) or result)
-            res[move_line.id]['amount_residual'] = sign * line_total_in_company_currency
-        return res
-
-    _columns = {
-        'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
-        'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
-    }
-
-    _sql_constraints = [
-        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
-        ('credit_debit2', 'CHECK (ABS(credit+debit)>=0)', 'Wrong credit or debit value in accounting entry !'),
-    ]

=== removed file 'account_slovenian/account_voucher.py'
--- account_slovenian/account_voucher.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_voucher.py	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv, fields
-import openerp.addons.decimal_precision as dp
-
-class account_voucher(osv.Model):
-    _inherit = "account.voucher"
-
-    def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
-        tot_line, rec_lst_ids = super(account_voucher, self).voucher_move_line_create(cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context)
-
-        _negative_values = False
-        for _lines in rec_lst_ids:
-            _origin_move = self.pool.get('account.move.line').browse(cr, uid, _lines[1], context)
-            if _origin_move.debit < 0.0 or _origin_move.credit < 0.0:
-                _negative_values = True
-
-        if _negative_values:
-            for _lines in rec_lst_ids:
-                _reconc_move = self.pool.get('account.move.line').browse(cr, uid, _lines[0], context)
-                _origin_move = self.pool.get('account.move.line').browse(cr, uid, _lines[1], context)
-
-                _credit = _reconc_move.credit
-                _debit = _reconc_move.debit
-
-                if _origin_move.credit and _origin_move.credit != 0.0:
-                    if _origin_move.credit > 0.0:
-                        _credit = abs(_reconc_move.credit + _reconc_move.debit) * -1
-                        _debit = False
-                    else:
-                        _credit = abs(_reconc_move.credit + _reconc_move.debit)
-                        _debit = False
-                elif _origin_move.debit and _origin_move.debit != 0.0:
-                    if _origin_move.debit > 0.0:
-                        _debit = abs(_reconc_move.credit + _reconc_move.debit) * -1
-                        _credit = False
-                    else:
-                        _debit = abs(_reconc_move.credit + _reconc_move.debit)
-                        _credit = False
-
-                _reconc_move.write({'debit': _debit, 'credit': _credit})
-
-        return tot_line, rec_lst_ids

=== removed file 'account_slovenian/account_voucher_line.py'
--- account_slovenian/account_voucher_line.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_voucher_line.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv, fields
-import openerp.addons.decimal_precision as dp
-
-class account_voucher_line(osv.Model):
-    _inherit = "account.voucher.line"
-
-    def _compute_balance(self, cr, uid, ids, name, args, context=None):
-        currency_pool = self.pool.get('res.currency')
-        rs_data = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            ctx = context.copy()
-            ctx.update({'date': line.voucher_id.date})
-            voucher_rate = self.pool.get('res.currency').read(cr, uid, line.voucher_id.currency_id.id, ['rate'], context=ctx)['rate']
-            ctx.update({
-                'voucher_special_currency': line.voucher_id.payment_rate_currency_id and line.voucher_id.payment_rate_currency_id.id or False,
-                'voucher_special_currency_rate': line.voucher_id.payment_rate * voucher_rate})
-            res = {}
-            company_currency = line.voucher_id.journal_id.company_id.currency_id.id
-            voucher_currency = line.voucher_id.currency_id and line.voucher_id.currency_id.id or company_currency
-            move_line = line.move_line_id or False
-
-            if not move_line:
-                res['amount_original'] = 0.0
-                res['amount_unreconciled'] = 0.0
-            elif move_line.currency_id and voucher_currency==move_line.currency_id.id:
-                res['amount_original'] = move_line.amount_currency
-                res['amount_unreconciled'] = move_line.amount_residual_currency
-            else:
-                #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit or move_line.debit or 0.0, context=ctx)
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.amount_residual, context=ctx)
-
-            rs_data[line.id] = res
-        return rs_data
-
-    _columns = {
-        'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True, digits_compute=dp.get_precision('Account')),
-        'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
-    }

=== removed file 'account_slovenian/account_voucher_view.xml'
--- account_slovenian/account_voucher_view.xml	2014-06-26 12:21:06 +0000
+++ account_slovenian/account_voucher_view.xml	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <record id="view_voucher_filter_customer_pay_inherit" model="ir.ui.view">
-            <field name="name">account.voucher.customer.pay.select</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="replace">
-                    <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}"
-                           domain="[('type','in',['bank','cash','reconcile'])]"/>
-                </field>
-            </field>
-        </record>
-
-        <record id="view_voucher_filter_vendor_pay_inherit" model="ir.ui.view">
-            <field name="name">account.voucher.purchase.pay.select</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_voucher_filter_vendor_pay"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="replace">
-                    <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}"
-                           domain="[('type','in',['bank','cash','reconcile'])]"/>
-                </field>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_low_priority_payment_form_inherit">
-            <field name="name">account.voucher.payment.low.priority.form</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_low_priority_payment_form"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="replace">
-                    <field name="journal_id" string="Payment Method" widget="selection"
-                           domain="[('type','in',['bank','cash','reconcile'])]"
-                           on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"/>
-                </field>
-            </field>
-        </record>
-
-        <!-- Supplier Payment -->
-        <record model="ir.ui.view" id="view_vendor_payment_form_inherit">
-            <field name="name">account.voucher.payment.form</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="replace">
-                    <field name="journal_id" string="Payment Method" widget="selection"
-                           domain="[('type','in',['bank','cash','reconcile'])]"
-                           invisible="context.get('line_type', False)"
-                           on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"/>
-                </field>
-            </field>
-        </record>
-
-        <delete model="ir.actions.act_window" id="account_voucher.action_vendor_payment"/>
-        <record id="action_vendor_payment" model="ir.actions.act_window">
-            <field name="name">Supplier Payments</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank','cash','reconcile']), ('type','=','payment')]</field>
-            <field name="context">{'type':'payment'}</field>
-            <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="view_voucher_filter_vendor_pay_inherit"/>
-            <field name="target">current</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a new supplier payment.
-              </p><p>
-                OpenERP helps you easily track payments you make and the remaining balances you need to pay your suppliers.
-              </p>
-            </field>
-        </record>
-        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
-            id="menu_action_vendor_payment" parent="account.menu_finance_payables"/>
-
-        <record model="ir.ui.view" id="view_vendor_receipt_dialog_form_inherit">
-            <field name="name">account.voucher.receipt.dialog.form</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_dialog_form"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="replace">
-                    <field name="journal_id" string="Payment Method" widget="selection"
-                           domain="[('type','in',['bank','cash','reconcile'])]"
-                           invisible="context.get('line_type', False)"
-                           on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"/>
-                </field>
-            </field>
-        </record>
-
-
-        <!-- Customer Payment -->
-        <record model="ir.ui.view" id="view_vendor_receipt_form_inherit">
-            <field name="name">account.voucher.receipt.form</field>
-            <field name="model">account.voucher</field>
-            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
-            <field name="arch" type="xml">
-                <field name="journal_id" position="replace">
-                    <field name="journal_id" string="Payment Method" widget="selection"
-                           domain="[('type','in',['bank','cash','reconcile'])]"
-                           on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"/>
-                </field>
-            </field>
-        </record>
-
-        <delete model="ir.actions.act_window" id="account_voucher.action_vendor_receipt"/>
-        <record id="action_vendor_receipt" model="ir.actions.act_window">
-            <field name="name">Customer Payments</field>
-            <field name="res_model">account.voucher</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank','cash','reconcile']), ('type','=','receipt')]</field>
-            <field name="context">{'type':'receipt'}</field>
-            <field name="search_view_id" ref="view_voucher_filter_customer_pay_inherit"/>
-            <field name="view_id" eval="False"/>
-            <field name="target">current</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to register a new payment. 
-              </p><p>
-                Enter the customer and the payment method and then, either
-                create manually a payment record or OpenERP will propose to you
-                automatically the reconciliation of this payment with the open
-                invoices or sales receipts.
-              </p>
-            </field>
-        </record>
-        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="12"
-            id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
-
-    </data>
-</openerp>

=== modified file 'account_slovenian/purchase_order.py'
--- account_slovenian/purchase_order.py	2014-03-17 07:50:11 +0000
+++ account_slovenian/purchase_order.py	2014-07-17 08:32:41 +0000
@@ -22,6 +22,7 @@
 
 from openerp.osv import fields, osv
 
+
 class purchase_order(osv.Model):
     _name = "purchase.order"
     _inherit = "purchase.order"

=== removed file 'account_slovenian/stock_move.py'
--- account_slovenian/stock_move.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/stock_move.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
-#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
-#
-#    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 openerp.osv import osv
-
-class stock_move(osv.Model):
-    _inherit = "stock.move"
-
-    def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
-        _move_lines = super(stock_move, self)._create_account_move_line(cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context)
-        _old_debit_lines = _move_lines[0][2]
-        _old_credit_lines = _move_lines[1][2]
-
-        if (move.picking_id.type == 'in' and move.location_id.usage == 'customer') \
-           or (move.picking_id.type == 'out' and move.location_dest_id.usage == 'supplier'):
-            _new_debit_lines = _old_credit_lines.copy()
-            _new_debit_lines['debit'] = _new_debit_lines['credit'] * -1
-            _new_debit_lines['credit'] = 0.0
-
-            _new_credit_lines = _old_debit_lines.copy()
-            _new_credit_lines['credit'] = _new_credit_lines['debit'] * -1
-            _new_credit_lines['debit'] = 0.0
-        else:
-            _new_debit_lines = _old_debit_lines
-            _new_credit_lines = _old_credit_lines
-
-        return [(0, 0, _new_debit_lines), (0, 0, _new_credit_lines)]

=== modified file 'account_slovenian/stock_picking.py'
--- account_slovenian/stock_picking.py	2014-06-26 12:21:06 +0000
+++ account_slovenian/stock_picking.py	2014-07-17 08:32:41 +0000
@@ -22,12 +22,11 @@
 
 from openerp.osv import osv
 
+
 class stock_picking(osv.Model):
     _inherit = "stock.picking"
 
-    def action_invoice_create(self, cr, uid, ids, journal_id=False,
-            group=False, type='out_invoice', context=None):
-        '''Return ids of created invoices for the pickings'''
+    def action_invoice_create(self, cr, uid, ids, journal_id=False, group=False, type='out_invoice', context=None):
         res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context=context)
         if type == 'in_invoice' or type == 'in_refund':
             for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
@@ -35,7 +34,7 @@
                     if ol.product_id:
                         oa = ol.product_id.property_stock_account_input and ol.product_id.property_stock_account_input.id
                         if not oa:
-                            oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id        
+                            oa = ol.product_id.categ_id.property_stock_account_input_categ and ol.product_id.categ_id.property_stock_account_input_categ.id
                         if oa:
                             fpos = ol.invoice_id.fiscal_position or False
                             a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)

=== added directory 'account_slovenian_storno'
=== added file 'account_slovenian_storno/__init__.py'
--- account_slovenian_storno/__init__.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/__init__.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 stock_move
+import account_invoice
+import account_move_line
+import account_model_line
+import account_voucher
+import account_voucher_line
+#import account_journal

=== added file 'account_slovenian_storno/__openerp__.py'
--- account_slovenian_storno/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/__openerp__.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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': 'Slovenian Accounting - Storno',
+    'version': '0.9',
+    'author': 'Mentis d.o.o.',
+    'website': 'http://www.mentis.si/openerp',
+    'description':
+"""
+This module supports expands accounting with option of using negative values in accounting documents
+====================================================================================================
+- implemented negative values for refund journals and vouchers
+""",
+    'images': [],
+    'depends': ['account', 'account_voucher', 'account_slovenian'],
+    'category': 'Accounting & Finance',
+    'demo': [],
+    'data': [
+#        'account_voucher_view.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
+}
\ No newline at end of file

=== added file 'account_slovenian_storno/account_invoice.py'
--- account_slovenian_storno/account_invoice.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_invoice.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv, fields
+
+
+class account_invoice(osv.Model):
+    _inherit = "account.invoice"
+
+    def finalize_invoice_move_lines(self, cr, uid, invoice_browse, move_lines):
+        move_lines = super(account_invoice, self).finalize_invoice_move_lines(cr, uid, invoice_browse, move_lines)
+
+        if invoice_browse.type in ('in_refund', 'out_refund'):
+            _move_lines = []
+            for line in move_lines:
+                if line[2]['credit'] and line[2]['credit'] != 0.0:
+                    _debit = line[2]['credit'] * -1
+                    _credit = False
+                else:
+                    _credit = line[2]['debit'] * -1
+                    _debit = False
+                line[2]['credit'] = _credit
+                line[2]['debit'] = _debit
+                _move_lines.append(line)
+            return _move_lines
+        else:
+            return move_lines

=== added file 'account_slovenian_storno/account_journal.py'
--- account_slovenian_storno/account_journal.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_journal.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv, fields
+import openerp.addons.decimal_precision as dp
+
+
+class account_journal(osv.Model):
+    _inherit = "account.journal"
+
+    _columns = {
+        'type': fields.selection([('sale', 'Sale'),
+                                  ('sale_refund', 'Sale Refund'),
+                                  ('purchase', 'Purchase'),
+                                  ('purchase_refund', 'Purchase Refund'),
+                                  ('cash', 'Cash'),
+                                  ('bank', 'Bank and Checks'),
+                                  ('reconcile', 'Reconciliation'),
+                                  ('general', 'General'),
+                                  ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
+                                 help="Select 'Sale' for customer invoices journals."
+                                 " Select 'Purchase' for supplier invoices journals."
+                                 " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."
+                                 " Select 'Reconciliation' for journals used for reconciling receivable and payable entries."
+                                 " Select 'General' for miscellaneous operations journals."
+                                 " Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
+    }

=== added file 'account_slovenian_storno/account_model_line.py'
--- account_slovenian_storno/account_model_line.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_model_line.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv, fields
+import openerp.addons.decimal_precision as dp
+
+
+class account_model_line(osv.Model):
+    _inherit = "account.model.line"
+
+    _sql_constraints = [
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
+        ('credit_debit2', 'CHECK (ABS(credit+debit)>=0)', 'Wrong credit or debit value in accounting entry !'),
+    ]

=== added file 'account_slovenian_storno/account_move_line.py'
--- account_slovenian_storno/account_move_line.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_move_line.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,85 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv, fields
+import openerp.addons.decimal_precision as dp
+
+
+class account_move_line(osv.Model):
+    _inherit = "account.move.line"
+
+    def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
+        res = {}
+        if context is None:
+            context = {}
+        cur_obj = self.pool.get('res.currency')
+        for move_line in self.browse(cr, uid, ids, context=context):
+            res[move_line.id] = {
+                'amount_residual': 0.0,
+                'amount_residual_currency': 0.0,
+            }
+
+            if move_line.reconcile_id:
+                continue
+            if not move_line.account_id.type in ('payable', 'receivable'):
+                continue
+
+            if move_line.currency_id:
+                move_line_total = move_line.amount_currency
+                sign = move_line.amount_currency < 0 and -1 or 1
+            else:
+                move_line_total = move_line.debit - move_line.credit
+                sign = (move_line.debit - move_line.credit) < 0 and -1 or 1
+            line_total_in_company_currency = move_line.debit - move_line.credit
+            context_unreconciled = context.copy()
+            if move_line.reconcile_partial_id:
+                for payment_line in move_line.reconcile_partial_id.line_partial_ids:
+                    if payment_line.id == move_line.id:
+                        continue
+                    if payment_line.currency_id and move_line.currency_id and \
+                        payment_line.currency_id.id == move_line.currency_id.id:
+                            move_line_total += payment_line.amount_currency
+                    else:
+                        if move_line.currency_id:
+                            context_unreconciled.update({'date': payment_line.date})
+                            amount_in_foreign_currency = cur_obj.compute(cr, uid, move_line.company_id.currency_id.id, move_line.currency_id.id, (payment_line.debit - payment_line.credit), round=False, context=context_unreconciled)
+                            move_line_total += amount_in_foreign_currency
+                        else:
+                            move_line_total += (payment_line.debit - payment_line.credit)
+                    line_total_in_company_currency += (payment_line.debit - payment_line.credit)
+
+            result = move_line_total
+            res[move_line.id]['amount_residual_currency'] = sign * (move_line.currency_id and self.pool.get('res.currency').round(cr, uid, move_line.currency_id, result) or result)
+            res[move_line.id]['amount_residual'] = sign * line_total_in_company_currency
+        return res
+
+    _columns = {
+        'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual",
+                                                    help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
+        'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual",
+                                           help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
+    }
+
+    _sql_constraints = [
+        ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in accounting entry !'),
+        ('credit_debit2', 'CHECK (ABS(credit+debit)>=0)', 'Wrong credit or debit value in accounting entry !'),
+    ]

=== added file 'account_slovenian_storno/account_voucher.py'
--- account_slovenian_storno/account_voucher.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_voucher.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv, fields
+import openerp.addons.decimal_precision as dp
+
+class account_voucher(osv.Model):
+    _inherit = "account.voucher"
+
+    def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
+        tot_line, rec_lst_ids = super(account_voucher, self).voucher_move_line_create(cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context)
+
+        _negative_values = False
+        for _lines in rec_lst_ids:
+            _origin_move = self.pool.get('account.move.line').browse(cr, uid, _lines[1], context)
+            if _origin_move.debit < 0.0 or _origin_move.credit < 0.0:
+                _negative_values = True
+
+        if _negative_values:
+            for _lines in rec_lst_ids:
+                _reconc_move = self.pool.get('account.move.line').browse(cr, uid, _lines[0], context)
+                _origin_move = self.pool.get('account.move.line').browse(cr, uid, _lines[1], context)
+
+                _credit = _reconc_move.credit
+                _debit = _reconc_move.debit
+
+                if _origin_move.credit and _origin_move.credit != 0.0:
+                    if _origin_move.credit > 0.0:
+                        _credit = abs(_reconc_move.credit + _reconc_move.debit) * -1
+                        _debit = False
+                    else:
+                        _credit = abs(_reconc_move.credit + _reconc_move.debit)
+                        _debit = False
+                elif _origin_move.debit and _origin_move.debit != 0.0:
+                    if _origin_move.debit > 0.0:
+                        _debit = abs(_reconc_move.credit + _reconc_move.debit) * -1
+                        _credit = False
+                    else:
+                        _debit = abs(_reconc_move.credit + _reconc_move.debit)
+                        _credit = False
+
+                _reconc_move.write({'debit': _debit, 'credit': _credit})
+
+        return tot_line, rec_lst_ids

=== added file 'account_slovenian_storno/account_voucher_line.py'
--- account_slovenian_storno/account_voucher_line.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_voucher_line.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv, fields
+import openerp.addons.decimal_precision as dp
+
+class account_voucher_line(osv.Model):
+    _inherit = "account.voucher.line"
+
+    def _compute_balance(self, cr, uid, ids, name, args, context=None):
+        currency_pool = self.pool.get('res.currency')
+        rs_data = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            ctx = context.copy()
+            ctx.update({'date': line.voucher_id.date})
+            voucher_rate = self.pool.get('res.currency').read(cr, uid, line.voucher_id.currency_id.id, ['rate'], context=ctx)['rate']
+            ctx.update({
+                'voucher_special_currency': line.voucher_id.payment_rate_currency_id and line.voucher_id.payment_rate_currency_id.id or False,
+                'voucher_special_currency_rate': line.voucher_id.payment_rate * voucher_rate})
+            res = {}
+            company_currency = line.voucher_id.journal_id.company_id.currency_id.id
+            voucher_currency = line.voucher_id.currency_id and line.voucher_id.currency_id.id or company_currency
+            move_line = line.move_line_id or False
+
+            if not move_line:
+                res['amount_original'] = 0.0
+                res['amount_unreconciled'] = 0.0
+            elif move_line.currency_id and voucher_currency==move_line.currency_id.id:
+                res['amount_original'] = move_line.amount_currency
+                res['amount_unreconciled'] = move_line.amount_residual_currency
+            else:
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit or move_line.debit or 0.0, context=ctx)
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.amount_residual, context=ctx)
+
+            rs_data[line.id] = res
+        return rs_data
+
+    _columns = {
+        'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True, digits_compute=dp.get_precision('Account')),
+        'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True, digits_compute=dp.get_precision('Account')),
+    }

=== added file 'account_slovenian_storno/account_voucher_view.xml'
--- account_slovenian_storno/account_voucher_view.xml	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/account_voucher_view.xml	2014-07-17 08:32:41 +0000
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="view_voucher_filter_customer_pay_inherit" model="ir.ui.view">
+            <field name="name">account.voucher.customer.pay.select</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}"
+                           domain="[('type','in',['bank','cash','reconcile'])]"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_voucher_filter_vendor_pay_inherit" model="ir.ui.view">
+            <field name="name">account.voucher.purchase.pay.select</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_voucher_filter_vendor_pay"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}"
+                           domain="[('type','in',['bank','cash','reconcile'])]"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_low_priority_payment_form_inherit">
+            <field name="name">account.voucher.payment.low.priority.form</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_low_priority_payment_form"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" string="Payment Method" widget="selection"
+                           domain="[('type','in',['bank','cash','reconcile'])]"
+                           on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"/>
+                </field>
+            </field>
+        </record>
+
+        <!-- Supplier Payment -->
+        <record model="ir.ui.view" id="view_vendor_payment_form_inherit">
+            <field name="name">account.voucher.payment.form</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" string="Payment Method" widget="selection"
+                           domain="[('type','in',['bank','cash','reconcile'])]"
+                           invisible="context.get('line_type', False)"
+                           on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"/>
+                </field>
+            </field>
+        </record>
+
+        <delete model="ir.actions.act_window" id="account_voucher.action_vendor_payment"/>
+        <record id="action_vendor_payment" model="ir.actions.act_window">
+            <field name="name">Supplier Payments</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank','cash','reconcile']), ('type','=','payment')]</field>
+            <field name="context">{'type':'payment'}</field>
+            <field name="view_id" eval="False"/>
+            <field name="search_view_id" ref="view_voucher_filter_vendor_pay_inherit"/>
+            <field name="target">current</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new supplier payment.
+              </p><p>
+                OpenERP helps you easily track payments you make and the remaining balances you need to pay your suppliers.
+              </p>
+            </field>
+        </record>
+        <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
+            id="menu_action_vendor_payment" parent="account.menu_finance_payables"/>
+
+        <record model="ir.ui.view" id="view_vendor_receipt_dialog_form_inherit">
+            <field name="name">account.voucher.receipt.dialog.form</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_dialog_form"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" string="Payment Method" widget="selection"
+                           domain="[('type','in',['bank','cash','reconcile'])]"
+                           invisible="context.get('line_type', False)"
+                           on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"/>
+                </field>
+            </field>
+        </record>
+
+
+        <!-- Customer Payment -->
+        <record model="ir.ui.view" id="view_vendor_receipt_form_inherit">
+            <field name="name">account.voucher.receipt.form</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+            <field name="arch" type="xml">
+                <field name="journal_id" position="replace">
+                    <field name="journal_id" string="Payment Method" widget="selection"
+                           domain="[('type','in',['bank','cash','reconcile'])]"
+                           on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"/>
+                </field>
+            </field>
+        </record>
+
+        <delete model="ir.actions.act_window" id="account_voucher.action_vendor_receipt"/>
+        <record id="action_vendor_receipt" model="ir.actions.act_window">
+            <field name="name">Customer Payments</field>
+            <field name="res_model">account.voucher</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('journal_id.type', 'in', ['bank','cash','reconcile']), ('type','=','receipt')]</field>
+            <field name="context">{'type':'receipt'}</field>
+            <field name="search_view_id" ref="view_voucher_filter_customer_pay_inherit"/>
+            <field name="view_id" eval="False"/>
+            <field name="target">current</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to register a new payment. 
+              </p><p>
+                Enter the customer and the payment method and then, either
+                create manually a payment record or OpenERP will propose to you
+                automatically the reconciliation of this payment with the open
+                invoices or sales receipts.
+              </p>
+            </field>
+        </record>
+        <menuitem action="action_vendor_receipt" icon="STOCK_JUSTIFY_FILL" sequence="12"
+            id="menu_action_vendor_receipt"  parent="account.menu_finance_receivables"/>
+
+    </data>
+</openerp>

=== added file 'account_slovenian_storno/stock_move.py'
--- account_slovenian_storno/stock_move.py	1970-01-01 00:00:00 +0000
+++ account_slovenian_storno/stock_move.py	2014-07-17 08:32:41 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    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 openerp.osv import osv
+
+class stock_move(osv.Model):
+    _inherit = "stock.move"
+
+    def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
+        _move_lines = super(stock_move, self)._create_account_move_line(cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context)
+        _old_debit_lines = _move_lines[0][2]
+        _old_credit_lines = _move_lines[1][2]
+
+        if (move.picking_id.type == 'in' and move.location_id.usage == 'customer') \
+           or (move.picking_id.type == 'out' and move.location_dest_id.usage == 'supplier'):
+            _new_debit_lines = _old_credit_lines.copy()
+            _new_debit_lines['debit'] = _new_debit_lines['credit'] * -1
+            _new_debit_lines['credit'] = 0.0
+
+            _new_credit_lines = _old_debit_lines.copy()
+            _new_credit_lines['credit'] = _new_credit_lines['debit'] * -1
+            _new_credit_lines['debit'] = 0.0
+        else:
+            _new_debit_lines = _old_debit_lines
+            _new_credit_lines = _old_credit_lines
+
+        return [(0, 0, _new_debit_lines), (0, 0, _new_credit_lines)]

=== modified file 'stock_product_moves/stock_product_moves.py'
--- stock_product_moves/stock_product_moves.py	2014-03-19 08:55:42 +0000
+++ stock_product_moves/stock_product_moves.py	2014-07-17 08:32:41 +0000
@@ -90,4 +90,5 @@
                               LEFT OUTER JOIN account_invoice AS sai ON sai.id = sail.invoice_id
                               LEFT OUTER JOIN account_invoice_line AS pail ON pail.id = polir.invoice_id
                               LEFT OUTER JOIN account_invoice AS pai ON pai.id = pail.invoice_id
-                        WHERE sm.state = 'done');""")
+                        WHERE sm.state = 'done'
+                              AND sm.location_id <> sm.location_dest_id);""")