[RENAME] account_analytic_analysis -> sale_contract

addons/analytic_contract_hr_expense/__openerp__.py

@@ -12,7 +12,7 @@ This module is for modifying account analytic view to show some data related to
 """,
     'author': 'OpenERP S.A.',
     'website': 'https://www.odoo.com/',
-    'depends': ['hr_expense','account_analytic_analysis'],
+    'depends': ['hr_expense','sale_contract'],
     'data': ['analytic_contract_hr_expense_view.xml'],
     'demo': [],
     'installable': True,

addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml

@@ -5,7 +5,7 @@
             <field name="name">account.analytic.account.form.expense.inherit</field>
             <field name="model">account.analytic.account</field>
             <field eval="60" name="priority"/>
-            <field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
+            <field name="inherit_id" ref="sale_contract.account_analytic_account_form_form"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
                     <tr>

addons/crm/web_planner_data.xml

@@ -554,7 +554,7 @@
                                     <br/>
                                     <h4><b>Time &amp; material</b> <span class="small">(ex: consulting mission)</span></h4>
                                     <span>
-                                        <li><a t-att-href="prepare_backend_url('account_analytic_analysis.action_account_analytic_overdue_all', 'list', 'sale')">Create your contracts</a> and configure your prices</li>
+                                        <li><a t-att-href="prepare_backend_url('sale_contract.action_account_analytic_overdue_all', 'list', 'sale')">Create your contracts</a> and configure your prices</li>
                                     </span>
                                 </div>
                             </div>

addons/hr/res_config.py

@@ -26,8 +26,8 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_evaluation."""),
         'module_hr_gamification': fields.boolean('Drive engagement with challenges and badges',
             help ="""This installs the module hr_gamification."""),
-        'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (the sale application will be installed)',
-            help ="""This installs the module account_analytic_analysis, which will install sales management too."""),
+        'module_sale_contract': fields.boolean('Allow invoicing based on timesheets (the sale application will be installed)',
+            help ="""This installs the module sale_contract, which will install sales management too."""),
         'module_hr_payroll': fields.boolean('Manage payroll',
             help ="""This installs the module hr_payroll."""),
         'module_website_hr_recruitment': fields.boolean('Publish jobs on your website',

addons/project_timesheet/__openerp__.py

@@ -16,7 +16,7 @@ with the effect of creating, editing and deleting either ways.
     'author': 'OpenERP SA',
     'website': 'https://www.odoo.com/page/project-management',
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
-    'depends': ['resource', 'project', 'account_analytic_analysis', 'procurement'],
+    'depends': ['resource', 'project', 'sale_contract', 'procurement'],
     'data': [
         'security/ir.model.access.csv',
         'security/project_timesheet_security.xml',

addons/project_timesheet/project_timesheet_view.xml

@@ -126,7 +126,7 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{}</field>
             <field name="domain">[('type','=','normal')]</field>
-            <field name="search_view_id" ref="account_analytic_analysis.view_account_analytic_account_overdue_search"/>
+            <field name="search_view_id" ref="sale_contract.view_account_analytic_account_overdue_search"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a customer contract.
@@ -136,6 +136,9 @@
               </p>
             </field>
         </record>
+        
+        <menuitem id="menu_invoicing_contracts" parent="menu_project_billing" sequence="4"
+            action="sale_contract.action_account_analytic_overdue"/>
 
         <record model="ir.ui.view" id="view_task_form2_inherited">
             <field name="name">project.task.form.inherited</field>

addons/sale/res_config.py

@@ -16,13 +16,13 @@ class sale_configuration(osv.TransientModel):
         'timesheet': fields.boolean('Prepare invoices based on timesheets',
             help='For modifying account analytic view to show important data to project manager of services companies.'
                  'You can also view the report of account analytic summary user-wise as well as month wise.\n'
-                 '-This installs the module account_analytic_analysis.'),
-        'module_account_analytic_analysis': fields.boolean('Use contracts management',
+                 '-This installs the module sale_contract.'),
+        'module_sale_contract': fields.boolean('Use contracts management',
             help='Allows to define your customer contracts conditions: invoicing '
                  'method (fixed price, on timesheet, advance invoice), the exact pricing '
                  '(650€/day for a developer), the duration (one year support contract).\n'
                  'You will be able to follow the progress of the contract and invoice automatically.\n'
-                 '-It installs the account_analytic_analysis module.'),
+                 '-It installs the sale_contract module.'),
         'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers.
@@ -79,7 +79,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
     def onchange_timesheet(self, cr, uid, ids, timesheet, context=None):
         return {'value': {
             'timesheet': timesheet,
-            'module_account_analytic_analysis': timesheet,
+            'module_sale_contract': timesheet,
         }}
 
 class account_config_settings(osv.osv_memory):

addons/sale/res_config_view.xml

@@ -95,10 +95,10 @@
                         <label for="id" string="Contract Features"/>
                         <div>
                             <div>
-                                <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
-                                <label for="module_account_analytic_analysis"/>
+                                <field name="module_sale_contract" on_change="onchange_timesheet(module_sale_contract)" class="oe_inline"/>
+                                <label for="module_sale_contract"/>
                             </div>
-                            <div name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
+                            <div name="module_analytic_user_function" attrs="{'invisible':[('module_sale_contract','=',False)]}">
                                 <field name="module_analytic_user_function" class="oe_inline"/>
                                 <label for="module_analytic_user_function"/>
                             </div>

addons/account_analytic_analysis/__init__.py → addons/sale_contract/__init__.py

 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import account_analytic_analysis
-import res_config
+import models
+import report
+import test

addons/account_analytic_analysis/__openerp__.py → addons/sale_contract/__openerp__.py

@@ -18,13 +18,14 @@ Adds menu to show relevant information to each manager.You can also view the rep
     'data': [
         'security/ir.model.access.csv',
         'security/account_analytic_analysis_security.xml',
-        'account_analytic_analysis_view.xml',
-        'account_analytic_analysis_cron.xml',
-        'res_config_view.xml',
+        'views/sale_contract_view.xml',
+        'data/sale_contract_cron.xml',
+        'views/res_config_view.xml',
         'views/account_analytic_analysis.xml',
+        'views/product_template_view.xml',
     ],
-    'demo': ['analytic_account_demo.xml', 'analytic_account_demo.yml'],
-    'test': ['../account/test/account_minimal_test.xml', 'test/account_analytic_analysis.yml'],
+    'demo': ['demo/sale_contract_demo.xml'],
+    'test': ['test/account_analytic_analysis.yml'],
     'installable': True,
     'auto_install': False,
 }