diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py index a267a7631c0..c6000afda58 100644 --- a/addons/base_contact/__terp__.py +++ b/addons/base_contact/__terp__.py @@ -20,12 +20,13 @@ Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object. """, - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : ["base_contact_demo.xml"], "update_xml" : [ "security/ir.model.access.csv", - 'base_contact_view.xml' + 'base_contact_view.xml', + "process/base_contact_process.xml" ], "active": False, "installable": True diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 5cc819d8dea..0ae8fda9eda 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -27,40 +27,40 @@ - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
- - + +
@@ -105,14 +105,14 @@ - +
- + @@ -240,7 +240,7 @@ - + res.partner.job.tree res.partner.job @@ -253,6 +253,7 @@ + @@ -273,26 +274,29 @@ + + + - - - Functions - ir.actions.act_window - res.partner.job - form - - - - + + + Functions + ir.actions.act_window + res.partner.job + form + + + + diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml new file mode 100644 index 00000000000..c446e91b104 --- /dev/null +++ b/addons/base_contact/process/base_contact_process.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py index 2d5ded07229..f6fe8217fe8 100644 --- a/addons/membership/__terp__.py +++ b/addons/membership/__terp__.py @@ -5,7 +5,7 @@ "author" : "Tiny", "category" : "Generic Modules/Association", "depends" : [ - "base", "product", "account", + "base", "product", "account", "process" ], "demo_xml" : [ #"demo_data.xml", @@ -16,7 +16,8 @@ ], "update_xml" : [ "security/ir.model.access.csv", - "membership_view.xml","membership_wizard.xml" + "membership_view.xml","membership_wizard.xml", + "process/membership_process.xml" ], "active" : False, "installable" : True, diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml new file mode 100644 index 00000000000..5e4b9e0703b --- /dev/null +++ b/addons/membership/process/membership_process.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv index 5b34e98dec5..de35a7c8adc 100644 --- a/addons/membership/security/ir.model.access.csv +++ b/addons/membership/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1 -"access_membership_membership_line","membership.membership_line","model_membership_membership_line","base.group_user",1,0,0,0 +"access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0 "access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0 "access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0