Yannick Vaucher @ Camptocamp has proposed merging lp:~camptocamp/account-invoicing/7.0-add-swedish_rounding-yvr into lp:account-invoicing.
Requested reviews: Yannick Vaucher @ Camptocamp (yvaucher-c2c) Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) Nicolas Bessi - Camptocamp (nbessi-c2c) For more details, see: https://code.launchpad.net/~camptocamp/account-invoicing/7.0-add-swedish_rounding-yvr/+merge/201598 Resubmit on account-invoicing making it a bit more generic by renaming l10n_ch by swedish due to http://en.wikipedia.org/wiki/Swedish_rounding -- https://code.launchpad.net/~camptocamp/account-invoicing/7.0-add-swedish_rounding-yvr/+merge/201598 Your team Account Core Editors is subscribed to branch lp:account-invoicing.
=== added directory 'account_invoice_rounding' === added file 'account_invoice_rounding/__init__.py' --- account_invoice_rounding/__init__.py 1970-01-01 00:00:00 +0000 +++ account_invoice_rounding/__init__.py 2014-01-14 14:32:34 +0000 @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Yannick Vaucher +# Copyright 2013 Camptocamp SA +# +# 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 . import company +from . import res_config +from . import account === added file 'account_invoice_rounding/__openerp__.py' --- account_invoice_rounding/__openerp__.py 1970-01-01 00:00:00 +0000 +++ account_invoice_rounding/__openerp__.py 2014-01-14 14:32:34 +0000 @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Yannick Vaucher +# Copyright 2013 Camptocamp SA +# +# 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' : 'Unit rounded invoice', + 'version' : '1.0', + 'category': 'Accounting', + 'description': +""" +Unit rounded invoice (_`Swedish rounding`) +========================================== + +Add a parameter to give a unit for rounding such as CHF 0.05 for Swiss +invoices + +In Settings -> Configuration -> Accounting you will find 2 new types of +rounding + +- `Swedish Round globally` + + To round your invoice total amount, this option will do the adjustment in + the most important tax line of your invoice. + +- `Swedish Round by adding an invoice line` + + To round your invoice total amount, this option create a invoice line without + taxes on it. This invoice line is tagged as `is_rounding` + +You can choose the account on which the invoice line will be written + +.. _Swedish rounding : https://en.wikipedia.org/wiki/Swedish_rounding +""", + 'author' : 'Camptocamp', + 'maintainer': 'Camptocamp', + 'website': 'http://www.camptocamp.com/', + 'depends' : ['account'], + 'data': ['res_config_view.xml'], + 'test': [], + 'installable': True, + 'auto_install': False, + 'application': True, + } === added file 'account_invoice_rounding/account.py' --- account_invoice_rounding/account.py 1970-01-01 00:00:00 +0000 +++ account_invoice_rounding/account.py 2014-01-14 14:32:34 +0000 @@ -0,0 +1,309 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Yannick Vaucher +# Copyright 2013 Camptocamp SA +# +# 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 orm, fields +from openerp.tools.float_utils import float_round, float_compare +from openerp.tools.translate import _ + +import openerp.addons.decimal_precision as dp + + +def _all_invoice_tax_line_computed(invoice): + tax_ids = set() + for line in invoice.invoice_line: + # invoice_line_tax_id is a many2many if you wonder about it + for tax in line.invoice_line_tax_id: + if not tax.price_include: + tax_ids.add(tax.id) + computed_tax_ids = [tax.id for tax in invoice.tax_line] + return len(tax_ids) == len(computed_tax_ids) + + +class AccountInvoice(orm.Model): + _inherit = "account.invoice" + + def _swedish_add_invoice_line(self, cr, uid, invoice, amounts, + rounded_total, delta, context=None): + """ Create a invoice_line with the diff of rounding """ + invoice_line_obj = self.pool.get('account.invoice.line') + obj_precision = self.pool.get('decimal.precision') + prec = obj_precision.precision_get(cr, uid, 'Account') + + company = invoice.company_id + if not invoice.global_round_line_id: + new_invoice_line = { + 'name': _('Rounding'), + 'price_unit': -delta, + 'account_id': company.tax_calculation_rounding_account_id.id, + 'invoice_id': invoice.id, + 'is_rounding': True, + } + invoice_line_obj.create(cr, uid, new_invoice_line, context=context) + elif float_compare(invoice.global_round_line_id.price_unit, -delta, + precision_digits=prec) != 0: + invoice_line_obj.write( + cr, uid, invoice.global_round_line_id.id, + {'price_unit': -delta}, context=context) + + amount_untaxed = float_round(amounts['amount_untaxed'] - delta, + precision_digits=prec) + return {'amount_total': rounded_total, + 'amount_untaxed': amount_untaxed} + + def _swedish_round_globally(self, cr, uid, invoice, amounts, + rounded_total, delta, context=None): + """ Add the diff to the biggest tax line + + This ajustment must be done only after all tax are computed + + """ + # Here we identify that all taxe lines have been computed + if not _all_invoice_tax_line_computed(invoice): + return {} + + obj_precision = self.pool.get('decimal.precision') + prec = obj_precision.precision_get(cr, uid, 'Account') + inv_tax_obj = self.pool.get('account.invoice.tax') + + ajust_line = None + for tax_line in invoice.tax_line: + if not ajust_line or tax_line.amount > ajust_line.amount: + ajust_line = tax_line + if ajust_line: + amount = ajust_line.amount - delta + vals = inv_tax_obj.amount_change( + cr, uid, [ajust_line.id], + amount, + currency_id=invoice.currency_id.id, + company_id=invoice.company_id.id, + date_invoice=invoice.date_invoice)['value'] + ajust_line.write({'amount': amount, + 'tax_amount': vals['tax_amount']}, + context=context) + + amount_tax = float_round(amounts['amount_tax'] - delta, + precision_digits=prec) + return {'amount_total': rounded_total, + 'amount_tax': amount_tax} + return {} + + def _compute_swedish_rounding(self, cr, uid, invoice, amounts, + context=None): + """ + Depending on the method defined, we add an invoice line or adapt the + tax lines to have a rounded total amount on the invoice + + :param invoice: invoice browse record + :param amounts: unrounded computed totals for the invoice + :return dict: updated values for _amount_all + + """ + obj_precision = self.pool.get('decimal.precision') + + # avoid recusivity + if 'swedish_write' in context: + return {} + + company = invoice.company_id + round_method = company.tax_calculation_rounding_method + + if round_method[:7] != 'swedish': + return {} + + prec = obj_precision.precision_get(cr, uid, 'Account') + rounding_prec = company.tax_calculation_rounding + rounded_total = float_round(amounts['amount_total'], + precision_rounding=rounding_prec) + + if float_compare(rounded_total, amounts['amount_total'], + precision_digits=prec) == 0: + return {} + + # To avoid recursivity as we need to write on invoice or + # on objects triggering computation of _amount_all + ctx = context.copy() + ctx['swedish_write'] = True + + delta = float_round(amounts['amount_total'] - rounded_total, + precision_digits=prec) + + if round_method == 'swedish_add_invoice_line': + return self._swedish_add_invoice_line(cr, uid, invoice, amounts, + rounded_total, delta, + context=ctx) + elif round_method == 'swedish_round_globally': + return self._swedish_round_globally(cr, uid, invoice, amounts, + rounded_total, delta, + context=ctx) + return {} + + def _amount_all(self, cr, uid, ids, name, args, context=None): + """ Add swedish rounding computing + + Makes sure invoice line for rounding is not computed in totals + + """ + res = super(AccountInvoice, self + )._amount_all(cr, uid, ids, name, args, context=context) + + for invoice in self.browse(cr, uid, ids, context=context): + if invoice.type in ('out_invoice', 'out_refund'): + line = invoice.global_round_line_id + if line: + res[invoice.id]['amount_untaxed'] -= line.price_subtotal + + amount_total = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed'] + res[invoice.id]['amount_total'] = amount_total + + swedish_rounding = self._compute_swedish_rounding( + cr, uid, invoice, res[invoice.id], context=context) + res[invoice.id].update(swedish_rounding) + return res + + def _get_rounding_invoice_line_id(self, cr, uid, ids, name, args, + context=None): + """ + :return dict: {invoice id: global_rounding_line_id} + + """ + line_obj = self.pool.get('account.invoice.line') + res = {} + for invoice_id in ids: + line_ids = line_obj.search( + cr, uid, + [('invoice_id', '=', invoice_id), + ('is_rounding', '=', True)], + context=context) + res[invoice_id] = line_ids and line_ids[0] or False + return res + + def _get_invoice_line(self, cr, uid, ids, context=None): + """ Use super's trigger """ + return super(AccountInvoice, self.pool.get('account.invoice') + )._get_invoice_line(cr, uid, ids, context=context) + + def _get_invoice_tax(self, cr, uid, ids, context=None): + """Use super's trigger""" + return super(AccountInvoice, self.pool.get('account.invoice') + )._get_invoice_tax(cr, uid, ids, context=context) + + _columns = { + 'global_round_line_id': fields.function( + _get_rounding_invoice_line_id, + type='many2one', + relation='account.invoice.line', + string='Invoice Line for total rounding', + readonly=True), + 'amount_untaxed': fields.function( + _amount_all, + digits_compute=dp.get_precision('Account'), + string='Subtotal', + track_visibility='always', + store={ + 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, + ['invoice_line'], 20), + 'account.invoice.tax': (_get_invoice_tax, None, 20), + 'account.invoice.line': (_get_invoice_line, + ['price_unit', + 'invoice_line_tax_id', + 'quantity' + 'discount', + 'invoice_id'], 20), + }, + multi='all'), + 'amount_tax': fields.function( + _amount_all, + digits_compute=dp.get_precision('Account'), + string='Tax', + store={ + 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, + ['invoice_line'], 20), + 'account.invoice.tax': (_get_invoice_tax, None, 20), + 'account.invoice.line': (_get_invoice_line, + ['price_unit', + 'invoice_line_tax_id', + 'quantity', + 'discount', + 'invoice_id'], 20), + }, + multi='all'), + 'amount_total': fields.function( + _amount_all, + digits_compute=dp.get_precision('Account'), + string='Total', + store={ + 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, + ['invoice_line'], 20), + 'account.invoice.tax': (_get_invoice_tax, None, 20), + 'account.invoice.line': (_get_invoice_line, + ['price_unit', + 'invoice_line_tax_id', + 'quantity', + 'discount', + 'invoice_id'], 20), + }, + multi='all'), + } + + +class AccountInvoiceLine(orm.Model): + _inherit = 'account.invoice.line' + + _columns = { + 'is_rounding': fields.boolean('Rounding Line') + } + + +class AccountTax(orm.Model): + _inherit = 'account.tax' + + def compute_inv(self, cr, uid, taxes, price_unit, quantity, + product=None, partner=None, precision=None): + """ + Using swedish rounding we want to keep standard global precision + so we add precision to do global computation + + """ + if taxes and taxes[0].company_id.tax_calculation_rounding_method[:7] == 'swedish': + if not precision: + precision = self.pool.get('decimal.precision').precision_get( + cr, uid, 'Account') + precision += 5 + return super(AccountTax, self + ).compute_inv(cr, uid, taxes, price_unit, + quantity, product=product, + partner=partner, precision=precision) + + def _compute(self, cr, uid, taxes, price_unit, quantity, + product=None, partner=None, precision=None): + """ + Using swedish rounding we want to keep standard global precision + so we add precision to do global computation + + """ + if taxes and taxes[0].company_id.tax_calculation_rounding_method[:7] == 'swedish': + if not precision: + precision = self.pool.get('decimal.precision' + ).precision_get(cr, uid, 'Account') + precision += 5 + return super(AccountTax, self + )._compute(cr, uid, taxes, price_unit, + quantity, product=product, + partner=partner, precision=precision) === added file 'account_invoice_rounding/company.py' --- account_invoice_rounding/company.py 1970-01-01 00:00:00 +0000 +++ account_invoice_rounding/company.py 2014-01-14 14:32:34 +0000 @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Yannick Vaucher +# Copyright 2013 Camptocamp SA +# +# 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 orm, fields + + +class ResCompany(orm.Model): + _inherit = 'res.company' + + _columns = { + 'tax_calculation_rounding': fields.float( + 'Tax Rounding unit'), + 'tax_calculation_rounding_method': fields.selection( + [('round_per_line', 'Round per Line'), + ('round_globally', 'Round Globally'), + ('swedish_round_globally', 'Swedish Round globally'), + ('swedish_add_invoice_line', 'Swedish Round by adding a line'), + ], + 'Tax Calculation Rounding Method', + help="If you select 'Round per line' : for each tax, the tax " + "amount will first be computed and rounded for each " + "PO/SO/invoice line and then these rounded amounts will be " + "summed, leading to the total amount for that tax. If you " + "select 'Round globally': for each tax, the tax amount will " + "be computed for each PO/SO/invoice line, then these amounts" + " will be summed and eventually this total tax amount will " + "be rounded. If you sell with tax included, you should " + "choose 'Round per line' because you certainly want the sum " + "of your tax-included line subtotals to be equal to the " + "total amount with taxes."), + 'tax_calculution_rounding_account_id': fields.many2one( + 'account.account', + 'Tax Rounding Account', + domain=[('type', '<>', 'view')]), + } === added directory 'account_invoice_rounding/documentation' === added file 'account_invoice_rounding/documentation/DOC_l10n_ch_5cts_roundings.ods' Binary files account_invoice_rounding/documentation/DOC_l10n_ch_5cts_roundings.ods 1970-01-01 00:00:00 +0000 and account_invoice_rounding/documentation/DOC_l10n_ch_5cts_roundings.ods 2014-01-14 14:32:34 +0000 differ === added file 'account_invoice_rounding/res_config.py' --- account_invoice_rounding/res_config.py 1970-01-01 00:00:00 +0000 +++ account_invoice_rounding/res_config.py 2014-01-14 14:32:34 +0000 @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Author: Yannick Vaucher +# Copyright 2013 Camptocamp SA +# +# 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 orm, fields + + +class AccountConfigSettings(orm.TransientModel): + _inherit = 'account.config.settings' + + _columns = { + 'tax_calculation_rounding': fields.related( + 'company_id', + 'tax_calculation_rounding', + type='float', + string='Tax Rounding unit'), + 'tax_calculation_rounding_method': fields.related( + 'company_id', + 'tax_calculation_rounding_method', + type='selection', + selection=[ + ('round_per_line', 'Round per line'), + ('round_globally', 'Round globally'), + ('swedish_round_globally', 'Swedish Round globally'), + ('swedish_add_invoice_line', + 'Swedish Round by adding an invoice line'), + ], + string='Tax calculation rounding method', + help="If you select 'Round per line' : for each tax, the tax " + "amount will first be computed and rounded for each " + "PO/SO/invoice line and then these rounded amounts will be " + "summed, leading to the total amount for that tax. If you " + "select 'Round globally': for each tax, the tax amount will " + "be computed for each PO/SO/invoice line, then these amounts" + " will be summed and eventually this total tax amount will " + "be rounded. If you sell with tax included, you should " + "choose 'Round per line' because you certainly want the sum " + "of your tax-included line subtotals to be equal to the " + "total amount with taxes."), + 'tax_calculation_rounding_account_id': fields.related( + 'company_id', + 'tax_calculation_rounding_account_id', + type='many2one', + relation='account.account', + string='Tax Rounding account', + domain=[('type', '<>', 'view')]), + } + + _defaults = { + 'tax_calculation_rounding': 0.05 + } + + def onchange_company_id(self, cr, uid, ids, company_id, context=None): + res = super(AccountConfigSettings, self + ).onchange_company_id(cr, uid, ids, + company_id, context=context) + company = self.pool.get('res.company').browse(cr, uid, company_id, + context=context) + res['value']['tax_calculation_rounding'] = company.tax_calculation_rounding + res['value']['tax_calculation_rounding_account_id'] = company.tax_calculation_rounding_account_id.id + return res === added file 'account_invoice_rounding/res_config_view.xml' --- account_invoice_rounding/res_config_view.xml 1970-01-01 00:00:00 +0000 +++ account_invoice_rounding/res_config_view.xml 2014-01-14 14:32:34 +0000 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + + <record id="view_account_config_settings" model="ir.ui.view"> + <field name="name">account settings.add.rounding</field> + <field name="model">account.config.settings</field> + <field name="inherit_id" ref="account.view_account_config_settings"/> + <field name="arch" type="xml"> + <xpath expr="//field[@name='tax_calculation_rounding_method']/ancestor::div[1]" position="after"> + <div attrs="{'invisible': [('tax_calculation_rounding_method', 'not in', ['swedish_round_globally', 'swedish_add_invoice_line'])]}"> + <label for="tax_calculation_rounding"/> + <field name="tax_calculation_rounding" class="oe_inline"/> + </div> + <div attrs="{'invisible': [('tax_calculation_rounding_method', '<>', 'swedish_add_invoice_line')]}"> + <label for="tax_calculation_rounding_account_id"/> + <field name="tax_calculation_rounding_account_id" + domain="[('type', '<>', 'view')]" + attrs="{'required': [('tax_calculation_rounding_method', '=', 'swedish_add_invoice_line')]}" class="oe_inline"/> + </div> + </xpath> + </field> + </record> + + </data> +</openerp>
-- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
