Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-729651-ara into lp:openobject-addons

  1. trunk-bug-729651-ara
  2. Merge into trunk
Proposed by Ashvin Rathod (OpenERP)
Status: Merged
Merged at revision: 4523
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-729651-ara
Merge into: lp:openobject-addons
Diff against target: 35 lines (+4/-4)
1 file modified
account/project/project_view.xml (+4/-4)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-729651-ara
Reviewer Review Type Date Requested Status
Mustufa Rangwala (Open ERP) (community) Approve
OpenERP buildbot (community) Disapprove
Review via email: mp+52814@code.launchpad.net

Description of the change

Hello,

Fix: [6.0] analytic account - parent_id domain missing
https://bugs.launchpad.net/openobject-addons/+bug/729651

Thanks,
ara

To post a comment you must log in.
Revision history for this message
OpenERP buildbot (openerp-buildbot) wrote :

mrp/test/mrp_phantom_bom.yml: duplicate key value violates unique constraint "product_uom_factor_category_id_uniq"
stock_no_autopicking/test/stock_no_autopicking.yml: duplicate key value violates unique constraint "product_uom_factor_category_id_uniq"
crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Disapprove
Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/project/project_view.xml'
2--- account/project/project_view.xml 2011-03-09 13:03:45 +0000
3+++ account/project/project_view.xml 2011-03-10 10:20:35 +0000
4@@ -56,19 +56,19 @@
5 <field name="field_parent">child_complete_ids</field>
6 <field name="arch" type="xml">
7 <tree colors="blue:type in ('view');red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
8- <field name="name"/>
9+ <field name="name"/>
10 <field name="code"/>
11 <field name="quantity"/>
12 <field name="quantity_max"/>
13 <field name="debit"/>
14 <field name="credit"/>
15 <field name="balance"/>
16- <field name="currency_id" groups="base.group_extended"/>
17+ <field name="currency_id" groups="base.group_extended"/>
18 <field name="date" invisible="1"/>
19 <field name="user_id" invisible="1"/>
20 <field name="partner_id" invisible="1"/>
21 <field name="parent_id" invisible="1"/>
22- <field name="type" invisible="1"/>
23+ <field name="type"/>
24 </tree>
25 </field>
26 </record>
27@@ -82,7 +82,7 @@
28 <group colspan="4" col="6">
29 <field name="name" select="1" colspan="4"/>
30 <field name="code" select="1"/>
31- <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
32+ <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended" domain="[('type','=','view')]"/>
33 <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
34 <field name="type" select="2"/>
35 </group>

Subscribers

People subscribed via source and target branches

to all changes: