Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-budget-bde into
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-budget-bde/+merge/112014
Hello Sir,
I have improved the view of account_budget module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-budget-bde/+merge/112014
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp-budget-bde into
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2012-06-19 05:01:00 +0000
+++ account_budget/account_budget_view.xml 2012-06-26 07:19:21 +0000
@@ -108,48 +108,66 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form version="7.0">
- <header>
- <button string="Confirm" name="confirm" states="draft" type="workflow" />
- <button string="Approve" name="validate" states="confirm" type="workflow"/>
- <button string="Done" name="done" states="validate" type="workflow" />
- <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
- <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
- <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
- </header>
- <sheet string="Budget">
- <group col="4">
- <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')]}"/>
- <field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <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"/>
- <field name="general_budget_id"/>
- <field name="date_from"/>
- <field name="date_to"/>
- <field name="paid_date"/>
- <field name="planned_amount" sum="Planned Amount"/>
- <field name="practical_amount" sum="Practical Amount"/>
- <field name="theoritical_amount" sum="Theoretical Amount"/>
- <field name="percentage"/>
- </tree>
- <form string="Budget Lines" version="7.0">
- <group col="4">
+ <header>
+ <button string="Confirm" name="confirm" states="draft" type="workflow" />
+ <button string="Approve" name="validate" states="confirm" type="workflow"/>
+ <button string="Done" name="done" states="validate" type="workflow" />
+ <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+ <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
+ </header>
+ <sheet string="Budget">
+ <group col="4">
+ <group>
+ <field name="name" 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')]}"/>
+ </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"/>
<field name="general_budget_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
- <field name="planned_amount"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- </group>
- </form>
- </field>
- </group>
+ <field name="planned_amount" sum="Planned Amount"/>
+ <field name="practical_amount" sum="Practical Amount"/>
+ <field name="theoritical_amount" sum="Theoretical Amount"/>
+ <field name="percentage"/>
+ </tree>
+ <form string="Budget Lines" version="7.0">
+ <group col="4">
+ <group>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+ <field name="general_budget_id"/>
+ <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>
+ </page>
+ </notebook>
</sheet>
</form>
</field>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
