# HG changeset patch # User Jérémie Gavrel <jeremie.gavrel@xcg-consulting.fr> # Date 1400164919 -7200 # Thu May 15 16:41:59 2014 +0200 # Node ID b462c6452bde4575582b8269c6cebe99dc4820e4 # Parent 10c99f102b1f4a8d4ea366e752fd0fd01ea99574 Analytic scructures can now use different ordering values for the same dimension. Models that use analytic code fields should now use conditions on nd_id.ns{n}_id.model_name in the domain for those fields. diff --git a/analytic_dimension.py b/analytic_dimension.py --- a/analytic_dimension.py +++ b/analytic_dimension.py @@ -30,6 +30,41 @@ validated=fields.boolean("Validated"), nc_ids=fields.one2many("analytic.code", "nd_id", "Codes"), ns_id=fields.one2many("analytic.structure", "nd_id", "Structures"), + ns1_id=fields.one2many( + 'analytic.structure', + 'nd_id', + u"Structures 1", + domain=[('ordering', '=', 1)], + auto_join=True + ), + ns2_id=fields.one2many( + 'analytic.structure', + 'nd_id', + u"Structures 2", + domain=[('ordering', '=', 2)], + auto_join=True + ), + ns3_id=fields.one2many( + 'analytic.structure', + 'nd_id', + u"Structures 3", + domain=[('ordering', '=', 3)], + auto_join=True + ), + ns4_id=fields.one2many( + 'analytic.structure', + 'nd_id', + u"Structures 4", + domain=[('ordering', '=', 4)], + auto_join=True + ), + ns5_id=fields.one2many( + 'analytic.structure', + 'nd_id', + u"Structures 5", + domain=[('ordering', '=', 5)], + auto_join=True + ), ) _sql_constraints = [ diff --git a/analytic_dimension.xml b/analytic_dimension.xml --- a/analytic_dimension.xml +++ b/analytic_dimension.xml @@ -20,10 +20,11 @@ <field name="name">analytic.dimension.form</field> <field name="model">analytic.code</field> <field name="arch" type="xml"> - <form string="Analytic Dimension"> + <form string="Analytic Code"> <field name="active"/> <field name="name"/> <field name="description"/> + <field name="code_parent_id" domain="[('id', '!=', id), ('nd_id', '=', nd_id)]" /> <field name="nd_id" required="1"/> </form> </field>