[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-account-related-bde
bzr revid: atp@tinyerp.com-20120614130139-ottmi5ln5xmlzrn5
This commit is contained in:
commit
6251b899b1
|
@ -1829,27 +1829,28 @@
|
|||
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
|
||||
<field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
|
||||
</header>
|
||||
|
||||
<group>
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="model_id"/>
|
||||
<field name="ref"/>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="model_id"/>
|
||||
<field name="ref"/>
|
||||
</group>
|
||||
<newline/>
|
||||
|
||||
<group string="Starts on">
|
||||
<field name="date_start"/>
|
||||
<field name="period_total"/>
|
||||
</group>
|
||||
|
||||
<group string="Valid Up to">
|
||||
<field name="period_nbr"/>
|
||||
<field name="period_type"/>
|
||||
</group>
|
||||
</group>
|
||||
<newline/>
|
||||
|
||||
<group string="Starts on">
|
||||
<field name="date_start"/>
|
||||
<field name="period_total"/>
|
||||
</group>
|
||||
|
||||
<group string="Valid Up to">
|
||||
<field name="period_nbr"/>
|
||||
<field name="period_type"/>
|
||||
</group>
|
||||
</group>
|
||||
<separator string="Subscription Lines"/>
|
||||
<field name="lines_id" widget="one2many_list"/>
|
||||
<separator string="Subscription Lines"/>
|
||||
<field name="lines_id" widget="one2many_list"/>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -231,19 +231,21 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Budget Lines" version="7.0">
|
||||
<group col="4">
|
||||
<field name="crossovered_budget_id"/>
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="general_budget_id"/>
|
||||
<field name="date_from"/>
|
||||
<field name="date_to"/>
|
||||
<field name="paid_date"/>
|
||||
<field name="planned_amount"/>
|
||||
<field name="practical_amount"/>
|
||||
<field name="theoritical_amount"/>
|
||||
<field name="percentage"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="crossovered_budget_id"/>
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="general_budget_id"/>
|
||||
<field name="date_from"/>
|
||||
<field name="date_to"/>
|
||||
<field name="paid_date"/>
|
||||
<field name="planned_amount"/>
|
||||
<field name="practical_amount"/>
|
||||
<field name="theoritical_amount"/>
|
||||
<field name="percentage"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -241,24 +241,26 @@
|
|||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_account_coda_form">
|
||||
<field name="name">account.coda.form</field>
|
||||
<field name="model">account.coda</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="CODA File" version="7.0">
|
||||
<group col="4">
|
||||
<field name="coda_creation_date"/>
|
||||
<field name="name"/>
|
||||
<field name="coda_data" filename="name"/>
|
||||
<field name="date"/>
|
||||
<field name="user_id"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<separator string="Additional Information"/>
|
||||
<field name="note"/>
|
||||
<field name="statement_ids"/>
|
||||
</form>
|
||||
</field>
|
||||
<field name="name">account.coda.form</field>
|
||||
<field name="model">account.coda</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="CODA File" version="7.0">
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="coda_creation_date"/>
|
||||
<field name="name"/>
|
||||
<field name="coda_data" filename="name"/>
|
||||
<field name="date"/>
|
||||
<field name="user_id"/>
|
||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
<separator string="Additional Information"/>
|
||||
<field name="note"/>
|
||||
<field name="statement_ids"/>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_coda_filter" model="ir.ui.view">
|
||||
|
@ -322,57 +324,59 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="CODA Bank Statement" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="date"/>
|
||||
<field name="coda_bank_account_id"/>
|
||||
<field name="currency"/>
|
||||
<field name="period_id"/>
|
||||
<field name="type"/>
|
||||
<newline/>
|
||||
<field name="balance_start"/>
|
||||
<field name="balance_end_real"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Transactions">
|
||||
<field name="line_ids">
|
||||
<tree string="CODA Statement Lines">
|
||||
<field name="sequence" string="Seq"/>
|
||||
<sheet>
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="date"/>
|
||||
<field name="val_date"/>
|
||||
<field name="ref"/>
|
||||
<field name="name" width="250"/>
|
||||
<field name="coda_bank_account_id"/>
|
||||
<field name="currency"/>
|
||||
<field name="period_id"/>
|
||||
<field name="type"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="account_id"/>
|
||||
<field name="amount"/>
|
||||
<field name="globalisation_amount" string="Glob. Amount"/>
|
||||
<field name="globalisation_id" string="Glob. Id"/>
|
||||
</tree>
|
||||
<form string="CODA Statement Lines" version="7.0">
|
||||
<group col="4">
|
||||
<newline/>
|
||||
<field name="balance_start"/>
|
||||
<field name="balance_end_real"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Transactions">
|
||||
<field name="line_ids">
|
||||
<tree string="CODA Statement Lines">
|
||||
<field name="sequence" string="Seq"/>
|
||||
<field name="date"/>
|
||||
<field name="val_date"/>
|
||||
<field name="name"/>
|
||||
<field name="ref"/>
|
||||
<field name="name" width="250"/>
|
||||
<field name="type"/>
|
||||
<field name="partner_id"/>
|
||||
<field domain="[('type', '<>', 'view')]" name="account_id"/>
|
||||
<field name="account_id"/>
|
||||
<field name="amount"/>
|
||||
<field name="ref"/>
|
||||
<field name="globalisation_amount"/>
|
||||
<field name="globalisation_level"/>
|
||||
<field name="globalisation_id"/>
|
||||
</group>
|
||||
<separator string="Notes"/>
|
||||
<field name="note"/>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
<group colspan="4">
|
||||
<field name="balance_end"/>
|
||||
</group>
|
||||
<field name="globalisation_amount" string="Glob. Amount"/>
|
||||
<field name="globalisation_id" string="Glob. Id"/>
|
||||
</tree>
|
||||
<form string="CODA Statement Lines" version="7.0">
|
||||
<group col="4">
|
||||
<field name="sequence" string="Seq"/>
|
||||
<field name="date"/>
|
||||
<field name="val_date"/>
|
||||
<field name="name"/>
|
||||
<field name="type"/>
|
||||
<field name="partner_id"/>
|
||||
<field domain="[('type', '<>', 'view')]" name="account_id"/>
|
||||
<field name="amount"/>
|
||||
<field name="ref"/>
|
||||
<field name="globalisation_amount"/>
|
||||
<field name="globalisation_level"/>
|
||||
<field name="globalisation_id"/>
|
||||
</group>
|
||||
<separator string="Notes"/>
|
||||
<field name="note"/>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
<group colspan="4">
|
||||
<field name="balance_end"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue