Skip to content
Snippets Groups Projects
Commit b462c645 authored by Jérémie Gavrel's avatar Jérémie Gavrel
Browse files

Analytic scructures can now use different ordering values for the same...

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.
parent 10c99f10
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,41 @@ ...@@ -30,6 +30,41 @@
validated=fields.boolean("Validated"), validated=fields.boolean("Validated"),
nc_ids=fields.one2many("analytic.code", "nd_id", "Codes"), nc_ids=fields.one2many("analytic.code", "nd_id", "Codes"),
ns_id=fields.one2many("analytic.structure", "nd_id", "Structures"), 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 = [ _sql_constraints = [
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<field name="name">analytic.dimension.form</field> <field name="name">analytic.dimension.form</field>
<field name="model">analytic.code</field> <field name="model">analytic.code</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Dimension"> <form string="Analytic Code">
<field name="active"/> <field name="active"/>
<field name="name"/> <field name="name"/>
<field name="description"/> <field name="description"/>
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<field name="active"/> <field name="active"/>
<field name="name"/> <field name="name"/>
<field name="description"/> <field name="description"/>
<field name="code_parent_id" domain="[('id', '!=', id), ('nd_id', '=', nd_id)]" />
<field name="nd_id" required="1"/> <field name="nd_id" required="1"/>
</form> </form>
</field> </field>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment