diff --git a/agreement_sale/__manifest__.py b/agreement_sale/__manifest__.py index 2d2f61c3..f56ca49b 100644 --- a/agreement_sale/__manifest__.py +++ b/agreement_sale/__manifest__.py @@ -9,7 +9,7 @@ "author": "Akretion, " "Odoo Community Association (OCA)", "website": "https://github.com/oca/contract", "license": "AGPL-3", - "depends": ["sale_management", "agreement"], + "depends": ["sale_management", "base_contract"], "data": [ "security/ir.model.access.csv", "views/agreement.xml", diff --git a/agreement_sale/models/res_config_settings.py b/agreement_sale/models/res_config_settings.py index 71c68272..670e14aa 100644 --- a/agreement_sale/models/res_config_settings.py +++ b/agreement_sale/models/res_config_settings.py @@ -5,8 +5,8 @@ class ResConfigSettings(models.TransientModel): _inherit = "res.config.settings" group_use_agreement_type = fields.Boolean( - "Use agreement types", implied_group="agreement.group_use_agreement_type" + "Use agreement types", implied_group="base_contract.group_use_agreement_type" ) group_use_agreement_template = fields.Boolean( - "Use agreement template", implied_group="agreement.group_use_agreement_template" + "Use agreement template", implied_group="base_contract.group_use_agreement_template" ) diff --git a/agreement_sale/security/ir.model.access.csv b/agreement_sale/security/ir.model.access.csv index f6e188f4..8eb927a5 100644 --- a/agreement_sale/security/ir.model.access.csv +++ b/agreement_sale/security/ir.model.access.csv @@ -1,4 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 -agreement_sale.access_agreement_type_full,Full access on agreement type grp,agreement.model_agreement_type,sales_team.group_sale_manager,1,1,1,1 -agreement_sale.access_agreement_type_read,Read access on agreement grp,agreement.model_agreement_type,base.group_user,1,0,0,0 +base_contract.access_agreement_full,Full access on agreement grp,base_contract.model_agreement,sales_team.group_sale_manager,1,1,1,1 +agreement_sale.access_agreement_type_full,Full access on agreement type grp,base_contract.model_agreement_type,sales_team.group_sale_manager,1,1,1,1 +agreement_sale.access_agreement_type_read,Read access on agreement grp,base_contract.model_agreement_type,base.group_user,1,0,0,0 diff --git a/agreement_sale/views/agreement.xml b/agreement_sale/views/agreement.xml index cc30d5ce..76aca072 100644 --- a/agreement_sale/views/agreement.xml +++ b/agreement_sale/views/agreement.xml @@ -2,9 +2,9 @@ - - + diff --git a/agreement_sale/views/res_config_settings.xml b/agreement_sale/views/res_config_settings.xml index 1a24962c..060a0be2 100644 --- a/agreement_sale/views/res_config_settings.xml +++ b/agreement_sale/views/res_config_settings.xml @@ -22,7 +22,7 @@
-
diff --git a/agreement_sale/views/sale_order.xml b/agreement_sale/views/sale_order.xml index e7e5b5ea..bb33d43a 100644 --- a/agreement_sale/views/sale_order.xml +++ b/agreement_sale/views/sale_order.xml @@ -10,7 +10,7 @@