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

[Ashvin Rathod (OpenERP)]

Hello,

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

Thanks,
ara

[OpenERP buildbot (openerp-buildbot)]

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

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2011-03-09 13:03:45 +0000
+++ account/project/project_view.xml	2011-03-10 10:20:35 +0000
@@ -56,19 +56,19 @@
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
                 <tree colors="blue:type in ('view');red:(date&lt;current_date);black:(date&gt;=current_date);black:(date==False)" string="Analytic account" toolbar="1">
-                    <field name="name"/>                    
+                    <field name="name"/>
                     <field name="code"/>
                     <field name="quantity"/>
                     <field name="quantity_max"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="currency_id" groups="base.group_extended"/>                    
+                    <field name="currency_id" groups="base.group_extended"/>
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
-                    <field name="type" invisible="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -82,7 +82,7 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
-                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
+                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended" domain="[('type','=','view')]"/>
                         <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')]}"/>
                         <field name="type" select="2"/>
                     </group>