[IMP]:contract,analytic_project,analytic_hr_expense: improve whole contract view...
[odoo/odoo.git] / addons / account_analytic_analysis / account_analytic_analysis_view.xml
index 9f81735..d724913 100644 (file)
-<terp>
-       <data>
-               
-               #---------------------------------------------------------------------------------------------------------
-               #  Analytic Account form 
-               #---------------------------------------------------------------------------------------------------------
-               
-               # Remove information on Account data => because they move on analysis sheet
-               # --------------------------------------------------------------------------
-                       # create a page with invoicing informations
-                       # --------------------------------------------------------------------------
-                       <record model="ir.ui.view" id="hr_timesheet.account_analytic_account_form_form">
-                               <field name="name">account.analytic.account.invoice.form.inherit</field> 
-                               <field name="model">account.analytic.account</field> 
-                               <field name="type">form</field> 
-                               <field name="inherit_id" ref="account.view_account_analytic_account_form" /> 
-                               <field name="priority" eval="18"/>
-                               <field name="arch" type="xml">
-                                       <notebook position="inside">
-                                               <page string="Analysis summary">
-                                                       <separator string="Work done stats" colspan="4" /> 
-                                                       <field name="total_cost"/>
-                                                       <field name="remaining_ca"/>
-                                                       <field name="ca_invoiced"/>
-                                                       <field name="ca_theorical"/>
-                                                       <newline/>
-                                                       <!-- <field name="old"/> -->
-                                                       <field name="hours_quantity"/>
-                                                       <field name="hours_qtt_invoiced"/>
-                                                       <field name="remaining_hours"/>
-                                                       <newline/>
-                                                       <separator string="Analysis stats" colspan="4" /> 
-                                                       <field name="revenue_per_hour"/>
-                                                       <field name="real_margin"/>
-                                                       <field name="theorical_margin"/>
-                                                       <field name="real_margin_rate"/>
-                                                       <separator string="Key dates" colspan="4" /> 
-                                                       <field name="last_invoice_date"/> 
-                                                       <field name="last_worked_invoiced_date" select="2"/>
-                                                       <field name="last_worked_date"/>
-                                                       <separator string="To be invoiced" colspan="4" />
-                                                       <field name="hours_qtt_non_invoiced"/>
-                                                       <field name="ca_to_invoice" select="2"/>
-                                                       
-                                               </page>
-                                               <page string="Stats by month">  
-                                                       <field name="month_ids" colspan="4" nolabel="1">
-                                                               <tree string="Month">
-                                                                       <field name="name"/>
-                                                                       <field name="unit_amount" widget="float_time"/>
-                                                               </tree>
-                                                       </field>
-                                               </page>
-                                               <page string="Stats by user"> 
-                                                       <field name="user_ids" colspan="4" nolabel="1">
-                                                               <tree string="User">
-                                                                       <field name="name"/>
-                                                                       <field name="unit_amount" widget="float_time"/>
-                                                               </tree>
-                                                       </field>
-                                               </page>
-                                       </notebook> 
-                               </field>
-                       </record>
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
 
-               #---------------------------------------------------------------------------------------------------------
-               #  Add information on Account analytic list for the project management
-               #---------------------------------------------------------------------------------------------------------
-               <record model="ir.ui.view" id="view_account_analytic_account_tree_c2c_2">
-                       <field name="name">account.analytic.account.tree</field>
-                       <field name="model">account.analytic.account</field>
-                       <field name="inherit_id" ref="account.view_account_analytic_account_list" />
-                       <field name="type">tree</field>
-                       <field name="arch" type="xml">
-                                       <field name="quantity" position="replace">
-                                               <field name="hours_quantity"/>
-                                               <field name="hours_qtt_non_invoiced"/>
-                                               <field name="remaining_hours"/>
-                                       </field>
-                       </field>
-               </record>
-               <record model="ir.ui.view" id="view_account_analytic_account_tree_c2c_3"> 
-                       <field name="name">account.analytic.account.tree</field> 
-                       <field name="model">account.analytic.account</field> 
-                       <field name="inherit_id" ref="account.view_account_analytic_account_list" /> 
-                       <field name="type">tree</field> 
-                       <field name="arch" type="xml"> 
-                               <field name="date" position="before"> 
-                                       <field name="last_invoice_date"/> 
-                                       <field name="ca_to_invoice"/>
-                               </field> 
-                       </field> 
-               </record>
+        <!--
+        Analytic Account form
+        -->
 
-               <record model="ir.ui.view" id="view_account_analytic_simplified">
-                       <field name="name">account.analytic.account.simplified.tree</field>
-                       <field name="model">account.analytic.account</field>
-                       <field name="type">tree</field>
-                       <field name="priority" eval="20"/>
-                       <field name="arch" type="xml">
-                               <tree string="Analytic accounts">
-                                       <field name="code"/>
-                                       <field name="complete_name"/>
-                                       <field name="hours_qtt_non_invoiced"/>
-                                       <field name="remaining_hours"/>
-                                       <field name="ca_to_invoice"/>
-                                       <field name="last_invoice_date"/> 
-                               </tree>
-                       </field>
-               </record>
 
-       </data>
-</terp>
+        <act_window
+            id="action_sales_order_line"
+            name="Sales Order Lines"
+            res_model="sale.order.line"
+            src_model="account.analytic.account"
+            />
+            
+        <record id="hr_timesheet.account_analytic_account_form_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.invoice.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//field[@name="type"]' position='after'>
+                    <field name="template_id" on_change="on_change_template(template_id)"  domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                </xpath>
+                <xpath expr='//field[@name="date"]' position="after">
+                    <group col="6" colspan="2" class="oe_form_group_label_border">
+                        <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
+                    </group>
+                </xpath>
+                <xpath expr='//group[@name="toinvoice"]' position='before'>
+                    <separator colspan="4" string="Invoicing" name="invoicing"/>
+                    <group colspan="4" col="6">
+                        <!-- header -->
+                        <div class="oe_field_label" colspan="2"/>
+                        <group colspan="4" col="6">
+                            <div class="oe_field_label_bold">Est.Tot</div>
+                            <div class="oe_field_label_bold">Invoiced</div>
+                            <div class="oe_field_label_bold">Remaining</div>
+                            <div class="oe_field_label_bold">To Invoice</div>
+                            <div class="oe_btn_width_small"/>
+                            <div class="oe_btn_width"/>
+                        </group>
+                        
+                        <!-- center -->
+                        
+                        <field class="oe_field_label" name="fix_price_invoices" />
+                        <group colspan="4" col="6" attrs="{'invisible': [('fix_price_invoices','=',False)]}">
+                            <field class="oe_float_field" name="amount_max" nolabel="1"   />
+                            <field class="oe_float_field" name="ca_invoiced" nolabel="1"   />
+                            <field class="oe_float_field" name="remaining_ca" nolabel="1"   />
+                            <field class="oe_float_field" name="ca_to_invoice" nolabel="1"   />
+                            <div><button class="oe_btn_width_small" icon="terp-check" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
+                            <div><button class="oe_btn_width" icon="terp-dolar_ok!" name="%(sale.action_order_line_tree2)d" string="Lines To Invoice" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}"/></div>
+                        </group>
+                        
+                        <field class="oe_field_label" name="invoice_on_timesheets"/>
+                         <group colspan="4" col="6" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                            <field class="oe_float_field" name="hours_qtt_est" nolabel="1" />
+                            <field class="oe_float_field" name="hours_qtt_invoiced" nolabel="1"/>
+                            <field class="oe_float_field" name="remaining_hours" nolabel="1" />
+                            <field class="oe_float_field" name="hours_qtt_non_invoiced" nolabel="1" />
+                            <div><button class="oe_btn_width_small" icon="terp-go-week" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" /></div>
+                            <div><button class="oe_btn_width" icon="terp-dolar" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action"/></div>
+                        </group>
+                        
+                        <!-- footer -->
+                        
+                        <div name="total" class="oe_field_label" style="max-width:200px;" colspan="2">Total  </div>
+                        <group colspan="4" col="6" >
+                            <field name="est_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="invoiced_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="remaining_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <field name="toinvoice_total" nolabel="1" class="oe_float_field oe_border_top"/>
+                            <div class="oe_btn_width_small"/>
+                            <div class="oe_btn_width"/>
+                        </group>
+                      </group>
+                 </xpath>
+            </field>
+        </record>
+
+        <!-- Add information on Account analytic list for the project management -->
+        <record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view">
+            <field name="name">account.analytic.account.tree</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="quantity" position="replace">
+                    <field name="hours_quantity"/>
+                    <field name="hours_qtt_non_invoiced"/>
+                    <field name="remaining_hours"/>
+                    <field name="quantity_max"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_account_tree_c2c_3" model="ir.ui.view">
+            <field name="name">account.analytic.account.tree</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <field name="date" position="before">
+                    <field name="last_invoice_date"/>
+                    <field name="ca_to_invoice"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="template_of_contract_action" model="ir.actions.act_window">
+            <field name="name">Template of Contract</field>
+            <field name="type">ir.actions.act_window</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">[('type','=','template')]</field>
+            <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+        </record>
+        <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config" />
+    </data>
+</openerp>