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

[Ashvin Rathod (OpenERP)]

Hello,

fix the bug: sale_analytic_plans: Position of Analytic distribution field
https://bugs.launchpad.net/openobject-addons/+bug/728384

Thanks,
ara

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

review: Approve

[OpenERP buildbot (openerp-buildbot)]

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.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Needs Fixing

=== modified file 'sale_analytic_plans/sale_analytic_plans_view.xml'
--- sale_analytic_plans/sale_analytic_plans_view.xml	2011-01-14 00:11:01 +0000
+++ sale_analytic_plans/sale_analytic_plans_view.xml	2011-03-08 05:49:56 +0000
@@ -18,7 +18,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-           <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='product_id']" position="after">
+           <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='delay']" position="after">
                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
            </xpath>
         </field>