TechnoLibre/bemade-addons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port fsm to 17.0"

Browse source
This commit is contained in:
Benoît Vézina 2024-03-04 12:08:25 -05:00
parent 0fde311ee9
commit b5ab149e62
5 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bemade_fsm/__manifest__.py
View file

@ -52,7 +52,8 @@
'views/menus.xml', 'views/menus.xml',
'views/task_views.xml', 'views/task_views.xml',
'views/sale_order_views.xml', 'views/sale_order_views.xml',
'reports/worksheet_custom_report_templates.xml', # BV: need to readd this file
# 'reports/worksheet_custom_report_templates.xml',
'reports/worksheet_custom_reports.xml', 'reports/worksheet_custom_reports.xml',
'wizard/new_task_from_template.xml', 'wizard/new_task_from_template.xml',
], ],
@ -66,8 +67,9 @@
'bemade_fsm/static/src/scss/bemade_fsm.scss' 'bemade_fsm/static/src/scss/bemade_fsm.scss'
], ],
'web.assets_backend': [ 'web.assets_backend': [
'bemade_fsm/static/src/js/kanban_view.js', # BV: need to readd these files
'bemade_fsm/static/src/js/list_view.js', # 'bemade_fsm/static/src/js/kanban_view.js',
# 'bemade_fsm/static/src/js/list_view.js',
], ],
'web.assets_qweb': [ 'web.assets_qweb': [
'bemade_fsm/static/src/xml/project_view_buttons.xml', 'bemade_fsm/static/src/xml/project_view_buttons.xml',

12
bemade_fsm/data/fsm_data.xml
View file

@ -4,7 +4,8 @@
<record id="planning_project_stage_waiting_parts" model="project.task.type"> <record id="planning_project_stage_waiting_parts" model="project.task.type">
<field name="sequence">2</field> <field name="sequence">2</field>
<field name="name">Waiting on Parts</field> <field name="name">Waiting on Parts</field>
<field name="legend_blocked">Blocked</field> <!-- BV: legend_blocked n'existe plus -->
<!-- BV: <field name="legend_blocked">Blocked</field>-->
<field name="fold" eval="False"/> <field name="fold" eval="False"/>
<!-- <field name="is_closed" eval="False"/>--> <!-- <field name="is_closed" eval="False"/>-->
<field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/> <field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/>
@ -12,7 +13,7 @@
<record id="planning_project_stage_work_completed" model="project.task.type"> <record id="planning_project_stage_work_completed" model="project.task.type">
<field name="sequence">15</field> <field name="sequence">15</field>
<field name="name">Work Executed</field> <field name="name">Work Executed</field>
<field name="legend_blocked">Blocked</field> <!-- BV: <field name="legend_blocked">Blocked</field>-->
<field name="fold" eval="False"/> <field name="fold" eval="False"/>
<!-- <field name="is_closed" eval="False"/>--> <!-- <field name="is_closed" eval="False"/>-->
<field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/> <field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/>
@ -20,7 +21,7 @@
<record id="planning_project_stage_exception" model="project.task.type"> <record id="planning_project_stage_exception" model="project.task.type">
<field name="sequence">19</field> <field name="sequence">19</field>
<field name="name">Exception</field> <field name="name">Exception</field>
<field name="legend_blocked">Blocked</field> <!-- BV: <field name="legend_blocked">Blocked</field>-->
<field name="fold" eval="False"/> <field name="fold" eval="False"/>
<!-- <field name="is_closed" eval="False"/>--> <!-- <field name="is_closed" eval="False"/>-->
<field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/> <field name="project_ids" eval="[(4,ref('industry_fsm.fsm_project'))]"/>
@ -35,8 +36,9 @@
<record id="industry_fsm.fsm_project" model="project.project"> <record id="industry_fsm.fsm_project" model="project.project">
<field name="type_ids" <field name="type_ids"
eval="[(4, ref('industry_fsm.planning_project_stage_0')), (4, ref('industry_fsm.planning_project_stage_1')), (4, ref('industry_fsm.planning_project_stage_2')), (4, ref('planning_project_stage_work_completed')), (4, ref('industry_fsm.planning_project_stage_3')), (4, ref('industry_fsm.planning_project_stage_4'))]"/> eval="[(4, ref('industry_fsm.planning_project_stage_0')), (4, ref('industry_fsm.planning_project_stage_1')), (4, ref('industry_fsm.planning_project_stage_2')), (4, ref('planning_project_stage_work_completed')), (4, ref('industry_fsm.planning_project_stage_3')), (4, ref('industry_fsm.planning_project_stage_4'))]"/>
<field name="allow_subtasks" <!-- BV: allow_subtask n'existe plus-->
eval="True"/> <!-- <field name="allow_subtasks"-->
<!-- eval="True"/>-->
</record> </record>
<function model="ir.model.data" name="write"> <function model="ir.model.data" name="write">
<function name="search" model="ir.model.data"> <function name="search" model="ir.model.data">

28
bemade_fsm/views/product_views.xml
View file

@ -8,24 +8,26 @@
<field name="inherit_id" ref="sale_project.product_template_form_view_invoice_policy_inherit_sale_project"/> <field name="inherit_id" ref="sale_project.product_template_form_view_invoice_policy_inherit_sale_project"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='project_id']" position="after"> <xpath expr="//field[@name='project_id']" position="after">
<field name="task_template_id" <field name="task_template_id"
attrs="{'invisible': [('service_tracking', 'not in', ('task_global_project', 'task_in_project'))]}" invisible="service_tracking not in ('task_global_project', 'task_in_project')"
domain="[('parent', '=', False)]"/> domain="[('parent', '=', False)]"/>
</xpath> </xpath>
<xpath expr="//field[@name='planning_enabled']" position="after"> <xpath expr="//field[@name='planning_enabled']" position="after">
<field name="is_field_service"/> <field name="is_field_service"/>
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="product_search_form_view_inherit_bemade_fsm" model="ir.ui.view">
<field name="name">bemade_fsm.product_search_form_view_inherit_bemade_fsm</field> <!-- BV: Did comment that one cause can not match inherit_id and don't understand it use -->
<field name="model">product.product</field> <!-- <record id="product_search_form_view_inherit_bemade_fsm" model="ir.ui.view">-->
<field name="inherit_id" ref="industry_fsm_sale.product_search_form_view_inherit_fsm_sale"/> <!-- <field name="name">bemade_fsm.product_search_form_view_inherit_bemade_fsm</field>-->
<field name="arch" type="xml"> <!-- <field name="model">product.product</field>-->
<xpath expr="//searchpanel//field[@name='categ_id']" position="attributes"> <!-- <field name="inherit_id" ref="industry_fsm_sale.product_search_form_view_inherit_fsm_sale"/>-->
<attribute name="limit">0</attribute> <!-- <field name="arch" type="xml">-->
</xpath> <!-- <xpath expr="//searchpanel//field[@name='categ_id']" position="attributes">-->
</field> <!-- <attribute name="limit">0</attribute>-->
</record> <!-- </xpath>-->
<!-- </field>-->
<!-- </record>-->
</data> </data>
</odoo> </odoo>

31
bemade_fsm/views/res_partner.xml
View file

@ -17,21 +17,22 @@
<page name="field_service" string="Field Service"> <page name="field_service" string="Field Service">
<field name="owned_equipment_ids" invisible="True"/> <field name="owned_equipment_ids" invisible="True"/>
<group> <group>
<field name="site_contacts" <field name="site_contacts"
attrs="{'invisible': [('company_type','=','person')]}" invisible="company_type == 'person'"
context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/> context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
<field name="work_order_contacts" <field name="work_order_contacts"
attrs="{'invisible': [('company_type','=','person')]}" invisible="company_type == 'person'"
context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/> context="{'tree_view_ref': 'bemade_fsm.fsm_contacts_view_tree'}"/>
<field name="equipment_ids" attrs="{'invisible': [('company_type','=','person')]}" <field name="equipment_ids"
context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}" invisible="company_type == 'person'"
readonly="False"/> context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}"
<field attrs="{'invisible': ['|', ('company_type','=','person'), ('owned_equipment_ids','=',False)]}" readonly="False"/>
context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}" <field name="owned_equipment_ids"
name="owned_equipment_ids" invisible="company_type == 'person' or owned_equipment_ids == False"
readonly="True"/> context="{'tree_view_ref': 'bemade_fsm.fsm_equipment_view_tree'}"
<field name="site_ids" readonly="True"/>
attrs="{'invisible': [('company_type','=','company')]}"> <field name="site_ids"
invisible="company_type == 'company'">
<tree editable="bottom"> <tree editable="bottom">
<field name="name" widget="res_partner_many2one"/> <field name="name" widget="res_partner_many2one"/>
</tree> </tree>

3
bemade_fsm/views/task_views.xml
View file

@ -9,8 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='name']/.." position="before"> <xpath expr="//field[@name='name']/.." position="before">
<h1 class="d-flex flex-row justify-content-between"> <h1 class="d-flex flex-row justify-content-between">
<field name="work_order_number" <field name="work_order_number" invisible="work_order_number == False"/>
attrs="{'invisible': [('work_order_number', '=', False)]}"/>
</h1> </h1>
</xpath> </xpath>
<xpath expr="//page[@name='extra_info']" position="after"> <xpath expr="//page[@name='extra_info']" position="after">