[IMP] hr_timesheet_invoice: improved color of button based on business flow

[odoo/odoo.git] / addons / hr_timesheet_invoice / hr_timesheet_invoice_view.xml

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 2f5c8d2..e97fcd0 100644 (file)
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -11,26 +11,28 @@
                     <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">
+                    <group 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">
+                    <group name="invoice_stats">
                         <separator colspan="4" string="Invoicing Statistics"/>
                         <field name="amount_invoiced"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group col="9" colspan="8">
+                </group>
+                <xpath expr="/form/sheet" position='before'>
+                    <header>
+                        <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending" class="oe_form_button_active_flow"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,close" class="oe_form_button_return_flow"/>
+                        <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <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>
+                    </header>
+                </xpath>
             </field>
         </record>
 
@@ -40,9 +42,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@string="Invoicing"]' position='after'>
-                    <field name="to_invoice"/>
-                    <field name="invoice_id"/>
+                <xpath expr="//group[@string='Accounting']" position='after'>
+                    <group string="Invoicing">
+                        <field name="to_invoice"/>
+                        <field name="invoice_id"/>
+                    </group>
                 </xpath>
             </field>
         </record>
@@ -54,7 +58,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)" select="1"/>
+                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>
@@ -157,10 +161,12 @@
             <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"/>
-                    <field colspan="1" name="customer_name"/>
-                    <field colspan="2" name="factor"/>
+                <form string="Type of invoicing" version="7.0">
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="customer_name"/>
+                        <field name="factor"/>
+                    </group>
                 </form>
             </field>
         </record>