diff --git a/partner_changeset/README.rst b/partner_changeset/README.rst index 8b9ab712b..6c970ce38 100644 --- a/partner_changeset/README.rst +++ b/partner_changeset/README.rst @@ -136,7 +136,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed `feedback +help us smashing it by providing a detailed and welcomed feedback Credits ======= @@ -151,6 +151,7 @@ Contributors * Guewen Baconnier * Denis Leemann +* Yannick Vaucher Maintainer ---------- diff --git a/partner_changeset/__init__.py b/partner_changeset/__init__.py index a77a6fcbc..ec50cfc0f 100644 --- a/partner_changeset/__init__.py +++ b/partner_changeset/__init__.py @@ -1,4 +1,4 @@ # -*- coding: utf-8 -*- -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/partner_changeset/__openerp__.py b/partner_changeset/__manifest__.py similarity index 82% rename from partner_changeset/__openerp__.py rename to partner_changeset/__manifest__.py index 45b977d58..91ee56e31 100644 --- a/partner_changeset/__openerp__.py +++ b/partner_changeset/__manifest__.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). {'name': 'Partner Changesets', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'author': 'Camptocamp, Odoo Community Association (OCA)', 'license': 'AGPL-3', 'category': 'Sales Management', diff --git a/partner_changeset/models/__init__.py b/partner_changeset/models/__init__.py index 5b7f50da6..47aeab756 100644 --- a/partner_changeset/models/__init__.py +++ b/partner_changeset/models/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import res_partner from . import res_partner_changeset diff --git a/partner_changeset/models/changeset_field_rule.py b/partner_changeset/models/changeset_field_rule.py index 8b2b5d771..1abc03e06 100644 --- a/partner_changeset/models/changeset_field_rule.py +++ b/partner_changeset/models/changeset_field_rule.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields, api -from openerp.tools.cache import ormcache +from odoo import models, fields, api +from odoo.tools.cache import ormcache class ChangesetFieldRule(models.Model): diff --git a/partner_changeset/models/res_partner.py b/partner_changeset/models/res_partner.py index fa6da68d3..f64916fc8 100644 --- a/partner_changeset/models/res_partner.py +++ b/partner_changeset/models/res_partner.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields, api +from odoo import models, fields, api class ResPartner(models.Model): diff --git a/partner_changeset/models/res_partner_changeset.py b/partner_changeset/models/res_partner_changeset.py index 380096456..43ee69c95 100644 --- a/partner_changeset/models/res_partner_changeset.py +++ b/partner_changeset/models/res_partner_changeset.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from itertools import groupby from lxml import etree from operator import attrgetter -from openerp import models, fields, api, exceptions, _ -from openerp.osv.orm import setup_modifiers +from odoo import models, fields, api, exceptions, _ +from odoo.osv.orm import setup_modifiers # sentinel object to be sure that no empty value was passed to # ResPartnerChangesetChange._value_for_changeset @@ -22,7 +22,7 @@ class ResPartnerChangeset(models.Model): partner_id = fields.Many2one(comodel_name='res.partner', string='Partner', - select=True, + index=True, required=True, readonly=True, ondelete='cascade') @@ -31,7 +31,7 @@ class ResPartnerChangeset(models.Model): string='Changes', readonly=True) date = fields.Datetime(default=fields.Datetime.now, - select=True, + index=True, readonly=True) state = fields.Selection( compute='_compute_state', @@ -378,7 +378,8 @@ class ResPartnerChangesetChange(models.Model): field = change.field_id value_for_write = change._convert_value_for_write( - change.get_new_value() + change.get_new_value(), + partner ) values[field.name] = value_for_write @@ -421,18 +422,18 @@ class ResPartnerChangesetChange(models.Model): @api.model def _has_field_changed(self, record, field, value): field_def = record._fields[field] - current_value = field_def.convert_to_write(record[field]) + current_value = field_def.convert_to_write(record[field], record) if not (current_value or value): return False return current_value != value @api.multi - def _convert_value_for_write(self, value): + def _convert_value_for_write(self, value, record): if not value: return value model = self.env[self.field_id.model_id.model] model_field_def = model._fields[self.field_id.name] - return model_field_def.convert_to_write(value) + return model_field_def.convert_to_write(value, record) @api.model def _value_for_changeset(self, record, field_name, value=_NO_VALUE): @@ -446,7 +447,7 @@ class ResPartnerChangesetChange(models.Model): if value is _NO_VALUE: # when the value is read from the record, we need to prepare # it for the write (e.g. extract .id from a many2one record) - value = field_def.convert_to_write(record[field_name]) + value = field_def.convert_to_write(record[field_name], record) if field_def.type == 'many2one': # store as 'reference' comodel = field_def.comodel_name diff --git a/partner_changeset/security/security.xml b/partner_changeset/security/security.xml index 946052059..107d8b605 100644 --- a/partner_changeset/security/security.xml +++ b/partner_changeset/security/security.xml @@ -1,7 +1,6 @@ - + - Changeset Configuration The user will have an access to the configuration of the changeset rules. @@ -24,6 +23,6 @@ - - + + diff --git a/partner_changeset/tests/common.py b/partner_changeset/tests/common.py index 29ba88d2f..88830c433 100644 --- a/partner_changeset/tests/common.py +++ b/partner_changeset/tests/common.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). class ChangesetMixin(object): diff --git a/partner_changeset/tests/test_changeset_field_rule.py b/partner_changeset/tests/test_changeset_field_rule.py index cdbd51e6b..0860bf1a6 100644 --- a/partner_changeset/tests/test_changeset_field_rule.py +++ b/partner_changeset/tests/test_changeset_field_rule.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.tests import common +from odoo.tests import common class TestChangesetFieldRule(common.TransactionCase): diff --git a/partner_changeset/tests/test_changeset_field_type.py b/partner_changeset/tests/test_changeset_field_type.py index 802675db7..f020c1907 100644 --- a/partner_changeset/tests/test_changeset_field_type.py +++ b/partner_changeset/tests/test_changeset_field_type.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.tests import common +from odoo.tests import common from .common import ChangesetMixin diff --git a/partner_changeset/tests/test_changeset_flow.py b/partner_changeset/tests/test_changeset_flow.py index 19287b5cb..d8a04b359 100644 --- a/partner_changeset/tests/test_changeset_flow.py +++ b/partner_changeset/tests/test_changeset_flow.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from datetime import datetime, timedelta -from openerp import fields, exceptions -from openerp.tests import common +from odoo import fields, exceptions +from odoo.tests import common from .common import ChangesetMixin diff --git a/partner_changeset/tests/test_changeset_origin.py b/partner_changeset/tests/test_changeset_origin.py index 7347c108c..bac7baabf 100644 --- a/partner_changeset/tests/test_changeset_origin.py +++ b/partner_changeset/tests/test_changeset_origin.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# © 2015-2016 Camptocamp SA -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2017 Camptocamp SA +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.tests import common +from odoo.tests import common from .common import ChangesetMixin diff --git a/partner_changeset/views/menu.xml b/partner_changeset/views/menu.xml index cf3c23a12..b40f4bbd4 100644 --- a/partner_changeset/views/menu.xml +++ b/partner_changeset/views/menu.xml @@ -3,6 +3,6 @@