Browse Source

Merge pull request #17 from coopiteasy/9.0-fix-install-from-scratch

[9.0][FIX] easy_my_coop: reorder menu definitions
pull/31/head
Robin Keunen 5 years ago
committed by GitHub
parent
commit
b89635c2b3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      easy_my_coop/__openerp__.py
  2. 5
      easy_my_coop/view/account_invoice_view.xml
  3. 3
      easy_my_coop/view/cooperator_register_view.xml
  4. 6
      easy_my_coop/view/email_template_view.xml
  5. 33
      easy_my_coop/view/menu.xml
  6. 3
      easy_my_coop/view/operation_request_view.xml
  7. 3
      easy_my_coop/view/product_view.xml
  8. 14
      easy_my_coop/view/res_partner_view.xml
  9. 5
      easy_my_coop/view/subscription_request_view.xml
  10. 41
      easy_my_coop/wizard/cooperative_history_wizard.xml
  11. 1
      easy_my_coop/wizard/update_partner_info.xml

1
easy_my_coop/__openerp__.py

@ -45,6 +45,7 @@
'view/product_view.xml', 'view/product_view.xml',
'view/res_company_view.xml', 'view/res_company_view.xml',
'view/account_journal_view.xml', 'view/account_journal_view.xml',
'view/menu.xml',
'data/easy_my_coop_data.xml', 'data/easy_my_coop_data.xml',
'report/easy_my_coop_report.xml', 'report/easy_my_coop_report.xml',
'report/cooperator_invoice_G002.xml', 'report/cooperator_invoice_G002.xml',

5
easy_my_coop/view/account_invoice_view.xml

@ -49,8 +49,7 @@
<field name="act_window_id" ref="action_invoice_tree_coop"/> <field name="act_window_id" ref="action_invoice_tree_coop"/>
</record> </record>
<menuitem action="action_invoice_tree_coop" id="menu_action_invoice_tree_coop" parent="menu_easy_my_coop_main_coop" groups="easy_my_coop.group_energiris_user"/>
<record id="account.action_invoice_tree1" model="ir.actions.act_window"> <record id="account.action_invoice_tree1" model="ir.actions.act_window">
<field name="name">Customer Invoices</field> <field name="name">Customer Invoices</field>
<field name="res_model">account.invoice</field> <field name="res_model">account.invoice</field>
@ -86,4 +85,4 @@
<field name="search_view_id" ref="account.view_account_invoice_filter"/> <field name="search_view_id" ref="account.view_account_invoice_filter"/>
</record> </record>
</data> </data>
</openerp>
</openerp>

3
easy_my_coop/view/cooperator_register_view.xml

@ -75,6 +75,5 @@
<field name="search_view_id" ref="view_subscription_register_filter"/> <field name="search_view_id" ref="view_subscription_register_filter"/>
</record> </record>
<menuitem action="subscription_register_action" name="Subscription Register" id="menu_easy_my_coop_subscription_register" parent="menu_easy_my_coop_main_subscription" sequence="20"/>
</data> </data>
</openerp>
</openerp>

6
easy_my_coop/view/email_template_view.xml

@ -1,7 +1,6 @@
<openerp> <openerp>
<data> <data>
<menuitem name="Configuration" id="menu_easy_my_coop_config" parent="menu_main_easy_my_coop" sequence="20"/>
<record model="ir.actions.act_window" id="action_easy_my_coop_email_templates"> <record model="ir.actions.act_window" id="action_easy_my_coop_email_templates">
<field name="name">Mail Templates</field> <field name="name">Mail Templates</field>
<field name="res_model">mail.template</field> <field name="res_model">mail.template</field>
@ -11,6 +10,5 @@
<field name="search_view_id" ref="mail.view_email_template_search"/> <field name="search_view_id" ref="mail.view_email_template_search"/>
</record> </record>
<menuitem id="menu_easy_my_coop_templates" parent="menu_easy_my_coop_config" action="action_easy_my_coop_email_templates" sequence="10" groups="group_energiris_manager"/>
</data> </data>
</openerp>
</openerp>

33
easy_my_coop/view/menu.xml

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2019 Coop IT Easy
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<!-- top menus -->
<menuitem name="Easy-My Coop" id="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_user"/>
<menuitem name="Cooperators" id="menu_easy_my_coop_main_coop" parent="menu_main_easy_my_coop" sequence="5" />
<menuitem name="Subscription" id="menu_easy_my_coop_main_subscription" parent="menu_main_easy_my_coop" sequence="10" groups="easy_my_coop.group_energiris_manager"/>
<menuitem name="Reporting" id="menu_easy_my_coop_main_reporting" parent="menu_main_easy_my_coop" sequence="40" groups="easy_my_coop.group_energiris_manager"/>
<menuitem name="Configuration" id="menu_easy_my_coop_config" parent="menu_main_easy_my_coop" sequence="20"/>
<!-- views -->
<menuitem action="action_invoice_tree_coop" id="menu_action_invoice_tree_coop" parent="menu_easy_my_coop_main_coop" groups="easy_my_coop.group_energiris_user"/>
<menuitem id="menu_easy_my_coop_cooperator" name="Cooperators" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_form" sequence="100"/>
<menuitem id="menu_easy_my_coop_cooperator_candidate" name="Cooperator Candidates" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_candidate_form" sequence="150"/>
<menuitem id="menu_easy_my_coop_company_representative" name="Company representative" parent="menu_easy_my_coop_main_coop" action="action_company_representative_form" sequence="160"/>
<menuitem action="subscription_register_action" name="Subscription Register" id="menu_easy_my_coop_subscription_register" parent="menu_easy_my_coop_main_subscription" sequence="20"/>
<menuitem action="operation_request_action" name="Operation request" id="menu_easy_my_coop_operation_request" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="easy_my_coop.group_energiris_manager"/>
<menuitem action="share_product_action" name="Share type" id="menu_easy_my_coop_share_product" parent="menu_easy_my_coop_main_subscription" sequence="20"/>
<menuitem action="subscription_request_action" name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request" parent="menu_easy_my_coop_main_subscription" sequence="10"/>
<menuitem action="company_subscription_request_action" name="Company Subscription" id="menu_easy_my_coop_company_subscription_request" parent="menu_easy_my_coop_main_subscription" sequence="12"/>
<menuitem action="share_line_action" name="Share lines" id="menu_easy_my_coop_share_line" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="group_energiris_super_manager"/>
<menuitem id="menu_easy_my_coop_templates" parent="menu_easy_my_coop_config" action="action_easy_my_coop_email_templates" sequence="10" groups="group_energiris_manager"/>
<!-- wizards -->
<menuitem action="action_view_update_partner_info" name="Update coop partner" id="menu_view_update_partner_info" parent="menu_easy_my_coop_main_subscription" sequence="60" groups="base.group_system"/>
</odoo>

3
easy_my_coop/view/operation_request_view.xml

@ -102,6 +102,5 @@
<field name="view_id" ref="operation_request_tree"/> <field name="view_id" ref="operation_request_tree"/>
</record> </record>
<menuitem action="operation_request_action" name="Operation request" id="menu_easy_my_coop_operation_request" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="easy_my_coop.group_energiris_manager"/>
</data> </data>
</openerp>
</openerp>

3
easy_my_coop/view/product_view.xml

@ -64,8 +64,7 @@
</field> </field>
</record> </record>
<menuitem action="share_product_action" name="Share type" id="menu_easy_my_coop_share_product" parent="menu_easy_my_coop_main_subscription" sequence="20"/>
<!-- overriding product views to not display share product in the purchase and sale views--> <!-- overriding product views to not display share product in the purchase and sale views-->
<record id="product.product_normal_action" model="ir.actions.act_window"> <record id="product.product_normal_action" model="ir.actions.act_window">

14
easy_my_coop/view/res_partner_view.xml

@ -96,8 +96,7 @@
</field> </field>
</record> </record>
<menuitem name="Cooperators" id="menu_easy_my_coop_main_coop" parent="menu_main_easy_my_coop" sequence="5" />
<record id="action_partner_cooperator_form" model="ir.actions.act_window"> <record id="action_partner_cooperator_form" model="ir.actions.act_window">
<field name="name">Cooperator</field> <field name="name">Cooperator</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -118,8 +117,7 @@
</field> </field>
</record> </record>
<menuitem id="menu_easy_my_coop_cooperator" name="Cooperators" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_form" sequence="100"/>
<record id="action_partner_cooperator_candidate_form" model="ir.actions.act_window"> <record id="action_partner_cooperator_candidate_form" model="ir.actions.act_window">
<field name="name">Cooperator candidates</field> <field name="name">Cooperator candidates</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -140,8 +138,7 @@
</field> </field>
</record> </record>
<menuitem id="menu_easy_my_coop_cooperator_candidate" name="Cooperator Candidates" parent="menu_easy_my_coop_main_coop" action="action_partner_cooperator_candidate_form" sequence="150"/>
<record id="action_company_representative_form" model="ir.actions.act_window"> <record id="action_company_representative_form" model="ir.actions.act_window">
<field name="name">Company representative</field> <field name="name">Company representative</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -161,8 +158,7 @@
</field> </field>
</record> </record>
<menuitem id="menu_easy_my_coop_company_representative" name="Company representative" parent="menu_easy_my_coop_main_coop" action="action_company_representative_form" sequence="160"/>
<record id="remove_partner_follower" model="ir.ui.view"> <record id="remove_partner_follower" model="ir.ui.view">
<field name="name">res.partner.remove.follower.inherit</field> <field name="name">res.partner.remove.follower.inherit</field>
<field name="model">res.partner</field> <field name="model">res.partner</field>
@ -172,4 +168,4 @@
</field> </field>
</record> </record>
</data> </data>
</openerp>
</openerp>

5
easy_my_coop/view/subscription_request_view.xml

@ -129,7 +129,6 @@
<field name="search_view_id" ref="view_subscription_request_filter"/> <field name="search_view_id" ref="view_subscription_request_filter"/>
</record> </record>
<menuitem action="subscription_request_action" name="Cooperator Subscription" id="menu_easy_my_coop_subscription_request" parent="menu_easy_my_coop_main_subscription" sequence="10"/>
<record id="company_subscription_request_tree" model="ir.ui.view"> <record id="company_subscription_request_tree" model="ir.ui.view">
<field name="name">subscription.request.tree</field> <field name="name">subscription.request.tree</field>
@ -166,7 +165,6 @@
<field name="search_view_id" ref="view_subscription_request_filter"/> <field name="search_view_id" ref="view_subscription_request_filter"/>
</record> </record>
<menuitem action="company_subscription_request_action" name="Company Subscription" id="menu_easy_my_coop_company_subscription_request" parent="menu_easy_my_coop_main_subscription" sequence="12"/>
<record id="share_line_form" model="ir.ui.view"> <record id="share_line_form" model="ir.ui.view">
<field name="name">share.line.form</field> <field name="name">share.line.form</field>
@ -234,6 +232,5 @@
<field name="view_type">form</field> <field name="view_type">form</field>
</record> </record>
<menuitem action="share_line_action" name="Share lines" id="menu_easy_my_coop_share_line" parent="menu_easy_my_coop_main_subscription" sequence="20" groups="group_energiris_super_manager"/>
</data> </data>
</openerp>
</openerp>

41
easy_my_coop/wizard/cooperative_history_wizard.xml

@ -1,41 +0,0 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="view_cooperative_history_wizard" model="ir.ui.view">
<field name="name">cooperative.history.wizard.form</field>
<field name="model">cooperative.history.report</field>
<field name="arch" type="xml">
<form string="Reporting" version="7.0">
<separator string="Cooperative History"/>
<group>
<field name="report"/>
</group>
<label string="This report allows you to print a pdf of history and number of share for each cooperator"/>
<group>
<field name="display_cooperator"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
<record id="action_cooperative_history_wizard" model="ir.actions.act_window">
<field name="name">Cooperative history</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">cooperative.history.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="view_cooperative_history_wizard"/>
<field name="target">new</field>
<field name="multi">True</field>
</record>
<menuitem id="menu_energiris_reporting" name="Reporting" parent="menu_main_energiris" sequence="20"/>
<menuitem id="menu_coop_history_wizard_report" name="Cooperative history report" parent="menu_energiris_reporting" action="action_cooperative_history_wizard" sequence="10"/>
</data>
</openerp>

1
easy_my_coop/wizard/update_partner_info.xml

@ -34,6 +34,5 @@
<field name="target">new</field> <field name="target">new</field>
<field name="groups_id" eval="[(4,ref('easy_my_coop.group_energiris_manager'))]"/> <field name="groups_id" eval="[(4,ref('easy_my_coop.group_energiris_manager'))]"/>
</record> </record>
<menuitem action="action_view_update_partner_info" name="Update coop partner" id="menu_view_update_partner_info" parent="menu_easy_my_coop_main_subscription" sequence="60" groups="base.group_system"/>
</data> </data>
</openerp> </openerp>
Loading…
Cancel
Save