From 0d567fa4b0d48c91a53319b227d64d1c393bf121 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Mon, 29 May 2017 18:34:23 +0200 Subject: [PATCH] Fix errors, improve menus, views, readme (cherry picked from commit 93a9b1ee4fd05c2a8fd97c305e392cab6a24f865) --- account_credit_control/__init__.py | 3 +++ account_credit_control/__openerp__.py | 22 +++---------------- account_credit_control/models/__init__.py | 3 +++ .../wizard/credit_control_policy_changer.py | 4 ++++ 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/account_credit_control/__init__.py b/account_credit_control/__init__.py index 7b23af6a9..4da4c748d 100644 --- a/account_credit_control/__init__.py +++ b/account_credit_control/__init__.py @@ -1,5 +1,8 @@ +<<<<<<< f4a71683cf11965d8ffc1f5016e254fe6aa2eaf5 # -*- coding: utf-8 -*- # Copyright 2017 Okia SPRL (https://okia.be) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +======= +>>>>>>> Fix errors, improve menus, views, readme from . import models from . import wizard diff --git a/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py index 5a7c07d28..7d30d3e2a 100644 --- a/account_credit_control/__openerp__.py +++ b/account_credit_control/__openerp__.py @@ -1,23 +1,7 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# Author: Nicolas Bessi, Guewen Baconnier -# Copyright 2012-2014 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 . -# -############################################################################## +# Copyright 2012-2017 Camptocamp SA +# Copyright 2017 Okia SPRL (https://okia.be) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). {'name': 'Account Credit Control', 'version': '8.0.0.3.0', 'author': "Camptocamp,Odoo Community Association (OCA)", diff --git a/account_credit_control/models/__init__.py b/account_credit_control/models/__init__.py index 342e9b8cd..d43188956 100644 --- a/account_credit_control/models/__init__.py +++ b/account_credit_control/models/__init__.py @@ -1,6 +1,9 @@ +<<<<<<< f4a71683cf11965d8ffc1f5016e254fe6aa2eaf5 # -*- coding: utf-8 -*- # Copyright 2017 Okia SPRL (https://okia.be) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +======= +>>>>>>> Fix errors, improve menus, views, readme from . import account_account from . import account_invoice from . import credit_control_line diff --git a/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py index 76ecefb3d..7991ff6b7 100644 --- a/account_credit_control/wizard/credit_control_policy_changer.py +++ b/account_credit_control/wizard/credit_control_policy_changer.py @@ -82,6 +82,10 @@ class CreditControlPolicyChanger(models.TransientModel): @api.model def _set_invoice_policy(self, move_lines, policy): """ Force policy on invoice """ +<<<<<<< f4a71683cf11965d8ffc1f5016e254fe6aa2eaf5 +======= + invoice_obj = self.env['account.invoice'] +>>>>>>> Fix errors, improve menus, views, readme invoices = move_lines.mapped('invoice_id') invoices.write({'credit_policy_id': policy.id})