Odoo Addons (MOVED TO GITHUB)

Merge lp:~camptocamp/openobject-addons/7.0-fix-1223922-yvr into lp:openobject-addons/7.0

  1. 7.0-fix-1223922-yvr
  2. Merge into 7.0
Proposed by Yannick Vaucher @ Camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/7.0-fix-1223922-yvr
Merge into: lp:openobject-addons/7.0
Diff against target: 30 lines (+3/-3)
1 file modified
account/account_invoice_view.xml (+3/-3)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/7.0-fix-1223922-yvr
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+185097@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

9433. By Yannick Vaucher @ Camptocamp

[FIX] account - domain of analytic_account_id in invoice lines to hide closed and cancelled accounts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2013-09-03 12:59:00 +0000
+++ account/account_invoice_view.xml 2013-09-11 16:27:46 +0000
@@ -61,7 +61,7 @@
61 <group>61 <group>
62 <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>62 <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
63 <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>63 <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
64 <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>64 <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('state','not in',('close','cancelled'))]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
65 <field name="company_id" groups="base.group_multi_company" readonly="1"/>65 <field name="company_id" groups="base.group_multi_company" readonly="1"/>
66 </group>66 </group>
67 </group>67 </group>
@@ -200,7 +200,7 @@
200 domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '=', 'other')]"200 domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '=', 'other')]"
201 on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>201 on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
202 <field name="account_analytic_id" groups="analytic.group_analytic_accounting"202 <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
203 domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>203 domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('state','not in',('close','cancelled'))]"/>
204 <field name="quantity"/>204 <field name="quantity"/>
205 <field name="uos_id" groups="product.group_uom"205 <field name="uos_id" groups="product.group_uom"
206 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>206 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
@@ -356,7 +356,7 @@
356 domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '=', 'other')]"356 domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '=', 'other')]"
357 on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>357 on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
358 <field name="account_analytic_id" groups="analytic.group_analytic_accounting"358 <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
359 domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>359 domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('state','not in',('close','cancelled'))]"/>
360 <field name="quantity"/>360 <field name="quantity"/>
361 <field name="uos_id" groups="product.group_uom"361 <field name="uos_id" groups="product.group_uom"
362 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>362 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>