diff --git a/easy_my_coop/__manifest__.py b/easy_my_coop/__manifest__.py index aed426e..77751de 100644 --- a/easy_my_coop/__manifest__.py +++ b/easy_my_coop/__manifest__.py @@ -43,6 +43,7 @@ 'views/product_view.xml', 'views/res_company_view.xml', 'views/account_journal_view.xml', + 'views/menus.xml', 'report/easy_my_coop_report.xml', 'report/layout.xml', 'report/cooperator_invoice_G002.xml', diff --git a/easy_my_coop/demo/coop.xml b/easy_my_coop/demo/coop.xml index f53ab7d..d9e5a96 100644 --- a/easy_my_coop/demo/coop.xml +++ b/easy_my_coop/demo/coop.xml @@ -34,9 +34,9 @@ - BE68539007547034 - Bank - + FR7630001007941234567890185 + Bank + diff --git a/easy_my_coop/views/account_invoice_view.xml b/easy_my_coop/views/account_invoice_view.xml index 80c76c5..ec34b8b 100644 --- a/easy_my_coop/views/account_invoice_view.xml +++ b/easy_my_coop/views/account_invoice_view.xml @@ -42,8 +42,6 @@ - - Customer Invoices account.invoice @@ -72,4 +70,4 @@ {'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'} - \ No newline at end of file + diff --git a/easy_my_coop/views/cooperator_register_view.xml b/easy_my_coop/views/cooperator_register_view.xml index 523da7d..148c29c 100644 --- a/easy_my_coop/views/cooperator_register_view.xml +++ b/easy_my_coop/views/cooperator_register_view.xml @@ -74,5 +74,4 @@ - - \ No newline at end of file + diff --git a/easy_my_coop/views/email_template_view.xml b/easy_my_coop/views/email_template_view.xml index a98d189..3b54efb 100644 --- a/easy_my_coop/views/email_template_view.xml +++ b/easy_my_coop/views/email_template_view.xml @@ -1,6 +1,5 @@ - @@ -12,5 +11,4 @@ - - + diff --git a/easy_my_coop/views/menus.xml b/easy_my_coop/views/menus.xml new file mode 100644 index 0000000..4932b6c --- /dev/null +++ b/easy_my_coop/views/menus.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/easy_my_coop/views/operation_request_view.xml b/easy_my_coop/views/operation_request_view.xml index 4b7ff1f..ecf56b2 100644 --- a/easy_my_coop/views/operation_request_view.xml +++ b/easy_my_coop/views/operation_request_view.xml @@ -103,5 +103,4 @@ - - \ No newline at end of file + diff --git a/easy_my_coop/views/product_view.xml b/easy_my_coop/views/product_view.xml index 5d81f43..9d043d2 100644 --- a/easy_my_coop/views/product_view.xml +++ b/easy_my_coop/views/product_view.xml @@ -53,8 +53,7 @@ - - + diff --git a/easy_my_coop/views/res_partner_view.xml b/easy_my_coop/views/res_partner_view.xml index dbb4d07..cce636d 100644 --- a/easy_my_coop/views/res_partner_view.xml +++ b/easy_my_coop/views/res_partner_view.xml @@ -92,8 +92,6 @@ - - Cooperator ir.actions.act_window @@ -113,9 +111,7 @@

- - - + Cooperator candidates ir.actions.act_window @@ -135,9 +131,7 @@

- - - + Company representative ir.actions.act_window @@ -157,8 +151,6 @@ - - res.partner.remove.follower.inherit res.partner @@ -168,4 +160,4 @@ - + diff --git a/easy_my_coop/views/subscription_request_view.xml b/easy_my_coop/views/subscription_request_view.xml index 421f097..b2929b6 100644 --- a/easy_my_coop/views/subscription_request_view.xml +++ b/easy_my_coop/views/subscription_request_view.xml @@ -1,15 +1,13 @@ - - - subscription.request.tree subscription.request - + + @@ -107,10 +105,10 @@ - - + + - + @@ -120,54 +118,15 @@ - Cooperator Subscription + Subscriptions subscription.request form - [('is_company','=',False),('is_operation','=',False)] + [('is_operation','=',False)] {'default_source':'manual'} - - - - subscription.request.tree - subscription.request - - - - - - - - - - - - - - - -