pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-add-report-sgo

Browse Source 
bzr revid: apa@tinyerp.com-20120606071321-5j4bcyh49n41yebf
This commit is contained in:
Amit Patel (OpenERP)
2012-06-06 12:43:21 +05:30
parent ea742d6114 48cf6955a7
commit 5dc70e8067
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/account_analytic_analysis_view.xml
+1 -5
View File
@@ -50,7 +50,7 @@
<field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
</group>
</xpath>
<xpath expr='//separator[@name="description"]' position='before'>
<xpath expr='//group[@name="toinvoice"]' position='before'>
<separator colspan="4" string="Invoicing" name="invoicing"/>
<group col="1" colspan="4">
<table border="0">
@@ -108,10 +108,6 @@
</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>
addons/analytic/analytic_view.xml
+1
View File
@@ -28,6 +28,7 @@
<group colspan="2" col="2" name="project" class="oe_form_group_label_border">
<separator colspan="2" string="Project" name="project_sep" invisible="1"/>
</group>
<group name="toinvoice" invisible="1"></group>
<separator string="Terms and Condition" colspan="4" name="description"/>
<field colspan="4" name="description" nolabel="1"/>
</page>
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+6
View File
@@ -7,6 +7,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<xpath expr='//group[@name="toinvoice"]' position='replace'>
<group colspan="4" class="oe_form_group_label_border" name="to_invoice">
<field name="pricelist_id" />
<field name="to_invoice" widget="selection" />
</group>
</xpath>
<xpath expr="/form/sheet" position='before'>
<div class="oe_form_topbar">
<button name="set_pending" string="Pending" type="object" states="open"/>