[MERGE] addons 16 survey
[odoo/odoo.git] / addons / account_analytic_analysis / account_analytic_analysis_view.xml
index e790467..fd32edb 100644 (file)
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="40" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//field[@name="name"]' position="after" version="7.0">
-                        <h4>
-                            <label for="date_start" string="Start Date"/>
-                        </h4>
-                        <div>
-                            <h3>
-                                <field name="date_start" class="oe_inline"/>
-                            </h3>
-                        </div>
-                </xpath>
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
                     <separator name="toinvoice" string="Invoicing"/>
                     <table class="oe_form_analytic_account">
                         <tr>
-                            <th class="oe_grey" width="160px"></th>
-                            <th class="oe_grey" width="25px"></th>
-                            <th class="oe_grey" width="100px"><label string="Expected"/></th>
-                            <th class="oe_grey" width="100px"><label string="Invoiced"/></th>
-                            <th class="oe_grey" width="100px"><label string="Remaining"/></th>
-                            <th class="oe_grey" width="100px"><label string="To Invoice"/></th>
+                            <th class="oe_timesheet_grey" width="160px"></th>
+                            <th class="oe_timesheet_grey" width="25px"></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Expected"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Invoiced"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Remaining"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="To Invoice"/></th>
                             <th width="30px"></th>
                             <th></th>
                         </tr><tr>
-                            <td class="oe_grey">
+                            <td class="oe_timesheet_grey">
                                 <label for="fix_price_invoices"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
                                 <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                                 <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="open_sale_order_lines"
-                                    class="oe_link oe_e"
-                                    string="/" type="object"
-                                    context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"
-                                    attrs="{'invisible': [('fix_price_to_invoice','=',0)]}"/>
-                            </td><td>
+                            </td><td attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
+                                <span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="open_sale_order_lines"
+                                        class="oe_link"
+                                        string="⇒ Invoice" type="object"
+                                        context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"/>
+                                    or view
+                                </span>
+
+                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    No order to invoice, create
+                                </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
-                                    attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                                    />
                             </td>
                         </tr><tr>
-                            <td class="oe_grey">
+                            <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                                 <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d"
-                                    type="action"
-                                    class="oe_link oe_e"
-                                    string="/"
-                                    attrs="{'invisible': [('ca_to_invoice','=',0.0)]}"/>
+                            </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                                <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
+                                        type="action"
+                                        class="oe_link"
+                                        string="⇒ Invoice"/>
+                                    or view 
+                                </span>
+                                <span attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    Nothing to invoice, create 
+                                </span>
 
-                            </td><td>
                                 <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
                                     string="Timesheets" type="action"
                                     class="oe_link"
-                                    attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"
                                     context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                             </td>
                         </tr><tr name='total'>
-                            <th class="oe_grey">
+                            <th class="oe_timesheet_grey">
                                 <label string="Total"/>
-                            </th><td class="oe_grey">
-                            </td><td class="oe_grey">
+                            </th><td class="oe_timesheet_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoiced_total" class="oe_inline"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="remaining_total" class="oe_inline"/>
-                            </td><td class="oe_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
                         </tr>
                     </table>
                     <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
-                        <field name="pricelist_id"
-                            class="oe_inline"
-                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice"
-                            class="oe_inline"
-                            widget="selection"
-                            attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        <p class="oe_grey oe_edit_only" colspan="2">
+                            When invoicing on timesheet, OpenERP uses the
+                            pricelist of the contract which uses the price
+                            defined on the product related to each employee to
+                            define the customer invoice price rate.
+                        </p>
+                        <group>
+                            <field name="pricelist_id"
+                                class="oe_inline"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                            <field name="to_invoice"
+                                class="oe_inline"
+                                widget="selection"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        </group>
                     </group>
                  </xpath>
             </field>
             <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
-                    Click here to create a Template of contract.
+                    Click here to create a template of contract.
                 </p><p>
                     Templates are used to prefigure contract/project that 
-                    can be selected by the salespoeple to create their customer 
-                    contract/project from the menu Sales/Contracts.
+                    can be selected by the salespeople to quickly configure the
+                    terms and conditions of the contract.
                 </p>
             </field>