[FIX]account id - domain must check for <> view and consolidation and matching company_id
bzr revid: ara@tinyerp.com-20110215094410-i9g2eowwutv1cr9v
This commit is contained in:
parent
53f3efc796
commit
c23e5e4135
|
@ -572,7 +572,7 @@
|
||||||
<field name="ref"/>
|
<field name="ref"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||||
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
||||||
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
|
<field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
|
||||||
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
|
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
|
||||||
<field name="amount"/>
|
<field name="amount"/>
|
||||||
</tree>
|
</tree>
|
||||||
|
@ -582,7 +582,7 @@
|
||||||
<field name="ref"/>
|
<field name="ref"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||||
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
||||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/>
|
<field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
|
||||||
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
|
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]"/>
|
||||||
<field name="amount"/>
|
<field name="amount"/>
|
||||||
<field name="sequence" readonly="0"/>
|
<field name="sequence" readonly="0"/>
|
||||||
|
@ -1013,7 +1013,7 @@
|
||||||
<field name="invoice"/>
|
<field name="invoice"/>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
|
||||||
<field name="account_id" domain="[('journal_id','=',journal_id)]"/>
|
<field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
|
||||||
<field name="journal_id"/>
|
<field name="journal_id"/>
|
||||||
<field name="debit" sum="Total debit"/>
|
<field name="debit" sum="Total debit"/>
|
||||||
<field name="credit" sum="Total credit"/>
|
<field name="credit" sum="Total credit"/>
|
||||||
|
@ -1048,7 +1048,7 @@
|
||||||
<page string="Information">
|
<page string="Information">
|
||||||
<group col="2" colspan="2">
|
<group col="2" colspan="2">
|
||||||
<separator colspan="2" string="Amount"/>
|
<separator colspan="2" string="Amount"/>
|
||||||
<field name="account_id" select="1" domain="[('company_id', '=', company_id),('type','<>','view'),('type','<>','consolidation')]"/>
|
<field name="account_id" select="1" domain="[('company_id', '=', company_id), ('type','<>','view'), ('type','<>','consolidation')]"/>
|
||||||
<field name="debit"/>
|
<field name="debit"/>
|
||||||
<field name="credit"/>
|
<field name="credit"/>
|
||||||
<field name="quantity"/>
|
<field name="quantity"/>
|
||||||
|
@ -1122,7 +1122,7 @@
|
||||||
<field name="date"/>
|
<field name="date"/>
|
||||||
<field name="journal_id" readonly="False" select="1"/>
|
<field name="journal_id" readonly="False" select="1"/>
|
||||||
<field name="period_id" readonly="False"/>
|
<field name="period_id" readonly="False"/>
|
||||||
<field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
<field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation'),('company_id', '=', company_id)]"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
|
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
|
||||||
<newline/>
|
<newline/>
|
||||||
<field name="debit"/>
|
<field name="debit"/>
|
||||||
|
@ -1405,7 +1405,7 @@
|
||||||
<field name="invoice"/>
|
<field name="invoice"/>
|
||||||
<field name="name"/>
|
<field name="name"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
|
||||||
<field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
|
<field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
|
||||||
<field name="date_maturity"/>
|
<field name="date_maturity"/>
|
||||||
<field name="debit" sum="Total Debit"/>
|
<field name="debit" sum="Total Debit"/>
|
||||||
<field name="credit" sum="Total Credit"/>
|
<field name="credit" sum="Total Credit"/>
|
||||||
|
@ -2576,7 +2576,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
|
||||||
<field name="ref"/>
|
<field name="ref"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||||
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
||||||
<field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
|
<field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
|
||||||
<field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]" groups="analytic.group_analytic_accounting" />
|
<field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]" groups="analytic.group_analytic_accounting" />
|
||||||
<field name="amount"/>
|
<field name="amount"/>
|
||||||
</tree>
|
</tree>
|
||||||
|
@ -2586,7 +2586,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
|
||||||
<field name="ref"/>
|
<field name="ref"/>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||||
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
<field name="type" on_change="onchange_type(partner_id, type)"/>
|
||||||
<field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id"/>
|
<field domain="[('journal_id', '=', parent.journal_id), ('type', '<>', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
|
||||||
<field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]" groups="analytic.group_analytic_accounting" />
|
<field name="analytic_account_id" domain="[('company_id', '=', parent.company_id), ('type', '<>', 'view')]" groups="analytic.group_analytic_accounting" />
|
||||||
<field name="amount"/>
|
<field name="amount"/>
|
||||||
<field name="sequence"/>
|
<field name="sequence"/>
|
||||||
|
|
Loading…
Reference in New Issue