From b28290488149c067713d557c348e815c251d1116 Mon Sep 17 00:00:00 2001 From: Matteo Boscolo Date: Thu, 2 Nov 2023 17:35:40 +0100 Subject: [PATCH 1/7] CHANGE modules version --- activity_validation/__manifest__.py | 2 +- plm/__manifest__.py | 2 +- plm_auto_engcode/__manifest__.py | 2 +- plm_auto_internalref/__manifest__.py | 2 +- plm_automate_normal_bom/__manifest__.py | 2 +- plm_automated_convertion/__manifest__.py | 2 +- plm_automatic_weight/__manifest__.py | 2 +- plm_bom_summarize/__manifest__.py | 2 +- plm_box/__manifest__.py | 2 +- plm_breakages/__manifest__.py | 2 +- plm_client_customprocedure/__manifest__.py | 2 +- plm_compare_bom/__manifest__.py | 2 +- plm_cutted_parts/__manifest__.py | 2 +- plm_date_bom/__manifest__.py | 2 +- plm_document_multi_site/__manifest__.py | 2 +- plm_engineering/__manifest__.py | 2 +- plm_ent_breakages_helpdesk/__manifest__.py | 2 +- plm_mrp_bom_update/__manifest__.py | 2 +- plm_pack_and_go/__manifest__.py | 2 +- plm_pdf_workorder/__manifest__.py | 2 +- plm_product_description_language_helper/__manifest__.py | 2 +- plm_product_only_latest/__manifest__.py | 2 +- plm_project/__manifest__.py | 2 +- plm_purchase_only_latest/__manifest__.py | 2 +- plm_report_language_helper/__manifest__.py | 2 +- plm_sale_fix/__manifest__.py | 2 +- plm_sale_only_latest/__manifest__.py | 2 +- plm_spare/__manifest__.py | 2 +- plm_suspended/__manifest__.py | 2 +- plm_web_3d/__manifest__.py | 2 +- plm_web_3d_sale/__manifest__.py | 2 +- plm_web_revision/__manifest__.py | 2 +- plm_workflow_custom_action/__manifest__.py | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/activity_validation/__manifest__.py b/activity_validation/__manifest__.py index a1b11913..d856fb40 100644 --- a/activity_validation/__manifest__.py +++ b/activity_validation/__manifest__.py @@ -19,7 +19,7 @@ ############################################################################## { "name": "Activity Validation", - "version": "16.0.2", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://github.com/OmniaGit/odooplm", "category": "Custom", diff --git a/plm/__manifest__.py b/plm/__manifest__.py index 76d703d8..b55f46cf 100644 --- a/plm/__manifest__.py +++ b/plm/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Product Lifecycle Management", - "version": "16.0.26", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_auto_engcode/__manifest__.py b/plm_auto_engcode/__manifest__.py index 99283210..3d289262 100644 --- a/plm_auto_engcode/__manifest__.py +++ b/plm_auto_engcode/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Automatic Engineering Code", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_auto_internalref/__manifest__.py b/plm_auto_internalref/__manifest__.py index a6e59883..3d5df659 100644 --- a/plm_auto_internalref/__manifest__.py +++ b/plm_auto_internalref/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Auto Internal Reference", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_automate_normal_bom/__manifest__.py b/plm_automate_normal_bom/__manifest__.py index f859c14e..462db01d 100644 --- a/plm_automate_normal_bom/__manifest__.py +++ b/plm_automate_normal_bom/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Automate Normal Bom", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_automated_convertion/__manifest__.py b/plm_automated_convertion/__manifest__.py index 166aa678..2c48265d 100644 --- a/plm_automated_convertion/__manifest__.py +++ b/plm_automated_convertion/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################## { "name": "Product Lifecycle Management Batch conversion", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_automatic_weight/__manifest__.py b/plm_automatic_weight/__manifest__.py index e2cc1a22..d1ee6a1b 100644 --- a/plm_automatic_weight/__manifest__.py +++ b/plm_automatic_weight/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Automatic Weight", - "version": "16.0.2", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_bom_summarize/__manifest__.py b/plm_bom_summarize/__manifest__.py index b88e2706..664d2703 100644 --- a/plm_bom_summarize/__manifest__.py +++ b/plm_bom_summarize/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Bom Sumarize", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Product Lifecycle Management", diff --git a/plm_box/__manifest__.py b/plm_box/__manifest__.py index bfdcfbee..f3b8935e 100644 --- a/plm_box/__manifest__.py +++ b/plm_box/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Plm Box", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Productivity/Documents", diff --git a/plm_breakages/__manifest__.py b/plm_breakages/__manifest__.py index 347ecc22..89f11411 100644 --- a/plm_breakages/__manifest__.py +++ b/plm_breakages/__manifest__.py @@ -24,7 +24,7 @@ { "name": "PLM Breakages", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://www.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_client_customprocedure/__manifest__.py b/plm_client_customprocedure/__manifest__.py index 7fdd8014..3e4fbd22 100644 --- a/plm_client_customprocedure/__manifest__.py +++ b/plm_client_customprocedure/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Client Custom Procedure", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_compare_bom/__manifest__.py b/plm_compare_bom/__manifest__.py index 61435495..9b1f7ead 100644 --- a/plm_compare_bom/__manifest__.py +++ b/plm_compare_bom/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Compare Bom", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_cutted_parts/__manifest__.py b/plm_cutted_parts/__manifest__.py index 81abb2db..1aef6250 100644 --- a/plm_cutted_parts/__manifest__.py +++ b/plm_cutted_parts/__manifest__.py @@ -20,7 +20,7 @@ #######################True####################################################### { "name": "PLM Cutted Parts", - "version": "16.0.4", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_date_bom/__manifest__.py b/plm_date_bom/__manifest__.py index 10cbe37b..925ab81e 100644 --- a/plm_date_bom/__manifest__.py +++ b/plm_date_bom/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Date Bom", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "license": "AGPL-3", "website": "https://odooplm.omniasolutions.website", diff --git a/plm_document_multi_site/__manifest__.py b/plm_document_multi_site/__manifest__.py index adde0253..996c7920 100644 --- a/plm_document_multi_site/__manifest__.py +++ b/plm_document_multi_site/__manifest__.py @@ -19,7 +19,7 @@ ############################################################################## { "name": "PLM Document Syncronization", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_engineering/__manifest__.py b/plm_engineering/__manifest__.py index 36d1a188..8c46edaa 100644 --- a/plm_engineering/__manifest__.py +++ b/plm_engineering/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Engineering", - "version": "16.0.2", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_ent_breakages_helpdesk/__manifest__.py b/plm_ent_breakages_helpdesk/__manifest__.py index a3d33482..497f7c45 100644 --- a/plm_ent_breakages_helpdesk/__manifest__.py +++ b/plm_ent_breakages_helpdesk/__manifest__.py @@ -24,7 +24,7 @@ { "name": "PLM Breakages Helpdesk", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://www.omniasolutions.website", "category": "Helpdesk", diff --git a/plm_mrp_bom_update/__manifest__.py b/plm_mrp_bom_update/__manifest__.py index 6de20b8e..d7fb4515 100755 --- a/plm_mrp_bom_update/__manifest__.py +++ b/plm_mrp_bom_update/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': '[OMNIASOLUTIONS] Production Bom Update', - 'version': '15.2', + 'version': '17.0.1', 'sequence': 1, 'category': 'Manufacturing/Product Lifecycle Management (PLM)', 'description': """ diff --git a/plm_pack_and_go/__manifest__.py b/plm_pack_and_go/__manifest__.py index f219bc5f..261e1dc4 100644 --- a/plm_pack_and_go/__manifest__.py +++ b/plm_pack_and_go/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Plm Pack and Go", - "version": "16.0.2", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_pdf_workorder/__manifest__.py b/plm_pdf_workorder/__manifest__.py index fcbf7e3e..a1683d4b 100644 --- a/plm_pdf_workorder/__manifest__.py +++ b/plm_pdf_workorder/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Report PDF Workorder", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_product_description_language_helper/__manifest__.py b/plm_product_description_language_helper/__manifest__.py index 686407c2..de9facda 100644 --- a/plm_product_description_language_helper/__manifest__.py +++ b/plm_product_description_language_helper/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Product Description Language Helper", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_product_only_latest/__manifest__.py b/plm_product_only_latest/__manifest__.py index 3139a510..9f6e2caa 100644 --- a/plm_product_only_latest/__manifest__.py +++ b/plm_product_only_latest/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'PLM Produce Only Latest', - 'version': '16.0.1', + 'version': '17.0.1', 'author': 'OmniaSolutions', 'website': 'https://odooplm.omniasolutions.website', 'category': 'Manufacturing/Product Lifecycle Management (PLM)', diff --git a/plm_project/__manifest__.py b/plm_project/__manifest__.py index cc92bab6..8743ba0d 100644 --- a/plm_project/__manifest__.py +++ b/plm_project/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Project", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_purchase_only_latest/__manifest__.py b/plm_purchase_only_latest/__manifest__.py index f92cfb8c..14cde35b 100644 --- a/plm_purchase_only_latest/__manifest__.py +++ b/plm_purchase_only_latest/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'PLM Purchase Only Latest', - 'version': '16.0.1', + 'version': '17.0.1', 'author': 'OmniaSolutions', 'website': 'https://odooplm.omniasolutions.website', 'category': 'Manufacturing/Product Lifecycle Management (PLM)', diff --git a/plm_report_language_helper/__manifest__.py b/plm_report_language_helper/__manifest__.py index 95d75e1e..54453f8c 100644 --- a/plm_report_language_helper/__manifest__.py +++ b/plm_report_language_helper/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Plm Report Language Helper", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_sale_fix/__manifest__.py b/plm_sale_fix/__manifest__.py index 376789fe..db11d50d 100644 --- a/plm_sale_fix/__manifest__.py +++ b/plm_sale_fix/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Plm Sale Fix", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_sale_only_latest/__manifest__.py b/plm_sale_only_latest/__manifest__.py index 1c2c71dd..72cf7877 100644 --- a/plm_sale_only_latest/__manifest__.py +++ b/plm_sale_only_latest/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'PLM Sale Only Latest', - 'version': '16.0.1', + 'version': '17.0.1', 'author': 'OmniaSolutions', 'website': 'https://odooplm.omniasolutions.website', 'category': 'Manufacturing/Product Lifecycle Management (PLM)', diff --git a/plm_spare/__manifest__.py b/plm_spare/__manifest__.py index cbe757d7..d1f6b7f5 100644 --- a/plm_spare/__manifest__.py +++ b/plm_spare/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Spare", - "version": "16.0.2", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_suspended/__manifest__.py b/plm_suspended/__manifest__.py index f3e95422..adf4daf7 100644 --- a/plm_suspended/__manifest__.py +++ b/plm_suspended/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Suspended State", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_web_3d/__manifest__.py b/plm_web_3d/__manifest__.py index b59625d6..1feed154 100644 --- a/plm_web_3d/__manifest__.py +++ b/plm_web_3d/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Web 3d Support", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_web_3d_sale/__manifest__.py b/plm_web_3d_sale/__manifest__.py index 0d46a25a..560d405c 100644 --- a/plm_web_3d_sale/__manifest__.py +++ b/plm_web_3d_sale/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Web 3d Support Sale", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_web_revision/__manifest__.py b/plm_web_revision/__manifest__.py index a263c7f8..d3cf692f 100644 --- a/plm_web_revision/__manifest__.py +++ b/plm_web_revision/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Web Revision", - "version": "16.0.1", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_workflow_custom_action/__manifest__.py b/plm_workflow_custom_action/__manifest__.py index 4a9e4d5f..67dd6c50 100644 --- a/plm_workflow_custom_action/__manifest__.py +++ b/plm_workflow_custom_action/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Workflow Custom Actions", - "version": "16.0.2", + "version": "17.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", From 0270cf7826f59bf0558d4b0dc3d73c12049e2db4 Mon Sep 17 00:00:00 2001 From: Matteo Boscolo Date: Fri, 3 Nov 2023 18:48:19 +0100 Subject: [PATCH 2/7] FIRST COMMIT FOR v17 --- activity_validation/__manifest__.py | 4 +- plm/__manifest__.py | 2 +- plm/models/base.py | 2 +- plm/models/ir_attachment.py | 55 ---- plm/models/ir_ui_view.py | 5 +- plm/models/plm_mixin.py | 3 + plm/models/product_product.py | 17 +- plm/models/res_groups.py | 5 +- plm/tests/test_plm.py | 3 +- plm/views/ir_attachment_relations.xml | 153 ++++++---- plm/views/ir_attachment_view.xml | 116 +++++--- plm/views/mrp_extension.xml | 16 +- plm/views/plm_description_view.xml | 5 +- plm/views/product_product.xml | 144 ++++++---- plm/views/product_template.xml | 10 +- plm/views/res_config_settings.xml | 6 +- plm_auto_engcode/__manifest__.py | 2 +- plm_auto_internalref/__manifest__.py | 2 +- plm_automate_normal_bom/__manifest__.py | 2 +- plm_automated_convertion/__manifest__.py | 2 +- .../view/plm_convert_servers.xml | 19 +- .../view/plm_convert_stack.xml | 10 +- plm_automatic_weight/__manifest__.py | 2 +- .../views/product_product.xml | 20 +- plm_bom_summarize/__manifest__.py | 2 +- plm_box/__manifest__.py | 2 +- plm_box/models/plm_box.py | 271 ++++++++++-------- plm_box/views/non_cad_doc.xml | 27 +- plm_breakages/__manifest__.py | 2 +- plm_breakages/views/bom_view.xml | 2 +- plm_breakages/views/breakages_view.xml | 3 +- plm_breakages/views/mrp_production.xml | 2 +- plm_client_customprocedure/__manifest__.py | 2 +- .../views/res_groups.xml | 16 +- .../views/res_users.xml | 4 +- plm_compare_bom/__manifest__.py | 2 +- plm_compare_bom/models/compare_bom.py | 15 +- plm_compare_bom/views/compare_bom_view.xml | 7 +- plm_cutted_parts/__manifest__.py | 2 +- plm_cutted_parts/views/product.xml | 30 +- plm_date_bom/__manifest__.py | 2 +- plm_date_bom/views/mrp_bom.xml | 7 +- plm_date_bom/views/mrp_production.xml | 2 +- plm_document_multi_site/__manifest__.py | 2 +- .../views/ir_attachment.xml | 2 +- plm_engineering/__manifest__.py | 2 +- plm_engineering/views/mrp_bom.xml | 1 + plm_ent_breakages_helpdesk/__manifest__.py | 3 +- plm_mrp_bom_update/__manifest__.py | 2 +- .../views/mrp_bom_extension.xml | 3 +- plm_pack_and_go/__manifest__.py | 2 +- plm_pack_and_go/views/plm_component.xml | 12 +- plm_pdf_workorder/__manifest__.py | 2 +- plm_pdf_workorder/views/mrp_workorder.xml | 47 +-- .../__manifest__.py | 2 +- plm_product_only_latest/__manifest__.py | 2 +- plm_project/__manifest__.py | 2 +- plm_project/views/project.xml | 9 +- plm_purchase_only_latest/__manifest__.py | 2 +- plm_report_language_helper/__manifest__.py | 2 +- plm_sale_fix/__manifest__.py | 2 +- plm_sale_only_latest/__manifest__.py | 2 +- plm_spare/__manifest__.py | 2 +- plm_spare/views/ir_attachment.xml | 5 +- plm_spare/views/plm_temporary.xml | 1 + plm_suspended/__manifest__.py | 2 +- plm_suspended/views/ir_attachment.xml | 5 +- plm_suspended/views/product_product.xml | 5 +- plm_web_3d/__manifest__.py | 2 +- plm_web_3d/views/ir_attachment.xml | 7 +- plm_web_3d_sale/__manifest__.py | 2 +- plm_web_revision/__manifest__.py | 2 +- plm_workflow_custom_action/__manifest__.py | 2 +- 73 files changed, 632 insertions(+), 509 deletions(-) diff --git a/activity_validation/__manifest__.py b/activity_validation/__manifest__.py index d856fb40..618ad808 100644 --- a/activity_validation/__manifest__.py +++ b/activity_validation/__manifest__.py @@ -19,7 +19,7 @@ ############################################################################## { "name": "Activity Validation", - "version": "17.0.1", + "version": "17.0.0.1", "author": "OmniaSolutions", "website": "https://github.com/OmniaGit/odooplm", "category": "Custom", @@ -45,7 +45,7 @@ "qweb": ["static/src/xml/*.xml"], 'assets': { 'web.assets_backend': [ - "activity_validation/static/src/js/systray_activity_menu.js", + #"activity_validation/static/src/js/systray_activity_menu.js", ] }, "installable": True, diff --git a/plm/__manifest__.py b/plm/__manifest__.py index b55f46cf..e21bf507 100644 --- a/plm/__manifest__.py +++ b/plm/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "Product Lifecycle Management", - "version": "17.0.1", + "version": "17.0.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm/models/base.py b/plm/models/base.py index 178109ea..8c16b705 100644 --- a/plm/models/base.py +++ b/plm/models/base.py @@ -57,7 +57,7 @@ def koo_fields_view_get(self, view_id=None, view_type='form', toolbar=False, sub def sanitize(dict_from): return json.loads(json.dumps(dict_from, default=json_serial).replace("null", "false")) f = super(Base, self).fields_view_get(view_id=view_id, view_type=view_type, toolbar=toolbar, submenu=submenu) - for key in ['field_parent', 'name', 'type', 'view_id', 'base_model', 'fields', 'toolbar']: + for key in ['name', 'type', 'view_id', 'base_model', 'fields', 'toolbar']: if key in f: f[key] = sanitize(f.get(key)) return f diff --git a/plm/models/ir_attachment.py b/plm/models/ir_attachment.py index 3fbe278a..b4c97775 100755 --- a/plm/models/ir_attachment.py +++ b/plm/models/ir_attachment.py @@ -2293,61 +2293,6 @@ def getCheckedOutAttrs(self, vals): break outDict[file_path] = outLocalDict return outDict - - @api.model - def _search(self, args, offset=0, limit=None, order=None, count=False, access_rights_uid=None): - # add res_field=False in domain if not present; the arg[0] trick below - # works for domain items and '&'/'|'/'!' operators too - if not any(arg[0] in ('id', 'res_field') for arg in args): - args.insert(0, ('res_field', '=', False)) - - ids = super(models.Model, self)._search(args, offset=offset, limit=limit, order=order, - count=False, access_rights_uid=access_rights_uid) - - if self.env.user and (self.env.user._is_admin() or self.env.user._is_superuser()): - # rules do not apply for the superuser - return len(ids) if count else ids - - if not ids: - return 0 if count else [] - - # Work with a set, as list.remove() is prohibitive for large lists of documents - # (takes 20+ seconds on a db with 100k docs during search_count()!) - orig_ids = ids - ids = set(ids) - - # For attachments, the permissions of the document they are attached to - # apply, so we must remove attachments for which the user cannot access - # the linked document. - # Use pure SQL rather than read() as it is about 50% faster for large dbs (100k+ docs), - # and the permissions are checked in super() and below anyway. - model_attachments = defaultdict(lambda: defaultdict(set)) # {res_model: {res_id: set(ids)}} - self._cr.execute("""SELECT id, res_model, res_id, public FROM ir_attachment WHERE id IN %s""", [tuple(ids)]) - for row in self._cr.dictfetchall(): - if not row['res_model'] or row['public']: - continue - # model_attachments = {res_model: {res_id: set(ids)}} - model_attachments[row['res_model']][row['res_id']].add(row['id']) - - # To avoid multiple queries for each attachment found, checks are - # performed in batch as much as possible. - for res_model, targets in model_attachments.items(): - if res_model not in self.env: - continue - if not self.env[res_model].check_access_rights('read', False): - # remove all corresponding attachment ids - ids.difference_update(itertools.chain(*targets.values())) - continue - # filter ids according to what access rules permit - target_ids = list(targets) - allowed = self.env[res_model].with_context(active_test=False).search([('id', 'in', target_ids)]) - for res_id in set(target_ids).difference(allowed.ids): - ids.difference_update(targets[res_id]) - - # sort result according to the original sort ordering - result = [id for id in orig_ids if id in ids] - return len(result) if count else list(result) - def open_related_document_revisions(self): ir_attachment_ids = self.search([('engineering_code', '=', self.engineering_code)]) diff --git a/plm/models/ir_ui_view.py b/plm/models/ir_ui_view.py index c9822ad4..49ae3dfb 100755 --- a/plm/models/ir_ui_view.py +++ b/plm/models/ir_ui_view.py @@ -37,7 +37,8 @@ class IrUiView(models.Model): _inherit = 'ir.ui.view' @api.model - def search(self, args, offset=0, limit=None, order=None, count=False): + @api.returns('self') + def search(self, args, offset=0, limit=None, order=None): if self.env.context.get('odooPLM'): self = self.sudo() - return super(IrUiView, self).search(args, offset, limit, order, count) + return super(IrUiView, self).search(args, offset, limit, order) diff --git a/plm/models/plm_mixin.py b/plm/models/plm_mixin.py index 3d78f201..d2ed5256 100644 --- a/plm/models/plm_mixin.py +++ b/plm/models/plm_mixin.py @@ -413,6 +413,9 @@ def get_all_revision(self): def write(self, vals): if 'engineering_code' in vals and vals['engineering_code'] not in [False, '-','']: vals['engineering_code_editable']=False + else: + if self.engineering_code and self.engineering_code_editable==True: + vals['engineering_code_editable']=False return super(RevisionBaseMixin, self).write(vals) def create(self, vals): diff --git a/plm/models/product_product.py b/plm/models/product_product.py index dc3207d4..4fe4c449 100755 --- a/plm/models/product_product.py +++ b/plm/models/product_product.py @@ -40,6 +40,7 @@ from odoo.exceptions import AccessError from odoo.exceptions import UserError import odoo.tools as tools +from odoo.osv import expression _logger = logging.getLogger(__name__) @@ -1790,11 +1791,17 @@ def name_get(self): return result @api.model - def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None): - if not args: - args = [] - product_ids = list(self._search([('engineering_code', operator, name)] + args, limit=limit, access_rights_uid=name_get_uid)) - product_ids += list(super(ProductProduct, self)._name_search(name, args, operator, limit, name_get_uid)) + def _name_search(self, name, domain=None, operator='ilike', limit=None, order=None): + if not domain: + domain=[('engineering_code', 'ilike', name)] + else: + domain = expression.OR([domain, + [('engineering_code', 'ilike', name)]]) + product_ids = list(super(ProductProduct, self)._name_search(name, + domain, + operator, + limit, + order=None)) return list(set(product_ids)) @api.model diff --git a/plm/models/res_groups.py b/plm/models/res_groups.py index a94b3cea..6f30587d 100755 --- a/plm/models/res_groups.py +++ b/plm/models/res_groups.py @@ -36,7 +36,8 @@ class ResGroups(models.Model): _inherit = 'res.groups' @api.model - def search(self, args, offset=0, limit=None, order=None, count=False): + @api.returns('self') + def search(self, args, offset=0, limit=None, order=None): if self.env.context.get('odooPLM'): available_types = [ self.env.ref('plm.group_plm_view_user').id, @@ -56,6 +57,6 @@ def search(self, args, offset=0, limit=None, order=None, count=False): if additional_obj: available_types.append(additional_obj.id) args = AND([args, [('id', 'in', available_types)]]) - return super(ResGroups, self).search(args, offset, limit, order, count) + return super(ResGroups, self).search(args, offset, limit, order) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/plm/tests/test_plm.py b/plm/tests/test_plm.py index 337e1ba1..f0e3c673 100644 --- a/plm/tests/test_plm.py +++ b/plm/tests/test_plm.py @@ -48,7 +48,7 @@ # # -@tagged('-standard', 'odoo_plm','post_install', '-at_install') +@tagged('-standard', 'odoo_plm') class PlmDateBom(TransactionCase, PlmEntityCreator): def test_1_some_wk(cls): @@ -145,6 +145,7 @@ def test_1_some_wk(cls): def test_2_attachment_wk(self): attachment = self.create_document('document_wk_test') + attachment.is_plm=True # assert attachment.engineering_revision==0 assert attachment.ischecked_in()==True diff --git a/plm/views/ir_attachment_relations.xml b/plm/views/ir_attachment_relations.xml index 237bc36e..c10fe550 100755 --- a/plm/views/ir_attachment_relations.xml +++ b/plm/views/ir_attachment_relations.xml @@ -14,35 +14,44 @@ - +
- +
- +
- +
- +
- - - - - + + + + + - - - - - + + + + + @@ -53,58 +62,78 @@ class="fa fa-dropbox fa-2x" aria-label="Missing Component" style="text-align: right; width: 150%; color:#ff8300;" - attrs="{'invisible': [('parent_linked', 'not in', [False, []])]}"/> + invisible="parent_linked not in [False, []]"/>
+ invisible="parent_linked in [False, []]"/> - +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- - - - - + + + + + - - - - - + + + + + @@ -115,26 +144,36 @@ class="fa fa-dropbox fa-2x" aria-label="Missing Component" style="text-align: right; width: 150%; color:#ff8300;" - attrs="{'invisible': [('child_linked', 'not in', [False, []])]}"/> + invisible="child_linked not in [False, []]"/>
+ invisible="child_linked in [False, []]"/> - +
- +
- +
- +
- +
@@ -321,13 +360,13 @@ Parent - Other - 2D - 3D + Other + 2D + 3D -
-
+
+
@@ -362,7 +401,8 @@ Name: - + @@ -436,13 +476,13 @@ Child - Other - 2D - 3D + Other + 2D + 3D -
-
+
+
@@ -477,7 +517,8 @@ Name: - + diff --git a/plm/views/ir_attachment_view.xml b/plm/views/ir_attachment_view.xml index 1d0a0ea0..71b75a03 100755 --- a/plm/views/ir_attachment_view.xml +++ b/plm/views/ir_attachment_view.xml @@ -18,16 +18,16 @@ class="oe_highlight" type="object" groups="plm.group_plm_release_users" - attrs="{'invisible': ['|',('is_checkout','=',True),('engineering_state','!=','engineering_state')]}"/> + invisible="is_checkout == True or engineering_state != engineering_state"/> -
- + @@ -145,20 +149,30 @@ widget="image" options="{'zoom': true, 'zoom_delay': 800}" nolabel="1" - attrs="{'readonly':[('is_plm','=', True)]}"/> + readonly="is_plm==True"/> - - - - - + + + + + - + @@ -190,7 +204,8 @@ on
- + - diff --git a/plm_cutted_parts/__manifest__.py b/plm_cutted_parts/__manifest__.py index 1aef6250..0a5f962c 100644 --- a/plm_cutted_parts/__manifest__.py +++ b/plm_cutted_parts/__manifest__.py @@ -20,7 +20,7 @@ #######################True####################################################### { "name": "PLM Cutted Parts", - "version": "17.0.1", + "version": "17.0.0.1", "author": "OmniaSolutions", "website": "https://odooplm.omniasolutions.website", "category": "Manufacturing/Product Lifecycle Management (PLM)", diff --git a/plm_cutted_parts/views/product.xml b/plm_cutted_parts/views/product.xml index 4277929a..e029d005 100755 --- a/plm_cutted_parts/views/product.xml +++ b/plm_cutted_parts/views/product.xml @@ -11,14 +11,20 @@ - - + + - - - - + + + + @@ -38,19 +44,19 @@ - + - - + + - - + + diff --git a/plm_date_bom/__manifest__.py b/plm_date_bom/__manifest__.py index 925ab81e..ce0811f5 100644 --- a/plm_date_bom/__manifest__.py +++ b/plm_date_bom/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################## { "name": "PLM Date Bom", - "version": "17.0.1", + "version": "17.0.0.1", "author": "OmniaSolutions", "license": "AGPL-3", "website": "https://odooplm.omniasolutions.website", diff --git a/plm_date_bom/views/mrp_bom.xml b/plm_date_bom/views/mrp_bom.xml index 2f72b3dc..973dc07a 100755 --- a/plm_date_bom/views/mrp_bom.xml +++ b/plm_date_bom/views/mrp_bom.xml @@ -42,15 +42,14 @@ type="object" icon="fa-gears" style="color: red;font-weight: bold;" - attrs="{'invisible':['|',('obsolete_presents', '!=', True), - ('type', '=', 'ebom')]}" + invisible="obsolete_presents != True or type=='ebom'" /> + invisible="has_web3d==False"> + WebGl @@ -24,7 +25,9 @@ -
+ +
+
+ + + + + + + + + mail.activity.inherit mail.activity @@ -20,27 +118,40 @@ -
-
@@ -53,8 +164,13 @@
-