Merge lp:~openerp-dev/openobject-addons/7.0-opw-593659-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello Sir,

Moved 'Cost and Revenue' button to Analytic Accounting module from Timesheet module.

Steps to reproduce:
- Create a new DB
- Install Accounting
- Settings/Accouting : tick "use analytic accounting"
- Accouting/Analytic accounting: Create an analytic account.
- The button " Cost and revenue" is not there.

Unmerged revisions

9245. By Dharti Ratani(OpenERP) on 2013-06-18

[FIX]Moved Costs and revenue button to Analytic accountic module

=== modified file 'analytic/analytic_view.xml'
--- analytic/analytic_view.xml	2012-11-29 22:26:45 +0000
+++ analytic/analytic_view.xml	2013-06-18 06:10:40 +0000
@@ -1,6 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    	
+    	<record model="ir.actions.act_window" id="act_analytic_cost_revenue">
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id, 'search_default_group_date': 1, 'search_default_group_journal': 1}</field>
+            <field name="name">Costs &amp; Revenues</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="help" type="html">
+              <p>
+                No activity yet on this contract.
+              </p><p>
+                In OpenERP, contracts and projects are implemented using
+                analytic account. So, you can track costs and revenues to analyse
+                your margins easily.
+              </p><p>
+                Costs will be created automatically when you register supplier
+                invoices, expenses or timesheets.
+              </p><p>
+                Revenues will be created automatically when you create customer
+                invoices. Customer invoices can be created based on sale orders
+                (fixed price invoices), on timesheets (based on the work done) or
+                on expenses (e.g. reinvoicing of travel costs).
+              </p>
+            </field>
+        </record>
+
 
         <record id="view_account_analytic_account_form" model="ir.ui.view">
             <field name="name">analytic.analytic.account.form</field>
@@ -9,6 +36,9 @@
                 <form string="Analytic Account" version="7.0">
                     <sheet string="Analytic Account">
                         <div class="oe_right oe_button_box" name="buttons">
+                        	<button string="Costs and Revenues"
+                        name="%(act_analytic_cost_revenue)d"
+                        type="action"/>
                         </div>
 
                         <div class="oe_title">

=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml	2012-12-14 11:14:32 +0000
+++ hr_timesheet/hr_timesheet_view.xml	2013-06-18 06:10:40 +0000
@@ -78,32 +78,6 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="act_analytic_cost_revenue">
-            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id, 'search_default_group_date': 1, 'search_default_group_journal': 1}</field>
-            <field name="name">Costs &amp; Revenues</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="src_model">account.analytic.account</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_type">form</field>
-            <field name="help" type="html">
-              <p>
-                No activity yet on this contract.
-              </p><p>
-                In OpenERP, contracts and projects are implemented using
-                analytic account. So, you can track costs and revenues to analyse
-                your margins easily.
-              </p><p>
-                Costs will be created automatically when you register supplier
-                invoices, expenses or timesheets.
-              </p><p>
-                Revenues will be created automatically when you create customer
-                invoices. Customer invoices can be created based on sale orders
-                (fixed price invoices), on timesheets (based on the work done) or
-                on expenses (e.g. reinvoicing of travel costs).
-              </p>
-            </field>
-        </record>
-
  
         <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
@@ -114,12 +88,6 @@
                     <field name="use_timesheets"/>
                     <label for="use_timesheets"/>
                 </xpath>
-                <xpath expr='//div[@name="buttons"]' position='inside'>
-                    <button string="Costs and Revenues"
-                        name="%(act_analytic_cost_revenue)d"
-                        type="action"/>
-
-                </xpath>
             </field>
         </record>