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

[IMP] Account, purchase, sale, hr_expense: set domain to open analytic accounts (not open root account) 

bzr revid: mra@mra-laptop-20100820041603-rkdf80zf7nk7nua8
This commit is contained in:
Mustufa Rangwala 2010-08-20 09:46:03 +05:30
parent 3c29fc0847
commit bd16462c71
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml">
<tree string="Analytic Defaults">
<field name="sequence"/>
<field name="analytic_id" required="1"/>
<field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
<field name="product_id"/>
<field name="partner_id"/>
<field name="user_id"/>
@ -25,7 +25,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic Defaults">
<field name="analytic_id" required="1"/>
<field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
<field name="sequence"/>
<separator string="Conditions" colspan="4"/>
<field name="product_id"/>

4
addons/account_budget/crossovered_budget_view.xml
View File

@ -85,7 +85,7 @@
</graph>
<tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
@ -96,7 +96,7 @@
</tree>
<form string="Budget Lines">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>

18
addons/account_voucher/voucher_view.xml
View File

@ -45,7 +45,7 @@
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="amount"/>
<field name="ref"/>
<field name="account_analytic_id"/>
<field name="account_analytic_id" domain="[('parent_id','!=',False)]"/>
</tree>
</field>
<group col="2" colspan="3">
@ -108,13 +108,13 @@
<separator orientation="vertical"/>
<field name="number" select='1'/>
<field name="account_id" select="1"/>
<field name="partner_id" select='1'/>
<field name="partner_id" select='1'/>
<field name="date" select='1'/>
</group>
<newline/>
<group col='8' colspan='4'>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
<field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>
<field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Group By..." col='8' colspan='4'>
@ -155,7 +155,7 @@
<newline/>
<group col='8' colspan='4'>
<field name="journal_id" widget="selection" select="1"/>
<field name="period_id" select="1"/>
<field name="period_id" select="1"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
@ -186,7 +186,7 @@
</graph>
</field>
</record>
<!-- Receipt Vouchers -->
<!-- <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">-->
<!-- <field name="name">Sales Receipt</field>-->
@ -255,7 +255,7 @@
<!-- <menuitem action="action_cheque_register" -->
<!-- id="menu_action_cheque_register" -->
<!-- parent="account.menu_finance_receivables"/>-->
<!-- <record id="action_cheque_pay" model="ir.actions.act_window">-->
<!-- <field name="name">Vendor Payment</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
@ -270,7 +270,7 @@
<!-- <menuitem action="action_cheque_pay" -->
<!-- id="menu_action_cheque_pay" -->
<!-- parent="account.menu_finance_payables"/>-->
<!-- <record id="action_cheque_pay_voucher" model="ir.actions.act_window">-->
<!-- <field name="name">Cheques</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
@ -285,7 +285,7 @@
<!-- <menuitem action="action_cheque_pay_voucher" -->
<!-- id="menu_action_cheque_pay_voucher" -->
<!-- parent="account.menu_finance_bank_and_cash"/>-->
<record model="ir.ui.view" id="view_account_journal_form_inherit">
<field name="name">account.journal.form.inherit</field>
<field name="model">account.journal</field>
@ -305,7 +305,7 @@
context="{'journal_id': active_id, 'type':type}"
res_model="account.voucher"
src_model="account.journal"/>
<record model="ir.actions.act_window" id="action_review_voucher_list">
<field name="name">Vouchers Entries</field>
<field name="res_model">account.voucher</field>

4
addons/hr_expense/hr_expense_view.xml
View File

@ -13,7 +13,7 @@
<field name="date_value"/>
<field name="name"/>
<field name="ref"/>
<field domain="[('type','=','normal')]" name="analytic_account" groups="base.group_extended"/>
<field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
<field name="unit_amount"/>
<field name="unit_quantity"/>
<field name="total_amount"/>
@ -89,7 +89,7 @@
<field name="unit_amount"/>
<field name="ref"/>
<field name="sequence" groups="base.group_extended"/>
<field domain="[('type','=','normal')]" name="analytic_account" groups="base.group_extended"/>
<field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
<newline/>
<field name="total_amount"/>
</form>

4
addons/purchase/purchase_view.xml
View File

@ -252,7 +252,7 @@
<field name="date_planned" widget="date"/>
<field name="price_unit"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="account_analytic_id" colspan="4" groups="base.group_extended"/>
<field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
<group colspan="4" col="4" groups="base.group_extended">
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id"
@ -312,7 +312,7 @@
<field name="date_planned" widget="date" readonly="1"/>
<field name="price_unit"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="account_analytic_id" colspan="4" groups="base.group_extended"/>
<field name="account_analytic_id" colspan="4" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
<group colspan="4" col="4" groups="base.group_extended">
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id"

2
addons/sale_crm/wizard/crm_make_sale_view.xml
View File

@ -13,7 +13,7 @@
<group colspan="4">
<field name="partner_id" required="1"/>
<field name="shop_id" required="1" widget="selection"/>
<field name="analytic_account"/>
<field name="analytic_account" domain="[('parent_id','!=',False)]" />
<field name="close" required="1"/>
</group>
<field colspan="4" mode="tree,form,graph" name="sale_order_line" nolabel="1" widget="one2many_list">