[IMP]improve template type contract view

bzr revid: sgo@tinyerp.com-20130307094613-k36e87pz6v7m7ly2

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 50cdaff..5522e00 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -53,7 +53,7 @@
                                 <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 attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
+                            </td><td attrs="{'invisible': ['|',('fix_price_invoices','=',False),('type','=','template')]}" 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"
@@ -84,7 +84,7 @@
                                 <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 class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                            </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <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"

diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 5628846..6e01076 100644 (file)
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -21,7 +21,7 @@
                             <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td attrs="{'invisible': [('charge_expenses','=',False)]}" class="oe_timesheet_action">
+                        </td><td attrs="{'invisible': ['|',('charge_expenses','=',False),('type','=','template')]}" class="oe_timesheet_action">
                             <span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
                                 <button
                                     name="hr_to_invoice_expense"