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

[MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr_timesheet_invoice-topbar-tpa

Browse Source 
bzr revid: apa@tinyerp.com-20120430090024-w6voc0n9wovrytxy
This commit is contained in:
Amit Patel (OpenERP)
2012-04-30 14:30:24 +05:30
parent a68dfe914e efccfbc143
commit a73f91f44a
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/project/project_view.xml
+3 -1
View File
@@ -80,7 +80,8 @@
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic account">
<form layout="manual">
<sheet string="Analytic account" layout="auto">
<group colspan="4" col="6">
<field name="name" colspan="4"/>
<field name="code"/>
@@ -106,6 +107,7 @@
<field colspan="4" name="description" nolabel="1"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+11 -8
View File
@@ -21,16 +21,19 @@
<separator colspan="4" string="Invoicing Statistics"/>
<field name="amount_invoiced"/>
</group>
<separator colspan="4"/>
<group col="9" colspan="8">
<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"/>
</group>
<xpath expr="/form/sheet" position='before'>
<div class="oe_form_topbar">
<button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
<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>
<button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
<div class="oe_right">
<field name="state" readonly="1" widget="statusbar" nolabel="1"
statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
</div>
</div>
</xpath>
</field>
</record>