Merge lp:~openerp-dev/openobject-addons/trunk-accounting_config_menu-jir into lp:openobject-addons

[Jignesh Rathod(OpenERP)]

Hello ,

Merge proposal for account user menu configure.

Task Description : http://pad.openerp.com/p/openerp-project.task-PO8U38CZO2

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-accounting_config_menu-jir]

8740. By Jignesh Rathod(OpenERP) on 2013-06-12

Merge..

8741. By Jignesh Rathod(OpenERP) on 2013-06-12

Merge branch.

8742. By Jignesh Rathod(OpenERP) on 2013-06-12

Forser

Unmerged revisions

8742. By Jignesh Rathod(OpenERP) on 2013-06-12

Forser

8741. By Jignesh Rathod(OpenERP) on 2013-06-12

Merge branch.

8740. By Jignesh Rathod(OpenERP) on 2013-06-12

Merge..

8739. By Jignesh Rathod(OpenERP) on 2013-06-11

Improve code.

8738. By Jignesh Rathod(OpenERP) on 2013-06-11

Improve Code.

8737. By Jignesh Rathod(OpenERP) on 2013-06-11

Merge with latest.

8736. By Jignesh Rathod(OpenERP) on 2013-06-10

Improve Code.

8735. By Jignesh Rathod(OpenERP) on 2013-06-10

Improve Code.

8734. By Jignesh Rathod(OpenERP) on 2013-06-04

Improve code for account payemnt term rights.

8733. By Jignesh Rathod(OpenERP) on 2013-06-04

Improve code for account menu.

=== modified file 'account/account_bank_view.xml'
--- account/account_bank_view.xml	2012-11-29 22:26:45 +0000
+++ account/account_bank_view.xml	2013-06-12 12:15:38 +0000
@@ -55,6 +55,7 @@
     <menuitem
         sequence="0"
         parent="account.account_account_menu"
+        groups="group_account_manager,group_account_invoice"
         id="menu_action_bank_tree"
         action="action_bank_tree"/>
 

=== modified file 'account/account_menuitem.xml'
--- account/account_menuitem.xml	2012-12-19 06:56:45 +0000
+++ account/account_menuitem.xml	2013-06-12 12:15:38 +0000
@@ -21,19 +21,19 @@
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" groups="account.group_account_user" sequence="6"/>
         <menuitem id="menu_finance_reporting" name="Accounting" parent="base.menu_reporting" sequence="35"/>
         <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
-        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports"/>
+        <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="14" groups="group_account_user,group_account_manager,group_account_invoice"/>
+        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reports" groups="group_account_manager,group_account_user"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
-        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="15" groups="group_account_manager,group_account_invoice"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" sequence="1"/>
         <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting" sequence="40"/>
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
-        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
-        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
+        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_configuration_misc" sequence="20" groups="group_account_manager"/>
+        <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" groups="group_account_user,group_account_manager,group_account_invoice" sequence="100"/>
         <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />
+        <menuitem id="menu_account_reports" name="Financial Reports"  parent="menu_finance_configuration" groups="group_account_manager" sequence="30" />
 
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries"
             parent="menu_finance_periodical_processing" sequence="15"/>

=== modified file 'account/account_report.xml'
--- account/account_report.xml	2013-02-22 15:59:32 +0000
+++ account/account_report.xml	2013-06-12 12:15:38 +0000
@@ -38,7 +38,7 @@
         <menuitem
             id="menu_tax_report"
             name="Taxes"
-            groups="group_account_user,group_account_manager"
+            groups="group_account_user,group_account_manager,group_account_invoice"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
     </data>

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-06-03 12:18:52 +0000
+++ account/account_view.xml	2013-06-12 12:15:38 +0000
@@ -86,7 +86,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
+        <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" groups="group_account_manager"/>
         <menuitem id="menu_action_account_fiscalyear" action="action_account_fiscalyear" parent="next_id_23"/>
 
         <!-- Period -->
@@ -260,8 +260,8 @@
               </p>
             </field>
         </record>
-        <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
-        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
+        <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_configuration" groups="group_account_manager,group_account_invoice" sequence="15"/>
+        <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu" groups="group_account_manager"/>
 
         <act_window
             id="act_account_acount_move_line_open_unreconciled"
@@ -730,7 +730,7 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
+        <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="account.group_account_manager"/>
 
         <!-- Entries -->
         <record id="view_account_move_tree" model="ir.ui.view">
@@ -840,7 +840,7 @@
               </p>
             </field>
         </record>
-        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20" groups="group_account_manager"/>
         <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
 
         <act_window

=== modified file 'account/edi/invoice_action_data.xml'
--- account/edi/invoice_action_data.xml	2013-02-25 10:19:18 +0000
+++ account/edi/invoice_action_data.xml	2013-06-12 12:15:38 +0000
@@ -12,7 +12,7 @@
             <field name="context">{'search_default_model_id':'account.invoice'}</field>
             <field name="context" eval="{'search_default_model_id': ref('account.model_account_invoice')}"/>
         </record>
-        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30" groups="base.group_no_one"/>
+        <menuitem id="menu_email_templates" parent="menu_configuration_misc" action="action_email_templates" sequence="30" groups="group_account_manager" />
 
     </data>
 

=== modified file 'account/project/wizard/account_analytic_journal_report_view.xml'
--- account/project/wizard/account_analytic_journal_report_view.xml	2012-11-29 22:26:45 +0000
+++ account/project/wizard/account_analytic_journal_report_view.xml	2013-06-12 12:15:38 +0000
@@ -40,8 +40,8 @@
             <field name="model">account.analytic.journal</field>
         </record>
         
-        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
-            name="Analytic" parent="account.menu_finance_generic_reporting"
+        <menuitem id="next_id_40" groups="analytic.group_analytic_accounting"
+         name="Analytic" parent="account.menu_finance_generic_reporting"
             sequence="4"/>
         <menuitem groups="analytic.group_analytic_accounting"
             action="account.action_account_analytic_journal"

=== modified file 'account/security/account_security.xml'
--- account/security/account_security.xml	2012-12-18 23:20:01 +0000
+++ account/security/account_security.xml	2013-06-12 12:15:38 +0000
@@ -9,6 +9,7 @@
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
+
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
@@ -159,6 +160,6 @@
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-
+    
 </data>
 </openerp>

=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv	2012-12-12 12:59:12 +0000
+++ account/security/ir.model.access.csv	2013-06-12 12:15:38 +0000
@@ -35,6 +35,8 @@
 access_account_journal_period_uinvoice,account.journal.period,model_account_journal_period,account.group_account_invoice,1,1,1,1
 access_account_payment_term_manager,account.payment.term,model_account_payment_term,account.group_account_manager,1,1,1,1
 access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
+access_account_payment_term_invoice,account.payment.term,model_account_payment_term,account.group_account_invoice,1,1,1,1
+access_account_payment_term_line_invoice,account.payment.term.line,model_account_payment_term_line,account.group_account_invoice,1,1,1,1
 access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
 access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
 access_account_journal_invoice,account.journal invoice,model_account_journal,account.group_account_invoice,1,0,0,0

=== modified file 'account/wizard/account_report_partner_ledger_view.xml'
--- account/wizard/account_report_partner_ledger_view.xml	2013-01-23 11:32:53 +0000
+++ account/wizard/account_report_partner_ledger_view.xml	2013-06-12 12:15:38 +0000
@@ -43,7 +43,7 @@
         <menuitem icon="STOCK_PRINT"
             name="Partner Ledger"
             action="action_account_partner_ledger"
-            groups="group_account_manager,group_account_user"
+            groups="group_account_manager,group_account_user,group_account_invoice"
             id="menu_account_partner_ledger"
             parent="account.next_id_22"/>
 

=== modified file 'account_followup/__openerp__.py'
--- account_followup/__openerp__.py	2012-12-09 10:55:27 +0000
+++ account_followup/__openerp__.py	2013-06-12 12:15:38 +0000
@@ -46,7 +46,7 @@
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'],
-    'depends': ['account_accountant', 'mail'],
+    'depends': ['account', 'mail'],
     'data': [
         'security/account_followup_security.xml',
         'security/ir.model.access.csv',

=== modified file 'account_followup/account_followup_view.xml'
--- account_followup/account_followup_view.xml	2012-12-28 14:08:53 +0000
+++ account_followup/account_followup_view.xml	2013-06-12 12:15:38 +0000
@@ -129,6 +129,7 @@
              action="account.action_account_manual_reconcile"
              parent="menu_finance_followup"
              sequence="0"
+             groups="account.group_account_manager"  
              id="menu_manual_reconcile_followup"/>
 
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>

=== modified file 'account_followup/security/ir.model.access.csv'
--- account_followup/security/ir.model.access.csv	2012-11-23 15:42:33 +0000
+++ account_followup/security/ir.model.access.csv	2013-06-12 12:15:38 +0000
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_invoice,1,0,0,0
+access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_invoice,1,1,1,1
 access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1
-access_account_followup_followup_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_invoice,1,0,0,0
+access_account_followup_followup_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_invoice,1,1,1,1
 access_account_followup_followup_manager,account_followup.followup.manager,model_account_followup_followup,account.group_account_manager,1,1,1,1
 access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,1,1
 access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_user,1,1,1,1