[ADD] analytic_contract_hr_expense: split of features of account_analytic_analysis...
[odoo/odoo.git] / addons / account_analytic_analysis / account_analytic_analysis_view.xml
index 79afea7..bf45121 100644 (file)
@@ -4,30 +4,9 @@
 
         <!--
         Analytic Account form
+        -->
+
 
-        Remove information on Account data => because they move on analysis sheet
-        create a page with invoicing informations
-       
-        <record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
-            <field name="name">account.analytic.account.invoice.stat.form.inherit</field>
-            <field name="model">account.analytic.account</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <group name="invoice_stats" position="inside">
-                    <field name="hours_qtt_non_invoiced" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <field name="ca_to_invoice" attrs="{'invisible': [('to_invoice','=',0)]}"/>
-                    <label string="" colspan="1"/>
-                    <button
-                        name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                        string="Create Invoice"
-                        type="action"
-                        attrs="{'readonly':[('ca_to_invoice','=',0.0)], 'invisible': [('to_invoice','=',0)]}"
-                        icon="gtk-go-forward"/>
-                </group>
-            </field>
-        </record> -->
         <act_window
             id="action_sales_order_line"
             name="Sales Order Lines"
             <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="parent_id"]' 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='//group[@name="project"]' position="after">
-                    <group col="6" colspan="3" class="oe_form_group_label_border">
+                <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='//separator[@name="description"]' position='before'>
-                   <separator colspan="4" string="Invoicing" name="invoicing"/>
-                   <group col="1" colspan="4">
-                       <table border="0">
-                           <tr>
-                               <th class="oe_th_137px" height="20px"></th>
-                               <th width="10px"></th>
-                               <th class="oe_th_110px">Est.Tot</th>
-                               <th class="oe_th_110px">Invoiced</th>
-                               <th class="oe_th_110px">Remaining</th>
-                               <th class="oe_th_110px">Ready To Invoice</th>
-                               <th width="10px"></th>
-                               <th class="oe_th_150px"></th>
-                               <th class="oe_th_150px"></th>
-                           </tr>
-                           <tr>
-                               <th class="oe_border_right">Fix Price Invoices</th>
-                               <td><field name="fix_price_invoices" nolabel="1"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td width="10px"></td>
-                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               <td class="oe_th_150px"><button class= "oe_btn_width" 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}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                           </tr>
-                           <tr>
-                               <th class="oe_border_right">Invoice On Timesheets</th>
-                               <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td width="10px"></td>
-                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                           </tr>
-                           <tr>
-                               <th class="oe_border_right">Charge Expenses</th>
-                               <td><field name="charge_expenses" nolabel="1"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                               <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                               <td width="10px"></td>
-                               <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                               <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                           </tr>
-                           <tr>
-                               <th class="oe_border_right">Total</th>
-                               <td width="10px"></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-                               <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-                           </tr>
-                       </table>
-                   </group>
-                   <group colspan="4" class="oe_form_group_label_border">
-                               <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
-                           <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                   </group>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="project_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">project.project.form.inherit</field>
-            <field name="model">project.project</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-               <xpath expr='//page[@name="team"]' position='after'>
-                   <page string="Contract Data">
-                        <group colspan="2" col= "2" class="oe_form_group_label_border">
-                            <separator colspan="2" string="Validity"/>
-                            <field name="date_start"/>
-                            <field name="date"/>
-                        </group>
-                       <group colspan="2" col= "2" class="oe_form_group_label_border">
-                            <separator colspan="2" string="Invoice Rate"/>
-                            <field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','=',0),('charge_expenses','=',0)]}"/>
-                           <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                        </group> 
-                       <group col="6" colspan="2" class="oe_form_group_label_border">
-                            <field name="quantity_max"/><field name="company_uom_id" nolabel="1" readonly="1"/><field name="remaining_hours" string="/ Remaining"/>
-                        </group>
-                       <separator colspan="4" string="Invoicing"/>
-                       <group col="1" colspan="4">
-                           <table border="0">
-                               <tr>
-                                   <th class="oe_th_137px" height="20px"></th>
-                                   <th width="10px"></th>
-                                   <th class="oe_th_110px">Est.Tot</th>
-                                   <th class="oe_th_110px">Invoiced</th>
-                                   <th class="oe_th_110px">Remaining</th>
-                                   <th class="oe_th_110px">Ready To Invoice</th>
-                                   <th width="10px"></th>
-                                   <th class="oe_th_150px"></th>
-                                   <th class="oe_th_150px"></th>
-                               </tr>
-                               <tr>
-                                   <th class="oe_border_right">Fix Price Invoices</th>
-                                   <td><field name="fix_price_invoices" nolabel="1"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                                   <td width="10px"></td>
-                                   <td class="oe_th_150px"><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                                   <td class="oe_th_150px"><button class= "oe_btn_width" 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}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
-                               </tr>
-                               <tr>
-                                   <th class="oe_border_right">Inv. On Timesheets</th>
-                                   <td><field name="invoice_on_timesheets" nolabel="1"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="quantity_max" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                                   <td width="10px"></td>
-                                   <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                                   <td class="oe_th_150px"><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
-                               </tr>
-                               <tr>
-                                   <th class="oe_border_right">Charge Expenses</th>
-                                   <td><field name="charge_expenses" nolabel="1"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="expense_max" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="expense_invoiced" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_right"><field name="remaining_expense" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                                   <td class="oe_amount_center oe_th_110px"><field name="expense_to_invoice" nolabel="1" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                                   <td width="10px"></td>
-                                   <td class="oe_th_150px"><button class= "oe_btn_width" name="open_hr_expense" string="Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                                   <td class="oe_th_150px"><button class= "oe_btn_width" name="hr_to_invoiced_expense" string="Invoice Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',0)]}"/></td>
-                               </tr>
-                               <tr>
-                                   <th class="oe_border_right">Total</th>
-                                   <td width="10px"></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
-                                   <td class="oe_amount_center oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
-                               </tr>
-                           </table>
-                       </group>
-                   <separator string="Terms and Condition" colspan="4"/>
-                    <field colspan="4" name="description" nolabel="1"/>
-                    </page>
+                <xpath expr='//field[@name="pricelist_id"]' position='before'>
+                    <separator colspan="4" string="Invoicing" name="invoicing"/>
+                    <table border="0" colspan="4">
+                        <tr>
+                           <th class="oe_th_160px" height="20px"></th>
+                           <th width="10px"></th>
+                           <th class="oe_th_110px">Est.Tot</th>
+                           <th class="oe_th_110px">Invoiced</th>
+                           <th class="oe_th_110px">Remaining</th>
+                           <th class="oe_th_110px">Ready To Invoice</th>
+                           <th width="10px"></th>
+                           <th></th>
+                           <th></th>
+                        </tr>
+                        <tr>
+                           <th class="oe_border_right">Fix Price Invoices</th>
+                           <td><field name="fix_price_invoices" nolabel="1"/></td>
+                           <td><field class="oe_th_110px" name="amount_max" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                           <td class="oe_th_110px"><field name="ca_invoiced" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                           <td class="oe_th_110px oe_border_right"><field name="remaining_ca" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                           <td class="oe_th_110px"><field name="ca_to_invoice" nolabel="1" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                           <td width="10px"></td>
+                           <td><button class= "oe_btn_width" name="%(action_sales_order_line)d" string="Sales" type="action" context="{'default_project_id': active_id,'search_default_project_id': active_id}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                           <td><button class= "oe_btn_width" 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}" attrs="{'invisible': [('fix_price_invoices','=',0)]}"/></td>
+                        </tr>
+                        <tr>
+                           <th class="oe_border_right">Invoice On Timesheets</th>
+                           <td><field name="invoice_on_timesheets" nolabel="1"/></td>
+                           <td><field class="oe_th_110px" name="hours_qtt_est" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                           <td class="oe_th_110px"><field name="hours_qtt_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                           <td class="oe_th_110px oe_border_right"><field name="remaining_hours" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                           <td class="oe_th_110px"><field name="hours_qtt_non_invoiced" nolabel="1" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                           <td width="10px"></td>
+                           <td><button class= "oe_btn_width" name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                           <td><button class= "oe_btn_width" name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Invoice Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/></td>
+                        </tr>
+                        <div name="end_of_tabl_hook"/>
+                        <tr>
+                           <th class="oe_border_right">Total</th>
+                           <td width="10px"></td>
+                           <td class="oe_th_110px oe_border_top"><field name="est_total" nolabel="1"/></td>
+                           <td class="oe_th_110px oe_border_top"><field name="invoiced_total" nolabel="1"/></td>
+                           <td class="oe_th_110px oe_border_right oe_border_top"><field name="remaining_total" nolabel="1"/></td>
+                           <td class="oe_th_110px oe_border_top"><field name="toinvoice_total" nolabel="1"/></td>
+                        </tr>
+                    </table>
                 </xpath>
             </field>
         </record>
         </record>
         
         <record id="template_of_contract_action" model="ir.actions.act_window">
-            <field name="name">Template Of Contract</field>
+            <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>