Merge lp:~openerp-dev/openobject-addons/trunk-followup_levels_task-mansi into lp:openobject-addons

[Mansi Kariya(OpenERP)]

Hello,
    I have done Follow-up Levels configuration.

- Added Follow-Up parent menu in Accounting > Configuration > Follow-up Levels to make view more user
  friendly.

- Also added Configure follow-up levels link to configure Follow-up levels directly from
  Settings > Configuration > Accounting when Account_follow up module is installed.

Thanx,
Mansi

[lp:~openerp-dev/openobject-addons/trunk-followup_levels_task-mansi]

8754. By Mansi Kariya(OpenERP) on 2013-06-06

[IMP] Code improved

[Purnendu Singh (OpenERP) (purnendu-singh)]

seems ok to me.

thanks,
Purnendu Singh

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-followup_levels_task-mansi]

8755. By Mansi Kariya(OpenERP) on 2013-06-07

[MERGE] merged with main addons

8756. By Mansi Kariya(OpenERP) on 2013-06-07

[IMP] Description improved

8757. By Mansi Kariya(OpenERP) on 2013-06-07

[IMP] Description improved

8758. By Mansi Kariya(OpenERP) on 2013-08-22

[MERGE] Merged with main branch

Unmerged revisions

8758. By Mansi Kariya(OpenERP) on 2013-08-22

[MERGE] Merged with main branch

8757. By Mansi Kariya(OpenERP) on 2013-06-07

[IMP] Description improved

8756. By Mansi Kariya(OpenERP) on 2013-06-07

[IMP] Description improved

8755. By Mansi Kariya(OpenERP) on 2013-06-07

[MERGE] merged with main addons

8754. By Mansi Kariya(OpenERP) on 2013-06-06

[IMP] Code improved

8753. By Mansi Kariya(OpenERP) on 2013-06-06

[IMP] Code improved

8752. By Mansi Kariya(OpenERP) on 2013-06-05

[add] added file

8751. By Mansi Kariya(OpenERP) on 2013-06-05

[IMP] Done followup level's configuration

=== modified file 'account_followup/__openerp__.py'
--- account_followup/__openerp__.py	2012-12-09 10:55:27 +0000
+++ account_followup/__openerp__.py	2013-08-22 11:44:30 +0000
@@ -29,7 +29,7 @@
 
 You can define your multiple levels of recall through the menu:
 ---------------------------------------------------------------
-    Configuration / Follow-Up Levels
+    Configuration / Follow-up / Follow-up Levels
     
 Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
 ------------------------------------------------------------------------------------------------------
@@ -55,6 +55,7 @@
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
+        'res_config_view.xml'
     ],
     'demo': ['account_followup_demo.xml'],
     'test': [

=== 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-08-22 11:44:30 +0000
@@ -130,8 +130,10 @@
              parent="menu_finance_followup"
              sequence="0"
              id="menu_manual_reconcile_followup"/>
+       
+       <menuitem id="account_followup_main_menu" parent="account.menu_finance_configuration" name="Follow-up"/>
 
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">

=== added file 'account_followup/res_config_view.xml'
--- account_followup/res_config_view.xml	1970-01-01 00:00:00 +0000
+++ account_followup/res_config_view.xml	2013-08-22 11:44:30 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_config_settings_inherit" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+               <xpath expr="//label[@for='module_account_followup']" position="after">
+                    <button type="action"
+                                    name="%(action_account_followup_definition_form)d"
+                                    string="Configure your follow-up levels" class="oe_link"/>
+                </xpath>         
+            </field>
+        </record>
+    </data>
+</openerp>