[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-budget-bde

bzr revid: atp@tinyerp.com-20120626101318-w25gqdeb0i5fhg63
This commit is contained in:
Atul Patel (OpenERP) 2012-06-26 15:43:18 +05:30
commit 11911ed061
1 changed files with 55 additions and 37 deletions

View File

@ -117,14 +117,24 @@
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
<sheet string="Budget">
<group col="4">
<group>
<group>
<field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="date_to" attrs="{'readonly':[('state','!=','draft')]}"/>
</group>
<group>
<field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<label for="date_from" string="Duration"/>
<div>
<field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> -
<field name="date_to" attrs="{'readonly':[('state','!=','draft')]}" nolabel="1"/>
</div>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
</group>
<notebook>
<page string="Budget Lines">
<field name="crossovered_budget_line" colspan="4" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
<tree string="Budget Lines">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
@ -138,18 +148,26 @@
<field name="percentage"/>
</tree>
<form string="Budget Lines" version="7.0">
<group col="4">
<group>
<group>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="general_budget_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
<field name="planned_amount"/>
<label for="date_from" string="Duration"/>
<div>
<field name="date_from"/>-
<field name="date_to"/>
</div>
</group>
<group>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="paid_date"/>
</group>
</group>
</form>
</field>
</group>
</page>
</notebook>
</sheet>
</form>
</field>