Merge lp:~sbi/account-invoicing/account_invoice_total_goodbye into lp:~account-core-editors/account-invoicing/7.0

Proposed by Stéphane Bidoul (Acsone)
Status: Merged
Merged at revision: 17
Proposed branch: lp:~sbi/account-invoicing/account_invoice_total_goodbye
Merge into: lp:~account-core-editors/account-invoicing/7.0
Diff against target: 172 lines (+0/-147)
5 files modified
account_invoice_total/README.md (+0/-21)
account_invoice_total/__init__.py (+0/-25)
account_invoice_total/__openerp__.py (+0/-47)
account_invoice_total/account_invoice_total.py (+0/-38)
account_invoice_total/account_invoice_total_view.xml (+0/-16)
To merge this branch: bzr merge lp:~sbi/account-invoicing/account_invoice_total_goodbye
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Stefan Rijnhart (Opener) Approve
Review via email: mp+160402@code.launchpad.net

Description of the change

say goodby to account_invoice_total

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks for cleaning this one up!

review: Approve
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed directory 'account_invoice_total'
=== removed file 'account_invoice_total/README.md'
--- account_invoice_total/README.md 2012-11-19 17:08:41 +0000
+++ account_invoice_total/README.md 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1# Account_invoice_total for OpenERP 6.1
2
3Until OpenERP 6.0.3 when creating a supplier invoice one first had to enter the grand total, this had to match with the computed total before the invoice could be verified.
4
5In OpenERP 6.1 this feature has silently been removed. This module brings back the field and the extra verification check.
6
7## Links
8
9Discussion : https://bugs.launchpad.net/openobject-addons/+bug/998008
10Code Revision : http://bazaar.launchpad.net/~openerp/openobject-addons/trunk/revision/6254
11
12## License
13
14Copyright (c) 2012 Ren Dao Solutions bvba
15Copyright (c) 2012 ACSONE SA/NV
16
17This module 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.
18
19This 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.
20
21For a full text of the license see <http://www.gnu.org/licenses/agpl-3.0.html>
220
=== removed file 'account_invoice_total/__init__.py'
--- account_invoice_total/__init__.py 2012-11-19 17:08:41 +0000
+++ account_invoice_total/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# account_invoice_total module for OpenERP
5# Copyright (C) 2012 Ren Dao Solutions (<http://rendaosolutions.com>).
6# Copyright (C) 2012 Acsone (<http://acsone.eu>).
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23import account_invoice_total
24
25# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
260
=== removed file 'account_invoice_total/__openerp__.py'
--- account_invoice_total/__openerp__.py 2013-04-03 14:37:57 +0000
+++ account_invoice_total/__openerp__.py 1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# account_invoice_total module for OpenERP
5# Copyright (C) 2012 Ren Dao Solutions (<http://rendaosolutions.com>).
6# Copyright (C) 2012 Acsone (<http://acsone.eu>).
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22{ 'name': 'Total Field on Supplier Invoice',
23 'version': '0.1',
24 'category': 'Accounting',
25 'description': """
26Since OpenERP 6.1 the check_total field in the supplier invoice form, and the corresponding
27check, has been removed. This module brings back the functionality from 6.0 and before.
28
29See discussion : https://bugs.launchpad.net/openobject-addons/+bug/998008
30See revision : http://bazaar.launchpad.net/~openerp/openobject-addons/trunk/revision/6254
31
32In OpenERP 7.0, this module has been superseded by a configurable setting. Go to
33Settings/configuration/accounting and tick the boolean "Check the total of supplier invoices"
34in the section "eInvoicing & Payments"
35 """,
36 'author': 'Ren Dao Solutions bvba, ACSONE SA/NV',
37 'depends': [
38 'account',
39 ],
40 'init_xml': [
41 'account_invoice_total_view.xml'
42 ],
43 'update_xml': [],
44 'demo_xml': [],
45 'installable': False,
46}
47# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
480
=== removed file 'account_invoice_total/account_invoice_total.py'
--- account_invoice_total/account_invoice_total.py 2012-11-19 17:08:41 +0000
+++ account_invoice_total/account_invoice_total.py 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# account_invoice_total module for OpenERP
5# Copyright (C) 2012 Ren Dao Solutions (<http://rendaosolutions.com>).
6# Copyright (C) 2012 Acsone (<http://acsone.eu>).
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23from osv import fields, osv
24from tools.translate import _
25
26class account_invoice_total(osv.osv):
27 _inherit = 'account.invoice'
28
29 def action_move_create(self, cr, uid, ids, context=None):
30 res = super(account_invoice_total, self).action_move_create(cr, uid, ids, context=context)
31 for inv in self.browse(cr, uid, ids, context=context):
32 if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
33 raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
34 return res
35
36account_invoice_total()
37
38# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
390
=== removed file 'account_invoice_total/account_invoice_total_view.xml'
--- account_invoice_total/account_invoice_total_view.xml 2012-11-19 17:08:41 +0000
+++ account_invoice_total/account_invoice_total_view.xml 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4 <record id="account_invoice_total_supplier_form" model="ir.ui.view">
5 <field name="name">account.invoice.supplier.form</field>
6 <field name="model">account.invoice</field>
7 <field name="type">form</field>
8 <field name="inherit_id" ref="account.invoice_supplier_form"/>
9 <field name="arch" type="xml">
10 <field name="date_due" position="after">
11 <field name="check_total" required="2"/>
12 </field>
13 </field>
14 </record>
15 </data>
16</openerp>

Subscribers

People subscribed via source and target branches