<search string="Search Analytic Lines">
<field name="name" string="Analytic Line"/>
<field name="date"/>
- <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
- <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
- <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+ <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
+ <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
+ <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
<separator/>
- <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+ <filter string="My Entries" domain="[('user_id','=',uid)]"/>
<field name="account_id"/>
<field name="user_id"/>
<group string="Group By..." expand="0">
- <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
- <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
- <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
- <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
- <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
+ <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+ <filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
+ <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
+ <separator/>
+ <filter string="Product" context="{'group_by':'product_id'}"/>
+ <filter string="User" context="{'group_by':'user_id'}"/>
+ <separator/>
+ <filter string="Date" context="{'group_by':'date'}" name="group_date"/>
+
</group>
</search>
</field>
action="action_account_analytic_journal_tree"
id="account_analytic_journal_print" parent="account.next_id_40"/>
-
- <act_window
- context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"
- id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal"
- name="All Analytic Entries"
- res_model="account.analytic.line"
- src_model="account.analytic.account"
- view_mode="tree,form"
- view_type="form"/>
-
<record id="view_account_journal_1" model="ir.ui.view">
<field name="name">account.journal.form.1</field>
<field name="model">account.journal</field>
Analytic Account form
-->
- <act_window
- id="action_sales_order"
- name="Sales Orders"
- res_model="sale.order"
- src_model="account.analytic.account"
- />
+ <record model="ir.actions.act_window" id="action_sales_order">
+ <field name="name">Sales Orders</field>
+ <field name="res_model">sale.order</field>
+ <field name="src_model">account.analytic.account</field>
+ </record>
<record id="account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form.inherit</field>
<field name="arch" type="xml">
<form string="Analytic Account" version="7.0">
<sheet string="Analytic Account">
+ <div class="oe_right oe_button_box" name="buttons">
+ </div>
+
+ <div class="oe_title">
<label for="name" class="oe_edit_only"/>
- <h1>
- <field name="name" class="oe_inline"/>
- </h1>
- <div name="project"/>
- <group>
+ <h1>
+ <field name="name" class="oe_inline"/>
+ </h1>
+ <div name="project"/>
+ </div>
+
+ <group name="main">
<group>
<field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
<field name="manager_id"/>
</search>
</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 & 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>
+ </record>
+
+
<record id="account_analytic_account_timesheet_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form</field>
<field name="model">account.analytic.account</field>
<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>
<field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
</record>
- <act_window
- domain="[('invoice_id','=',False),('to_invoice','<>',False), ('journal_id.type', '=', 'general')]"
- context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
- id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
- name="Timesheet Lines to Invoice"
- res_model="account.analytic.line"
- src_model="account.analytic.account"/>
+ <record id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" model="ir.actions.act_window">
+ <field name="domain">[]</field>
+ <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}</field>
+ <field name="name">To Invoice</field>
+ <field name="res_model">account.analytic.line</field>
+ <field name="src_model">account.analytic.account</field>
+ </record>
</data>
</openerp>