[UPD] Use analytic tags to link incomes/expenses to budget lines

instead of a direct budget_forecast field
This commit is contained in:
Stéphan Sainléger
2022-06-28 21:11:05 +02:00
parent 96fd3ae674
commit d76796bfa7
9 changed files with 94 additions and 70 deletions

View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="invoice_budget_form" model="ir.ui.view">
<field name="name">account.invoice.budget.form</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form" />
<field name="arch" type="xml">
<xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='analytic_tag_ids']" position="after">
<field name="budget_forecast_id" domain="[('analytic_id', '=', analytic_account_id), ('product_id', '=', product_id)]" />
</xpath>
</field>
</record>
</odoo>

View File

@@ -9,8 +9,10 @@
<sheet>
<group>
<group>
<field name="name" />
<field name="product_id" />
<field name="description" />
<field name="analytic_tag" />
</group>
<group>
<field name="analytic_id" />
@@ -36,7 +38,8 @@
</group>
</group>
<group string="Analytic Lines">
<field name="analytic_line_ids" nolabel="1">
<!-- TODO: Ajouter bouton vers vue Tree affichant les lignes analytics -->
<!-- <field name="analytic_line_ids" nolabel="1">
<tree>
<field name="date" />
<field name="employee_id" />
@@ -45,7 +48,7 @@
<field name="unit_amount" string="Quantity" />
<field name="amount" />
</tree>
</field>
</field>-->
</group>
<group string="Childs" attrs="{'invisible' : [('child_ids','=', False)]}">
<field name="child_ids" nolabel="1">

View File

@@ -8,7 +8,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
<field name="arch" type="xml">
<xpath expr="//field[@name='task_id']" position="after">
<field name="budget_forecast_id" domain="[('display_type', '=', 'line_article')]" />
<field name="tag_ids" widget="many2many_tags" /> <!--domain="[('display_type', '=', 'line_article')]" />-->
</xpath>
</field>
</record>

View File

@@ -6,7 +6,7 @@
<field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
<field name="arch" type="xml">
<xpath expr="//field[@name='timesheet_ids']/tree/field[@name='name']" position="after">
<field name="budget_forecast_id" domain="[('display_type', '=', 'line_article')]" />
<field name="tag_ids" /> <!--domain="[('display_type', '=', 'line_article')]" />-->
</xpath>
</field>
</record>