odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]: IMprovement in view. duration field also. 

bzr revid: atp@tinyerp.com-20120705124233-6jchsxi9m6pvqvtr
This commit is contained in:
Atul Patel (OpenERP) 2012-07-05 18:12:33 +05:30
parent fa3100073a
commit 0347a93cda
8 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/account/account_invoice_view.xml
View File

@ -51,7 +51,7 @@
<field name="arch" type="xml">
<form string="Invoice Line" version="7.0">
<group>
<group>
<group>
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
<field name="name"/>
<label string="Quantity" for="quantity" align="1.0"/>
@ -190,7 +190,7 @@
<field name="fiscal_position" widget="selection"/>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
groups="account.group_account_user"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
name="account_id" groups="account.group_account_user"/>
<field name="currency_id"/>
<field name="type" invisible="1"/>
@ -227,10 +227,10 @@
<field name="factor_tax" invisible="True"/>
</tree>
</field>
<button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
</div>
<group class="oe_subtotal_footer">
<field name="amount_untaxed"/>
<button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px"/>
@ -363,6 +363,7 @@
</div>
<group class="oe_subtotal_footer">
<field name="amount_untaxed"/>
<button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/>

4
addons/account_budget/account_budget_view.xml
View File

@ -156,9 +156,9 @@
<field name="planned_amount"/>
<label for="date_from" string="Duration"/>
<div>
<field name="date_from"/>
<field name="date_from" class="oe_inline"/>
<span attrs="{'invisible':[('date_to','=',False)]}" class="oe_inline"> - </span>
<field name="date_to"/>
<field name="date_to" class="oe_inline"/>
</div>
</group>
<group>

4
addons/account_payment/account_payment_view.xml
View File

@ -334,9 +334,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='import_buttons']" position="inside">
<xpath expr="//button[@string='Import Invoices']" position="before">
<button name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="gtk-execute"/>
</xpath>
</xpath>
</field>
</record>

25
addons/account_voucher/account_voucher_view.xml
View File

@ -85,23 +85,22 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
<group>
<group>
<field name="narration" colspan="2" nolabel="1" placeholder="Add an internal note"/>
</group>
<group attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" class="oe_subtotal_footer oe_right">
<group>
<group>
<field name="narration" colspan="2" nolabel="1" placeholder="Add an internal note"/>
</group>
<group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}" >
<group>
<field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
<label for="tax_id"/>
<field name="tax_id" nolabel="1" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
<button type="object" colspan="2" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
</group>
<group>
<field name="amount_untaxed" readonly="1"/>
<field name="tax_amount" readonly="1"/>
<field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
<field name="amount_untaxed"/>
<field name="tax_amount" readonly="1" />
<field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
</group>
</group>
<group>
<button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
</group>
</group>
</group>
</page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

28
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -131,23 +131,21 @@
<field name="narration" placeholder="Add a internal note." nolabel="1" />
</group>
<group class="oe_subtotal_footer oe_right">
<group>
<field name="tax_id"
on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
widget="selection"
domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
</group>
<group>
<field name="amount_untaxed"/>
<field name="tax_amount" readonly="1"/>
<field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
<group>
<label for="tax_id"/>
<field name="tax_id"
on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
widget="selection"
nolabel="1"
domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
<button type="object" colspan="2" name="compute_tax" icon="terp-stock_format-scientific" string="Compute Tax" class="oe_inline oe_left" attrs="{'invisible': [('state','!=','draft')]}"/>
</group>
<group>
<field name="amount_untaxed"/>
<field name="tax_amount" readonly="1" />
<field name="amount" class="oe_subtotal_footer_separator" readonly="1"/>
</group>
</group>
<group>
<button type="object"
icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax"
attrs="{'invisible': [('state','!=','draft')]}"/>
</group>
</group>
</page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">

2
addons/analytic_contract_project/analytic_contract_project_view.xml
View File

@ -15,7 +15,7 @@
<group string="Validity">
<label for="date_start" string="Duration"/>
<div name="duration">
<field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
<field name="date_start" class="oe_inline"/> <span attrs="{'invisible':[('date','=',False)]}" class="oe_inline"> - </span> <field name="date" class="oe_inline"/>
</div>
<label for="quantity_max"/>
<div>

4
addons/l10n_ch/wizard/bvr_import_view.xml
View File

@ -34,9 +34,9 @@
<field name="name">account.bank.statement.form.inherit</field>
<field name="model">account.bank.statement</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="inherit_id" ref="account_payment.view_bank_statement_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='import_buttons']" position="inside">
<xpath expr="//button[@string='Import Invoices']" position="after">
<button name="%(wizard_bvr_import)d" icon="gtk-execute" string="Import BVR" type="action"/>
</xpath>
</field>

2
addons/point_of_sale/account_statement_view.xml
View File

@ -105,7 +105,7 @@
<field name="inherit_id" ref="account.view_cash_statement_tree"/>
<field name="arch" type="xml">
<field name="journal_id" position="after">
<field name="user_id"/>
<field name="user_id" string="Responsible"/>
</field>
</field>
</record>