From 96680c893fd41029888476640fb7c88a0e49056f Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 21 Jun 2017 23:57:29 +0200 Subject: [PATCH 1/5] Add module account_invoice_update_wizard --- account_invoice_update_wizard/__init__.py | 3 + account_invoice_update_wizard/__openerp__.py | 34 +++ .../views/account_invoice.xml | 31 +++ .../wizard/__init__.py | 3 + .../wizard/account_invoice_update.py | 206 ++++++++++++++++++ .../wizard/account_invoice_update_view.xml | 54 +++++ 6 files changed, 331 insertions(+) create mode 100644 account_invoice_update_wizard/__init__.py create mode 100644 account_invoice_update_wizard/__openerp__.py create mode 100644 account_invoice_update_wizard/views/account_invoice.xml create mode 100644 account_invoice_update_wizard/wizard/__init__.py create mode 100644 account_invoice_update_wizard/wizard/account_invoice_update.py create mode 100644 account_invoice_update_wizard/wizard/account_invoice_update_view.xml diff --git a/account_invoice_update_wizard/__init__.py b/account_invoice_update_wizard/__init__.py new file mode 100644 index 0000000..3b4c3ed --- /dev/null +++ b/account_invoice_update_wizard/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import wizard diff --git a/account_invoice_update_wizard/__openerp__.py b/account_invoice_update_wizard/__openerp__.py new file mode 100644 index 0000000..71e396b --- /dev/null +++ b/account_invoice_update_wizard/__openerp__.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Account Invoice Update Wizard', + 'version': '8.0.1.0.0', + 'category': 'Accounting & Finance', + 'license': 'AGPL-3', + 'summary': 'Wizard to update non-legal fields of an open/paid invoice', + 'description': """ +Account Invoice Update Wizard +============================= + +This module adds a button *Update Invoice* on Customer and Supplier invoices in Open or Paid state. This button starts a wizard which allows the user to update non-legal fields of the invoice: + +* Source Document +* Reference/Description +* Payment terms (update allowed only to a payment term with same number of terms of the same amount and on invoices without any payment) +* Bank Account +* Salesman +* Notes +* Description of invoice lines + + """, + 'author': 'Akretion', + 'website': 'http://www.akretion.com', + 'depends': ['account'], + 'data': [ + 'wizard/account_invoice_update_view.xml', + 'views/account_invoice.xml', + ], + 'installable': True, +} diff --git a/account_invoice_update_wizard/views/account_invoice.xml b/account_invoice_update_wizard/views/account_invoice.xml new file mode 100644 index 0000000..5d779f4 --- /dev/null +++ b/account_invoice_update_wizard/views/account_invoice.xml @@ -0,0 +1,31 @@ + + + + + + + + account.invoice + + + + + + + + account.invoice + + + + + + + + diff --git a/account_invoice_update_wizard/wizard/__init__.py b/account_invoice_update_wizard/wizard/__init__.py new file mode 100644 index 0000000..f66fb84 --- /dev/null +++ b/account_invoice_update_wizard/wizard/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import account_invoice_update diff --git a/account_invoice_update_wizard/wizard/account_invoice_update.py b/account_invoice_update_wizard/wizard/account_invoice_update.py new file mode 100644 index 0000000..7d4eff2 --- /dev/null +++ b/account_invoice_update_wizard/wizard/account_invoice_update.py @@ -0,0 +1,206 @@ +# -*- coding: utf-8 -*- +# © 2017 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import models, fields, api, _ +from openerp.exceptions import Warning as UserError +import openerp.addons.decimal_precision as dp + + +class AccountInvoiceUpdate(models.TransientModel): + _name = 'account.invoice.update' + _description = 'Wizard to update non-legal fields of invoice' + + invoice_id = fields.Many2one( + 'account.invoice', string='Invoice', required=True, + readonly=True) + type = fields.Selection(related='invoice_id.type', readonly=True) + company_id = fields.Many2one( + related='invoice_id.company_id', readonly=True) + commercial_partner_id = fields.Many2one( + related='invoice_id.commercial_partner_id', readonly=True) + user_id = fields.Many2one('res.users', string='Salesperson') + # I use the same field name as the original invoice field name + # even if it the name is "bad" + # Updating payment_term will not work if you use + # the OCA module account_constraints (you will just get an error) + payment_term = fields.Many2one( + 'account.payment.term', string='Payment Terms') + reference = fields.Char(string='Invoice Reference') + name = fields.Char(string='Reference/Description') + origin = fields.Char(string='Source Document') + comment = fields.Text('Additional Information') + partner_bank_id = fields.Many2one( + 'res.partner.bank', string='Bank Account') + line_ids = fields.One2many( + 'account.invoice.line.update', 'parent_id', string='Invoice Lines') + + @api.model + def _simple_fields2update(self): + '''List boolean, date, datetime, char, text fields''' + return ['reference', 'name', 'origin', 'comment'] + + @api.model + def _m2o_fields2update(self): + return ['payment_term', 'user_id', 'partner_bank_id'] + + @api.model + def _prepare_default_get(self, invoice): + res = {'invoice_id': invoice.id, 'line_ids': []} + for sfield in self._simple_fields2update(): + res[sfield] = invoice[sfield] + for m2ofield in self._m2o_fields2update(): + res[m2ofield] = invoice[m2ofield].id or False + for line in invoice.invoice_line: + res['line_ids'].append({ + 'invoice_line_id': line.id, + 'name': line.name, + 'quantity': line.quantity, + 'price_subtotal': line.price_subtotal, + }) + return res + + @api.model + def default_get(self, fields_list): + res = super(AccountInvoiceUpdate, self).default_get(fields_list) + assert self._context.get('active_model') == 'account.invoice',\ + 'active_model should be account.invoice' + inv = self.env['account.invoice'].browse(self._context['active_id']) + res = self._prepare_default_get(inv) + return res + + @api.onchange('type') + def type_on_change(self): + res = {'domain': {}} + if self.type in ('out_invoice', 'out_refund'): + res['domain']['partner_bank_id'] =\ + "[('partner_id.ref_companies', 'in', [company_id])]" + else: + res['domain']['partner_bank_id'] =\ + "[('partner_id', '=', commercial_partner_id)]" + return res + + @api.multi + def _prepare_invoice(self): + vals = {} + inv = self.invoice_id + for sfield in self._simple_fields2update(): + if self[sfield] != inv[sfield]: + vals[sfield] = self[sfield] + for m2ofield in self._m2o_fields2update(): + if self[m2ofield] != inv[m2ofield]: + vals[m2ofield] = self[m2ofield].id or False + if 'payment_term' in vals: + pterm_list = self.payment_term.compute( + value=1, date_ref=inv.date_invoice)[0] + if pterm_list: + vals['date_due'] = max(line[0] for line in pterm_list) + return vals + + @api.model + def _prepare_invoice_line(self, line): + vals = {} + if line.name != line.invoice_line_id.name: + vals['name'] = line.name + return vals + + @api.multi + def _prepare_move(self): + mvals = {} + inv = self.invoice_id + ini_ref = inv.move_id.ref + ref = inv.reference or inv.name + if ini_ref != ref: + mvals['ref'] = ref + return mvals + + @api.multi + def _update_payment_term_move(self): + self.ensure_one() + inv = self.invoice_id + if ( + self.payment_term and + self.payment_term != inv.payment_term and + inv.move_id and + inv.move_id.period_id.state == 'draft'): + # I don't update pay term when the invoice is partially (or fully) + # paid because if you have a payment term with several lines + # of the same amount, you would also have to take into account + # the reconcile marks to put the new maturity date on the right + # lines + if inv.payment_ids: + raise UserError(_( + "This wizard doesn't support the update of payment " + "terms on an invoice which is partially or fully " + "paid.")) + prec = self.env['decimal.precision'].precision_get('Account') + term_res = self.payment_term.compute( + inv.amount_total, inv.date_invoice)[0] + new_pterm = {} # key = int(amount * 100), value = [date1, date2] + for entry in term_res: + amount = int(entry[1] * 10 * prec) + if amount in new_pterm: + new_pterm[amount].append(entry[0]) + else: + new_pterm[amount] = [entry[0]] + mlines = {} # key = int(amount * 100), value : [line1, line2] + for line in inv.move_id.line_id: + if line.account_id == inv.account_id: + amount = int(abs(line.credit - line.debit) * 10 * prec) + if amount in mlines: + mlines[amount].append(line) + else: + mlines[amount] = [line] + for iamount, lines in mlines.iteritems(): + if len(lines) != len(new_pterm.get(iamount, [])): + raise UserError(_( + "The original payment term '%s' doesn't have the " + "same terms (number of terms and/or amount) as the " + "new payment term '%s'. You can only switch to a " + "payment term that has the same number of terms " + "with the same amount.") % ( + inv.payment_term.name, self.payment_term.name)) + for line in lines: + line.date_maturity = new_pterm[iamount].pop() + + @api.multi + def run(self): + self.ensure_one() + inv = self.invoice_id + updated = False + # re-write date_maturity on move line + self._update_payment_term_move() + ivals = self._prepare_invoice() + if ivals: + updated = True + inv.write(ivals) + for line in self.line_ids: + ilvals = self._prepare_invoice_line(line) + if ilvals: + updated = True + line.invoice_line_id.write(ilvals) + if inv.move_id and inv.move_id.period_id.state == 'draft': + mvals = self._prepare_move() + if mvals: + inv.move_id.write(mvals) + if updated: + inv.message_post(_( + 'Non-legal fields of invoice updated via the Invoice Update ' + 'wizard.')) + return True + + +class AccountInvoiceLineUpdate(models.TransientModel): + _name = 'account.invoice.line.update' + _description = 'Update non-legal fields of invoice lines' + + parent_id = fields.Many2one( + 'account.invoice.update', string='Wizard', ondelete='cascade') + invoice_line_id = fields.Many2one( + 'account.invoice.line', string='Invoice Line', readonly=True) + name = fields.Text(string='Description', required=True) + quantity = fields.Float( + string='Quantity', digits=dp.get_precision('Product Unit of Measure'), + readonly=True) + price_subtotal = fields.Float( + string='Amount', readonly=True, digits=dp.get_precision('Account')) diff --git a/account_invoice_update_wizard/wizard/account_invoice_update_view.xml b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml new file mode 100644 index 0000000..5da5814 --- /dev/null +++ b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml @@ -0,0 +1,54 @@ + + + + + + + + account.invoice.update + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + Invoice Update Wizard + account.invoice.update + form + new + + + + From 8fbac5c22142ca0e918499e5a5c8470fd7e5d63a Mon Sep 17 00:00:00 2001 From: Florian da Costa Date: Fri, 21 Jul 2017 14:37:51 +0200 Subject: [PATCH 2/5] Make modules uninstallable --- account_invoice_update_wizard/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_invoice_update_wizard/__openerp__.py b/account_invoice_update_wizard/__openerp__.py index 71e396b..e528a09 100644 --- a/account_invoice_update_wizard/__openerp__.py +++ b/account_invoice_update_wizard/__openerp__.py @@ -30,5 +30,5 @@ This module adds a button *Update Invoice* on Customer and Supplier invoices in 'wizard/account_invoice_update_view.xml', 'views/account_invoice.xml', ], - 'installable': True, + 'installable': False, } From b298039af47c3950cd19b4e89224cf7f8771f19a Mon Sep 17 00:00:00 2001 From: mdietrichc2c Date: Wed, 30 Aug 2017 11:26:40 +0200 Subject: [PATCH 3/5] [9.0] Port of module account_invoice_update_wizard --- account_invoice_update_wizard/__openerp__.py | 2 +- .../wizard/account_invoice_update.py | 43 ++++++++----------- .../wizard/account_invoice_update_view.xml | 4 +- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/account_invoice_update_wizard/__openerp__.py b/account_invoice_update_wizard/__openerp__.py index e528a09..71e396b 100644 --- a/account_invoice_update_wizard/__openerp__.py +++ b/account_invoice_update_wizard/__openerp__.py @@ -30,5 +30,5 @@ This module adds a button *Update Invoice* on Customer and Supplier invoices in 'wizard/account_invoice_update_view.xml', 'views/account_invoice.xml', ], - 'installable': False, + 'installable': True, } diff --git a/account_invoice_update_wizard/wizard/account_invoice_update.py b/account_invoice_update_wizard/wizard/account_invoice_update.py index 7d4eff2..3b2f81a 100644 --- a/account_invoice_update_wizard/wizard/account_invoice_update.py +++ b/account_invoice_update_wizard/wizard/account_invoice_update.py @@ -17,15 +17,11 @@ class AccountInvoiceUpdate(models.TransientModel): type = fields.Selection(related='invoice_id.type', readonly=True) company_id = fields.Many2one( related='invoice_id.company_id', readonly=True) - commercial_partner_id = fields.Many2one( - related='invoice_id.commercial_partner_id', readonly=True) + partner_id = fields.Many2one( + related='invoice_id.partner_id', readonly=True) user_id = fields.Many2one('res.users', string='Salesperson') - # I use the same field name as the original invoice field name - # even if it the name is "bad" - # Updating payment_term will not work if you use - # the OCA module account_constraints (you will just get an error) - payment_term = fields.Many2one( - 'account.payment.term', string='Payment Terms') + payment_term_id = fields.Many2one( + 'account.payment.term', string='Payment Term') reference = fields.Char(string='Invoice Reference') name = fields.Char(string='Reference/Description') origin = fields.Char(string='Source Document') @@ -42,7 +38,7 @@ class AccountInvoiceUpdate(models.TransientModel): @api.model def _m2o_fields2update(self): - return ['payment_term', 'user_id', 'partner_bank_id'] + return ['payment_term_id', 'user_id', 'partner_bank_id'] @api.model def _prepare_default_get(self, invoice): @@ -51,13 +47,13 @@ class AccountInvoiceUpdate(models.TransientModel): res[sfield] = invoice[sfield] for m2ofield in self._m2o_fields2update(): res[m2ofield] = invoice[m2ofield].id or False - for line in invoice.invoice_line: - res['line_ids'].append({ + for line in invoice.invoice_line_ids: + res['line_ids'].append([0, 0, { 'invoice_line_id': line.id, 'name': line.name, 'quantity': line.quantity, 'price_subtotal': line.price_subtotal, - }) + }]) return res @api.model @@ -74,10 +70,10 @@ class AccountInvoiceUpdate(models.TransientModel): res = {'domain': {}} if self.type in ('out_invoice', 'out_refund'): res['domain']['partner_bank_id'] =\ - "[('partner_id.ref_companies', 'in', [company_id])]" + "[('partner_id.ref_company_ids', 'in', [company_id])]" else: res['domain']['partner_bank_id'] =\ - "[('partner_id', '=', commercial_partner_id)]" + "[('partner_id', '=', partner_id)]" return res @api.multi @@ -90,8 +86,8 @@ class AccountInvoiceUpdate(models.TransientModel): for m2ofield in self._m2o_fields2update(): if self[m2ofield] != inv[m2ofield]: vals[m2ofield] = self[m2ofield].id or False - if 'payment_term' in vals: - pterm_list = self.payment_term.compute( + if 'payment_term_id' in vals: + pterm_list = self.payment_term_id.compute( value=1, date_ref=inv.date_invoice)[0] if pterm_list: vals['date_due'] = max(line[0] for line in pterm_list) @@ -119,10 +115,9 @@ class AccountInvoiceUpdate(models.TransientModel): self.ensure_one() inv = self.invoice_id if ( - self.payment_term and - self.payment_term != inv.payment_term and - inv.move_id and - inv.move_id.period_id.state == 'draft'): + self.payment_term_id and + self.payment_term_id != inv.payment_term_id and + inv.move_id): # I don't update pay term when the invoice is partially (or fully) # paid because if you have a payment term with several lines # of the same amount, you would also have to take into account @@ -134,7 +129,7 @@ class AccountInvoiceUpdate(models.TransientModel): "terms on an invoice which is partially or fully " "paid.")) prec = self.env['decimal.precision'].precision_get('Account') - term_res = self.payment_term.compute( + term_res = self.payment_term_id.compute( inv.amount_total, inv.date_invoice)[0] new_pterm = {} # key = int(amount * 100), value = [date1, date2] for entry in term_res: @@ -144,7 +139,7 @@ class AccountInvoiceUpdate(models.TransientModel): else: new_pterm[amount] = [entry[0]] mlines = {} # key = int(amount * 100), value : [line1, line2] - for line in inv.move_id.line_id: + for line in inv.move_id.line_ids: if line.account_id == inv.account_id: amount = int(abs(line.credit - line.debit) * 10 * prec) if amount in mlines: @@ -159,7 +154,7 @@ class AccountInvoiceUpdate(models.TransientModel): "new payment term '%s'. You can only switch to a " "payment term that has the same number of terms " "with the same amount.") % ( - inv.payment_term.name, self.payment_term.name)) + inv.payment_term_id.name, self.payment_term_id.name)) for line in lines: line.date_maturity = new_pterm[iamount].pop() @@ -179,7 +174,7 @@ class AccountInvoiceUpdate(models.TransientModel): if ilvals: updated = True line.invoice_line_id.write(ilvals) - if inv.move_id and inv.move_id.period_id.state == 'draft': + if inv.move_id: mvals = self._prepare_move() if mvals: inv.move_id.write(mvals) diff --git a/account_invoice_update_wizard/wizard/account_invoice_update_view.xml b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml index 5da5814..0899298 100644 --- a/account_invoice_update_wizard/wizard/account_invoice_update_view.xml +++ b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml @@ -15,11 +15,11 @@ - + - + From b5af2e54b0a5e126c010c2907c1ce08b81f7a439 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Wed, 20 Jun 2018 14:47:59 +0200 Subject: [PATCH 4/5] [10.0] Migration of account_invoice_update_wizard --- account_invoice_update_wizard/__init__.py | 2 -- .../{__openerp__.py => __manifest__.py} | 0 .../views/account_invoice.xml | 10 ++++------ account_invoice_update_wizard/wizard/__init__.py | 2 -- .../wizard/account_invoice_update.py | 6 +++--- .../wizard/account_invoice_update_view.xml | 7 ++----- 6 files changed, 9 insertions(+), 18 deletions(-) rename account_invoice_update_wizard/{__openerp__.py => __manifest__.py} (100%) diff --git a/account_invoice_update_wizard/__init__.py b/account_invoice_update_wizard/__init__.py index 3b4c3ed..4027237 100644 --- a/account_invoice_update_wizard/__init__.py +++ b/account_invoice_update_wizard/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import wizard diff --git a/account_invoice_update_wizard/__openerp__.py b/account_invoice_update_wizard/__manifest__.py similarity index 100% rename from account_invoice_update_wizard/__openerp__.py rename to account_invoice_update_wizard/__manifest__.py diff --git a/account_invoice_update_wizard/views/account_invoice.xml b/account_invoice_update_wizard/views/account_invoice.xml index 5d779f4..312f7d7 100644 --- a/account_invoice_update_wizard/views/account_invoice.xml +++ b/account_invoice_update_wizard/views/account_invoice.xml @@ -4,14 +4,13 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - + account.invoice - @@ -21,11 +20,10 @@ account.invoice - - - + diff --git a/account_invoice_update_wizard/wizard/__init__.py b/account_invoice_update_wizard/wizard/__init__.py index f66fb84..9a89518 100644 --- a/account_invoice_update_wizard/wizard/__init__.py +++ b/account_invoice_update_wizard/wizard/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import account_invoice_update diff --git a/account_invoice_update_wizard/wizard/account_invoice_update.py b/account_invoice_update_wizard/wizard/account_invoice_update.py index 3b2f81a..2bc26d6 100644 --- a/account_invoice_update_wizard/wizard/account_invoice_update.py +++ b/account_invoice_update_wizard/wizard/account_invoice_update.py @@ -2,9 +2,9 @@ # © 2017 Akretion (Alexis de Lattre ) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields, api, _ -from openerp.exceptions import Warning as UserError -import openerp.addons.decimal_precision as dp +from odoo import models, fields, api, _ +from odoo.exceptions import Warning as UserError +import odoo.addons.decimal_precision as dp class AccountInvoiceUpdate(models.TransientModel): diff --git a/account_invoice_update_wizard/wizard/account_invoice_update_view.xml b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml index 0899298..1eab7c7 100644 --- a/account_invoice_update_wizard/wizard/account_invoice_update_view.xml +++ b/account_invoice_update_wizard/wizard/account_invoice_update_view.xml @@ -4,8 +4,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - + account.invoice.update @@ -36,7 +35,6 @@
@@ -50,5 +48,4 @@ new - - + From 90a2e26e79c99b0e697359f823c3daa438df4677 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Wed, 27 Jun 2018 10:35:34 +0200 Subject: [PATCH 5/5] fixup! [10.0] Migration of account_invoice_update_wizard --- account_invoice_update_wizard/wizard/account_invoice_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_invoice_update_wizard/wizard/account_invoice_update.py b/account_invoice_update_wizard/wizard/account_invoice_update.py index 2bc26d6..0de0648 100644 --- a/account_invoice_update_wizard/wizard/account_invoice_update.py +++ b/account_invoice_update_wizard/wizard/account_invoice_update.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models, fields, api, _ -from odoo.exceptions import Warning as UserError +from odoo.exceptions import UserError import odoo.addons.decimal_precision as dp