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
1=== removed directory 'account_invoice_total'
2=== removed file 'account_invoice_total/README.md'
3--- account_invoice_total/README.md 2012-11-19 17:08:41 +0000
4+++ account_invoice_total/README.md 1970-01-01 00:00:00 +0000
5@@ -1,21 +0,0 @@
6-# Account_invoice_total for OpenERP 6.1
7-
8-Until 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.
9-
10-In OpenERP 6.1 this feature has silently been removed. This module brings back the field and the extra verification check.
11-
12-## Links
13-
14-Discussion : https://bugs.launchpad.net/openobject-addons/+bug/998008
15-Code Revision : http://bazaar.launchpad.net/~openerp/openobject-addons/trunk/revision/6254
16-
17-## License
18-
19-Copyright (c) 2012 Ren Dao Solutions bvba
20-Copyright (c) 2012 ACSONE SA/NV
21-
22-This 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.
23-
24-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.
25-
26-For a full text of the license see <http://www.gnu.org/licenses/agpl-3.0.html>
27
28=== removed file 'account_invoice_total/__init__.py'
29--- account_invoice_total/__init__.py 2012-11-19 17:08:41 +0000
30+++ account_invoice_total/__init__.py 1970-01-01 00:00:00 +0000
31@@ -1,25 +0,0 @@
32-# -*- coding: utf-8 -*-
33-##############################################################################
34-#
35-# account_invoice_total module for OpenERP
36-# Copyright (C) 2012 Ren Dao Solutions (<http://rendaosolutions.com>).
37-# Copyright (C) 2012 Acsone (<http://acsone.eu>).
38-#
39-# This program is free software: you can redistribute it and/or modify
40-# it under the terms of the GNU Affero General Public License as
41-# published by the Free Software Foundation, either version 3 of the
42-# License, or (at your option) any later version.
43-#
44-# This program is distributed in the hope that it will be useful,
45-# but WITHOUT ANY WARRANTY; without even the implied warranty of
46-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
47-# GNU Affero General Public License for more details.
48-#
49-# You should have received a copy of the GNU Affero General Public License
50-# along with this program. If not, see <http://www.gnu.org/licenses/>.
51-#
52-##############################################################################
53-
54-import account_invoice_total
55-
56-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
57
58=== removed file 'account_invoice_total/__openerp__.py'
59--- account_invoice_total/__openerp__.py 2013-04-03 14:37:57 +0000
60+++ account_invoice_total/__openerp__.py 1970-01-01 00:00:00 +0000
61@@ -1,47 +0,0 @@
62-# -*- coding: utf-8 -*-
63-##############################################################################
64-#
65-# account_invoice_total module for OpenERP
66-# Copyright (C) 2012 Ren Dao Solutions (<http://rendaosolutions.com>).
67-# Copyright (C) 2012 Acsone (<http://acsone.eu>).
68-#
69-# This program is free software: you can redistribute it and/or modify
70-# it under the terms of the GNU Affero General Public License as
71-# published by the Free Software Foundation, either version 3 of the
72-# License, or (at your option) any later version.
73-#
74-# This program is distributed in the hope that it will be useful,
75-# but WITHOUT ANY WARRANTY; without even the implied warranty of
76-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77-# GNU Affero General Public License for more details.
78-#
79-# You should have received a copy of the GNU Affero General Public License
80-# along with this program. If not, see <http://www.gnu.org/licenses/>.
81-#
82-##############################################################################
83-{ 'name': 'Total Field on Supplier Invoice',
84- 'version': '0.1',
85- 'category': 'Accounting',
86- 'description': """
87-Since OpenERP 6.1 the check_total field in the supplier invoice form, and the corresponding
88-check, has been removed. This module brings back the functionality from 6.0 and before.
89-
90-See discussion : https://bugs.launchpad.net/openobject-addons/+bug/998008
91-See revision : http://bazaar.launchpad.net/~openerp/openobject-addons/trunk/revision/6254
92-
93-In OpenERP 7.0, this module has been superseded by a configurable setting. Go to
94-Settings/configuration/accounting and tick the boolean "Check the total of supplier invoices"
95-in the section "eInvoicing & Payments"
96- """,
97- 'author': 'Ren Dao Solutions bvba, ACSONE SA/NV',
98- 'depends': [
99- 'account',
100- ],
101- 'init_xml': [
102- 'account_invoice_total_view.xml'
103- ],
104- 'update_xml': [],
105- 'demo_xml': [],
106- 'installable': False,
107-}
108-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
109
110=== removed file 'account_invoice_total/account_invoice_total.py'
111--- account_invoice_total/account_invoice_total.py 2012-11-19 17:08:41 +0000
112+++ account_invoice_total/account_invoice_total.py 1970-01-01 00:00:00 +0000
113@@ -1,38 +0,0 @@
114-# -*- coding: utf-8 -*-
115-##############################################################################
116-#
117-# account_invoice_total module for OpenERP
118-# Copyright (C) 2012 Ren Dao Solutions (<http://rendaosolutions.com>).
119-# Copyright (C) 2012 Acsone (<http://acsone.eu>).
120-#
121-# This program is free software: you can redistribute it and/or modify
122-# it under the terms of the GNU Affero General Public License as
123-# published by the Free Software Foundation, either version 3 of the
124-# License, or (at your option) any later version.
125-#
126-# This program is distributed in the hope that it will be useful,
127-# but WITHOUT ANY WARRANTY; without even the implied warranty of
128-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
129-# GNU Affero General Public License for more details.
130-#
131-# You should have received a copy of the GNU Affero General Public License
132-# along with this program. If not, see <http://www.gnu.org/licenses/>.
133-#
134-##############################################################################
135-
136-from osv import fields, osv
137-from tools.translate import _
138-
139-class account_invoice_total(osv.osv):
140- _inherit = 'account.invoice'
141-
142- def action_move_create(self, cr, uid, ids, context=None):
143- res = super(account_invoice_total, self).action_move_create(cr, uid, ids, context=context)
144- for inv in self.browse(cr, uid, ids, context=context):
145- if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
146- raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
147- return res
148-
149-account_invoice_total()
150-
151-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
152
153=== removed file 'account_invoice_total/account_invoice_total_view.xml'
154--- account_invoice_total/account_invoice_total_view.xml 2012-11-19 17:08:41 +0000
155+++ account_invoice_total/account_invoice_total_view.xml 1970-01-01 00:00:00 +0000
156@@ -1,16 +0,0 @@
157-<?xml version="1.0" encoding="utf-8"?>
158-<openerp>
159- <data>
160- <record id="account_invoice_total_supplier_form" model="ir.ui.view">
161- <field name="name">account.invoice.supplier.form</field>
162- <field name="model">account.invoice</field>
163- <field name="type">form</field>
164- <field name="inherit_id" ref="account.invoice_supplier_form"/>
165- <field name="arch" type="xml">
166- <field name="date_due" position="after">
167- <field name="check_total" required="2"/>
168- </field>
169- </field>
170- </record>
171- </data>
172-</openerp>

Subscribers

People subscribed via source and target branches