<?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
<data>
<record id="account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
- <field name="quantity_max" position="before">
- <separator colspan="4" string="Invoicing Data"/>
- <field name="pricelist_id"/>
- <field name="to_invoice"/>
- <field name="amount_max"/>
- <field name="amount_invoiced"/>
- <field name="state"/>
+ <field name="partner_id" position="replace">
+ <field name="partner_id" on_change="on_change_partner_id(partner_id, context)"/>
</field>
+ <group name="contract" position="after">
+ <group colspan="2" col="2" name="invoice_data">
+ <separator colspan="2" string="Invoicing Data"/>
+ <field name="to_invoice" widget="selection"/>
+ <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]" attrs="{'required':[('to_invoice','!=',False)]}"/>
+ <field name="amount_max"/>
+ </group>
+ <group colspan="2" col="2" name="invoice_stats">
+ <separator colspan="4" string="Invoicing Statistics"/>
+ <field name="amount_invoiced"/>
+ </group>
+ <separator colspan="4"/>
+ <group col="9" colspan="8">
+ <field name="state" readonly="1" widget="statusbar"
+ statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
+ <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+ <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
+ <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+ <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+ </group>
+ </group>
</field>
</record>
-
+
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
- <field name="journal_id" position="after">
- <field name="to_invoice" select="2"/>
+ <xpath expr='//separator[@string="Invoicing"]' position='after'>
+ <field name="to_invoice"/>
<field name="invoice_id"/>
- </field>
+ </xpath>
</field>
</record>
-
+
<record id="hr_timesheet_line_form2" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form2</field>
<field name="model">hr.analytic.timesheet</field>
</field>
</field>
</record>
-
+
<record id="hr_timesheet_line_tree" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.tree</field>
<field name="model">hr.analytic.timesheet</field>
</field>
</field>
</record>
-
+
<record id="hr_timesheet_line_tree2" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.tree2</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
-
+
<field name="account_id" position="replace">
<field domain="[('type','=','normal'),('state', '<>', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
</field>
</field>
</record>
-
+
<!-- Inherits for account analytic lines -->
-
+ <record id="view_account_analytic_line_search_inherit" model="ir.ui.view">
+ <field name="name">account.analytic.line.search.to_invoice</field>
+ <field name="model">account.analytic.line</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
+ <field name="arch" type="xml">
+ <field name="date" position="before">
+ <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','<>',False)]" icon="terp-dolar"/>
+ <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','<>',False)]" icon="terp-dolar"/>
+ <separator orientation="vertical"/>
+ </field>
+ </field>
+ </record>
+
<record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
<field name="name">account.analytic.line.tree.to_invoice</field>
<field name="model">account.analytic.line</field>
<field name="type">tree</field>
<field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
<field name="arch" type="xml">
- <field name="journal_id" position="after">
+ <field name="account_id" position="after">
<field name="to_invoice"/>
</field>
</field>
</record>
-
- <record id="view_account_analytic_line_form_inherit" model="ir.ui.view">
+ <record id="view_account_analytic_line_form_inherit" model="ir.ui.view">
<field name="name">account.analytic.line.form.to_invoice</field>
<field name="model">account.analytic.line</field>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="product_uom_id" position="after">
<field name="to_invoice"/>
+ <field name="invoice_id"/>
</field>
</field>
</record>
-
+
<!-- Menus -->
<record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
- <field name="name">Entries to invoice</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('to_invoice','<>',False)]</field>
- </record>
- <menuitem action="action_hr_analytic_timesheet_open_tree" id="menu_hr_analytic_timesheet_tree" parent="account.menu_finance_periodical_processing"/>
-
-
-
- <record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
- <field name="name">Uninvoiced Entries</field>
- <field name="res_model">account.analytic.line</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
- </record>
- <menuitem action="action_hr_analytic_timesheet_tree_invoiced" id="menu_hr_analytic_timesheet_tree_invoiced" parent="hr_timesheet_invoice.menu_hr_analytic_timesheet_tree"/>
-
-
-
- <record id="action_hr_analytic_timesheet_tree_invoiced_my" model="ir.actions.act_window">
- <field name="name">My Uninvoiced Entries</field>
+ <field name="name">Bill Tasks Works</field>
<field name="res_model">account.analytic.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="domain">[('invoice_id','=',False),('to_invoice','!=',False),('user_id','=',uid)]</field>
- </record>
- <menuitem action="action_hr_analytic_timesheet_tree_invoiced_my" id="menu_hr_analytic_timesheet_tree_invoiced_my" parent="hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced"/>
-
-
- <record id="action_open_analytic_accounts" model="ir.actions.act_window">
- <field name="name">Open Analytic Accounts</field>
- <field name="res_model">account.analytic.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','<>','close'),('type','<>','view')]</field>
- </record>
- <menuitem action="action_open_analytic_accounts" id="menu_action_open_analytic_accounts" parent="account.account_analytic_def_chart"/>
-
-
- <record id="action_open_invoice_analytic_accounts" model="ir.actions.act_window">
- <field name="name">Unclosed Invoiceable Accounts</field>
- <field name="res_model">account.analytic.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','<>','close'),('type','<>','view'),('pricelist_id','<>',False)]</field>
- </record>
- <menuitem action="action_open_invoice_analytic_accounts" id="menu_action_open_invoice_analytic_accounts" parent="hr_timesheet_invoice.menu_action_open_analytic_accounts"/>
-
-
-
- <record id="action_draft_analytic_accounts" model="ir.actions.act_window">
- <field name="name">Draft Analytic Accounts</field>
- <field name="res_model">account.analytic.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','=','draft'),('type','<>','view')]</field>
- </record>
- <menuitem action="action_draft_analytic_accounts" id="menu_action_draft_analytic_accounts" parent="account.account_analytic_def_chart"/>
-
-
-
- <record id="action_pending_analytic_accounts" model="ir.actions.act_window">
- <field name="name">Pending Analytic Accounts</field>
- <field name="res_model">account.analytic.account</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','=','pending'),('type','<>','view')]</field>
+ <field name="domain">[]</field>
+ <field name="context">{'search_default_to_invoice': 1}</field>
+ <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
+ <field name="help">This list shows you every task you can invoice to the customer. Select the lines and click the Action button to generate the invoices automatically.</field>
+ </record>
+ <menuitem
+ action="action_hr_analytic_timesheet_open_tree"
+ id="menu_hr_analytic_timesheet_tree"
+ parent="account.menu_finance_periodical_processing_billing"
+ sequence="1"/>
+
+ <record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
+ <field name="name">hr_timesheet_invoice.factor.search</field>
+ <field name="model">hr_timesheet_invoice.factor</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Type of invoicing">
+ <group>
+ <field name="name"/>
+ </group>
+ </search>
+ </field>
</record>
- <menuitem action="action_pending_analytic_accounts" id="menu_action_pending_analytic_accounts" parent="account.account_analytic_def_chart"/>
-
-
-
-
-
<record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.form</field>
<field name="model">hr_timesheet_invoice.factor</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Type of invoicing">
- <field colspan="1" name="name" select="1"/>
- <field colspan="1" name="customer_name" select="2"/>
+ <field colspan="1" name="name"/>
+ <field colspan="1" name="customer_name"/>
<field colspan="2" name="factor"/>
</form>
</field>
<field name="res_model">hr_timesheet_invoice.factor</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
- </record>
- <menuitem action="action_hr_timesheet_invoice_factor_form" id="hr_timesheet_invoice_factor_view" parent="account.next_id_39"/>
-
+ <field name="search_view_id" ref="view_hr_timesheet_invoice_factor_search"/>
+ <field name="help">OpenERP allows you to create default invoicing types. You might have to regularly assign discounts because of a specific contract or agreement with a customer. From this menu, you can create additional types of invoicing to speed up your invoicing.</field>
+ </record>
+ <menuitem
+ action="action_hr_timesheet_invoice_factor_form"
+ id="hr_timesheet_invoice_factor_view"
+ parent="account.menu_configuration_misc" sequence="25" groups="base.group_no_one"/>
+
</data>
-</terp>
+</openerp>