From e858324b68908db321c106a0d01f83a63e27a69d Mon Sep 17 00:00:00 2001 From: robinkeunen Date: Fri, 14 Dec 2018 16:07:55 +0100 Subject: [PATCH 01/13] [ADD] beesdoo_custom module and custom product view --- beesdoo_custom/__init__.py | 1 + beesdoo_custom/__openerp__.py | 27 ++++++++++++++++++++++ beesdoo_custom/models/__init__.py | 1 + beesdoo_custom/models/beesdoo_product.py | 29 ++++++++++++++++++++++++ beesdoo_custom/views/beesdoo_product.xml | 26 +++++++++++++++++++++ 5 files changed, 84 insertions(+) create mode 100644 beesdoo_custom/__init__.py create mode 100644 beesdoo_custom/__openerp__.py create mode 100644 beesdoo_custom/models/__init__.py create mode 100644 beesdoo_custom/models/beesdoo_product.py create mode 100644 beesdoo_custom/views/beesdoo_product.xml diff --git a/beesdoo_custom/__init__.py b/beesdoo_custom/__init__.py new file mode 100644 index 0000000..0650744 --- /dev/null +++ b/beesdoo_custom/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/beesdoo_custom/__openerp__.py b/beesdoo_custom/__openerp__.py new file mode 100644 index 0000000..e4d03c7 --- /dev/null +++ b/beesdoo_custom/__openerp__.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +{ + 'name': "beesdoo_custom", + + 'summary': """ + View and field definition specific to BEES' needs. + """, + + 'author': "Beescoop - Cellule IT", + 'website': "https://github.com/beescoop/Obeesdoo", + + # Categories can be used to filter modules in modules listing + # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml + # for the full list + 'category': 'Sales Management', + 'version': '0.1', + + # any module necessary for this one to work correctly + 'depends': [ + 'beesdoo_product', + ], + + # always loaded + 'data': [ + 'views/beesdoo_product.xml', + ], +} diff --git a/beesdoo_custom/models/__init__.py b/beesdoo_custom/models/__init__.py new file mode 100644 index 0000000..0494b5e --- /dev/null +++ b/beesdoo_custom/models/__init__.py @@ -0,0 +1 @@ +from . import beesdoo_product diff --git a/beesdoo_custom/models/beesdoo_product.py b/beesdoo_custom/models/beesdoo_product.py new file mode 100644 index 0000000..d7af564 --- /dev/null +++ b/beesdoo_custom/models/beesdoo_product.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from openerp import models, fields, api + + +class BeesdooProduct(models.Model): + _inherit = "product.template" + + main_supplierinfo = fields.Many2one( + 'product.supplierinfo', + string='Main Supplier Information', + compute='_compute_main_supplierinfo' + ) + main_price = fields.Float( + string='Price', + compute='_compute_main_supplierinfo', + ) + main_minimum_qty = fields.Float( + string='Minimum Quantity', + compute='_compute_main_supplierinfo', + ) + + @api.multi + @api.depends('seller_ids') + def _compute_main_supplierinfo(self): + for product in self: + supplierinfo = product._get_main_supplier_info() + product.main_supplierinfo = supplierinfo + product.main_price = supplierinfo.price + product.main_minimum_qty = supplierinfo.min_qty diff --git a/beesdoo_custom/views/beesdoo_product.xml b/beesdoo_custom/views/beesdoo_product.xml new file mode 100644 index 0000000..a3fd954 --- /dev/null +++ b/beesdoo_custom/views/beesdoo_product.xml @@ -0,0 +1,26 @@ + + + + + bees.product.template.tree + product.template + 14 + + + + + + + + + + + + + + + + + + + From 0b58066b50cc25adb6ad0f8e16ebb37a98fa76dd Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Wed, 13 Feb 2019 14:37:59 +0100 Subject: [PATCH 02/13] [FIX] beesdoo_custom: add default code to tree view --- beesdoo_custom/__openerp__.py | 2 +- beesdoo_custom/views/beesdoo_product.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/beesdoo_custom/__openerp__.py b/beesdoo_custom/__openerp__.py index e4d03c7..b4c2eee 100644 --- a/beesdoo_custom/__openerp__.py +++ b/beesdoo_custom/__openerp__.py @@ -2,7 +2,7 @@ { 'name': "beesdoo_custom", - 'summary': """ + 'description': """ View and field definition specific to BEES' needs. """, diff --git a/beesdoo_custom/views/beesdoo_product.xml b/beesdoo_custom/views/beesdoo_product.xml index a3fd954..e8379b7 100644 --- a/beesdoo_custom/views/beesdoo_product.xml +++ b/beesdoo_custom/views/beesdoo_product.xml @@ -8,6 +8,7 @@ + From db627ed3c050920425b89b3b824833a3caf7cce7 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Thu, 18 Apr 2019 16:29:49 +0200 Subject: [PATCH 03/13] [IMP] beesdoo_custom: product as list rather than kanban --- beesdoo_custom/__openerp__.py | 2 ++ beesdoo_custom/views/beesdoo_product.xml | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/beesdoo_custom/__openerp__.py b/beesdoo_custom/__openerp__.py index b4c2eee..2b7975e 100644 --- a/beesdoo_custom/__openerp__.py +++ b/beesdoo_custom/__openerp__.py @@ -18,6 +18,8 @@ # any module necessary for this one to work correctly 'depends': [ 'beesdoo_product', + 'purchase', + 'easy_my_coop', # for product views ], # always loaded diff --git a/beesdoo_custom/views/beesdoo_product.xml b/beesdoo_custom/views/beesdoo_product.xml index e8379b7..57aaa0c 100644 --- a/beesdoo_custom/views/beesdoo_product.xml +++ b/beesdoo_custom/views/beesdoo_product.xml @@ -24,4 +24,17 @@ + + tree,form,kanban + + + + tree,form,kanban + + + + tree,form,kanban + + + From 865e7f807aa62b04d0aec4bdf413c668bc6789e4 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Sun, 5 Jan 2020 17:41:50 +0100 Subject: [PATCH 04/13] [ADD] beesdoo_custom: provider_reference on invoice_supplier_tree --- beesdoo_custom/__openerp__.py | 1 + beesdoo_custom/views/account_invoice.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 beesdoo_custom/views/account_invoice.xml diff --git a/beesdoo_custom/__openerp__.py b/beesdoo_custom/__openerp__.py index 2b7975e..fa36894 100644 --- a/beesdoo_custom/__openerp__.py +++ b/beesdoo_custom/__openerp__.py @@ -25,5 +25,6 @@ # always loaded 'data': [ 'views/beesdoo_product.xml', + 'views/account_invoice.xml', ], } diff --git a/beesdoo_custom/views/account_invoice.xml b/beesdoo_custom/views/account_invoice.xml new file mode 100644 index 0000000..a0abf6e --- /dev/null +++ b/beesdoo_custom/views/account_invoice.xml @@ -0,0 +1,17 @@ + + + + + invoice_supplier_tree + account.invoice + + + + + + + + From 4db32159286e1f5dc3e6cdcb22a8bd5dba5ae905 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Thu, 9 Jan 2020 16:26:43 +0100 Subject: [PATCH 05/13] [IMP] beesdoo_custom: rename "reference fournisseur" to "communication" --- beesdoo_custom/views/account_invoice.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/beesdoo_custom/views/account_invoice.xml b/beesdoo_custom/views/account_invoice.xml index a0abf6e..aa27c58 100644 --- a/beesdoo_custom/views/account_invoice.xml +++ b/beesdoo_custom/views/account_invoice.xml @@ -12,6 +12,9 @@ + + Communication + From fa915870fa6aa0bee2dc9d6c589b49b804ef7d44 Mon Sep 17 00:00:00 2001 From: "robin.keunen" Date: Fri, 17 Jan 2020 16:51:36 +0100 Subject: [PATCH 06/13] [IMP] beesdoo_custom: consistent naming accross views and filters --- beesdoo_custom/__openerp__.py | 1 - beesdoo_custom/views/account_invoice.xml | 20 -------------------- 2 files changed, 21 deletions(-) delete mode 100644 beesdoo_custom/views/account_invoice.xml diff --git a/beesdoo_custom/__openerp__.py b/beesdoo_custom/__openerp__.py index fa36894..2b7975e 100644 --- a/beesdoo_custom/__openerp__.py +++ b/beesdoo_custom/__openerp__.py @@ -25,6 +25,5 @@ # always loaded 'data': [ 'views/beesdoo_product.xml', - 'views/account_invoice.xml', ], } diff --git a/beesdoo_custom/views/account_invoice.xml b/beesdoo_custom/views/account_invoice.xml deleted file mode 100644 index aa27c58..0000000 --- a/beesdoo_custom/views/account_invoice.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - invoice_supplier_tree - account.invoice - - - - - - - Communication - - - - From a2b14b9688ba8bb036957ee5b595bed7ffcd36ff Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Tue, 28 Jan 2020 11:57:11 +0100 Subject: [PATCH 07/13] [MIG] beesdoo_custom: Migration to 10.0 --- beesdoo_custom/{__openerp__.py => __manifest__.py} | 2 +- beesdoo_custom/models/beesdoo_product.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename beesdoo_custom/{__openerp__.py => __manifest__.py} (96%) diff --git a/beesdoo_custom/__openerp__.py b/beesdoo_custom/__manifest__.py similarity index 96% rename from beesdoo_custom/__openerp__.py rename to beesdoo_custom/__manifest__.py index 2b7975e..85daf48 100644 --- a/beesdoo_custom/__openerp__.py +++ b/beesdoo_custom/__manifest__.py @@ -13,7 +13,7 @@ # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml # for the full list 'category': 'Sales Management', - 'version': '0.1', + 'version': '10.0.1.0.0', # any module necessary for this one to work correctly 'depends': [ diff --git a/beesdoo_custom/models/beesdoo_product.py b/beesdoo_custom/models/beesdoo_product.py index d7af564..9eae65e 100644 --- a/beesdoo_custom/models/beesdoo_product.py +++ b/beesdoo_custom/models/beesdoo_product.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from openerp import models, fields, api +from odoo import models, fields, api class BeesdooProduct(models.Model): From 1ee245f2dc0c91fcc95cd1c3fe66904f9ba0ddfc Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Tue, 28 Jan 2020 11:59:22 +0100 Subject: [PATCH 08/13] [MIG] beesdoo_custom: Migration to 11.0 --- beesdoo_custom/__manifest__.py | 3 +-- beesdoo_custom/models/beesdoo_product.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/beesdoo_custom/__manifest__.py b/beesdoo_custom/__manifest__.py index 85daf48..2814ff3 100644 --- a/beesdoo_custom/__manifest__.py +++ b/beesdoo_custom/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- { 'name': "beesdoo_custom", @@ -13,7 +12,7 @@ # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml # for the full list 'category': 'Sales Management', - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', # any module necessary for this one to work correctly 'depends': [ diff --git a/beesdoo_custom/models/beesdoo_product.py b/beesdoo_custom/models/beesdoo_product.py index 9eae65e..884483b 100644 --- a/beesdoo_custom/models/beesdoo_product.py +++ b/beesdoo_custom/models/beesdoo_product.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from odoo import models, fields, api From 630ccdee3ce457960abfbd9ccda6b4feead4a828 Mon Sep 17 00:00:00 2001 From: Cyrille Bollu Date: Tue, 28 Jan 2020 12:01:11 +0100 Subject: [PATCH 09/13] [MIG] beesdoo_custom: Migration to 12.0 --- beesdoo_custom/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beesdoo_custom/__manifest__.py b/beesdoo_custom/__manifest__.py index 2814ff3..452518c 100644 --- a/beesdoo_custom/__manifest__.py +++ b/beesdoo_custom/__manifest__.py @@ -12,7 +12,7 @@ # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml # for the full list 'category': 'Sales Management', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', # any module necessary for this one to work correctly 'depends': [ From 635808b53967e5245e79a7ccf8735904302b3ac0 Mon Sep 17 00:00:00 2001 From: Vincent Van Rossem Date: Thu, 16 Apr 2020 17:49:16 +0200 Subject: [PATCH 10/13] [FIX] beesdoo_custom: missing dependency and renamed fields --- beesdoo_custom/__manifest__.py | 1 + beesdoo_custom/views/beesdoo_product.xml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/beesdoo_custom/__manifest__.py b/beesdoo_custom/__manifest__.py index 452518c..9ecdc08 100644 --- a/beesdoo_custom/__manifest__.py +++ b/beesdoo_custom/__manifest__.py @@ -17,6 +17,7 @@ # any module necessary for this one to work correctly 'depends': [ 'beesdoo_product', + 'beesdoo_stock_coverage', 'purchase', 'easy_my_coop', # for product views ], diff --git a/beesdoo_custom/views/beesdoo_product.xml b/beesdoo_custom/views/beesdoo_product.xml index 57aaa0c..045c2de 100644 --- a/beesdoo_custom/views/beesdoo_product.xml +++ b/beesdoo_custom/views/beesdoo_product.xml @@ -17,9 +17,9 @@ - - - + + + From 559329b01d91e41debee31a59c1f17788eec99e6 Mon Sep 17 00:00:00 2001 From: Vincent Van Rossem Date: Thu, 16 Apr 2020 18:10:58 +0200 Subject: [PATCH 11/13] [FIX] beesdoo_custom: XML external ID product -> stock --- beesdoo_custom/views/beesdoo_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beesdoo_custom/views/beesdoo_product.xml b/beesdoo_custom/views/beesdoo_product.xml index 045c2de..87cbf32 100644 --- a/beesdoo_custom/views/beesdoo_product.xml +++ b/beesdoo_custom/views/beesdoo_product.xml @@ -32,7 +32,7 @@ tree,form,kanban - + tree,form,kanban From 1c9fe6395c5766e6c23a437194471a55b0eb4d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Wed, 6 May 2020 22:25:45 +0200 Subject: [PATCH 12/13] [IMP] b_custom: manifest --- beesdoo_custom/__manifest__.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/beesdoo_custom/__manifest__.py b/beesdoo_custom/__manifest__.py index 9ecdc08..a327028 100644 --- a/beesdoo_custom/__manifest__.py +++ b/beesdoo_custom/__manifest__.py @@ -1,28 +1,22 @@ +# Copyright 2017 - 2020 BEES coop SCRLfs +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': "beesdoo_custom", + 'name': "BEES coop Custom", 'description': """ - View and field definition specific to BEES' needs. + View and field definition specific to BEES' needs. """, - 'author': "Beescoop - Cellule IT", + 'author': "Beescoop - Cellule IT, Coop IT Easy", 'website': "https://github.com/beescoop/Obeesdoo", - - # Categories can be used to filter modules in modules listing - # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml - # for the full list 'category': 'Sales Management', 'version': '12.0.1.0.0', - - # any module necessary for this one to work correctly 'depends': [ 'beesdoo_product', 'beesdoo_stock_coverage', 'purchase', - 'easy_my_coop', # for product views + 'easy_my_coop', # for product views ], - - # always loaded 'data': [ 'views/beesdoo_product.xml', ], From 5dc4f7b2b4b8f42de64be676e98a1da650054992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Taymans?= Date: Mon, 11 May 2020 18:05:55 +0200 Subject: [PATCH 13/13] [CHG] b_custom -> b_product_usability --- .../__init__.py | 0 .../__manifest__.py | 9 ++++----- .../models/__init__.py | 0 .../models/beesdoo_product.py | 0 .../views/beesdoo_product.xml | 0 5 files changed, 4 insertions(+), 5 deletions(-) rename {beesdoo_custom => beesdoo_product_usability}/__init__.py (100%) rename {beesdoo_custom => beesdoo_product_usability}/__manifest__.py (73%) rename {beesdoo_custom => beesdoo_product_usability}/models/__init__.py (100%) rename {beesdoo_custom => beesdoo_product_usability}/models/beesdoo_product.py (100%) rename {beesdoo_custom => beesdoo_product_usability}/views/beesdoo_product.xml (100%) diff --git a/beesdoo_custom/__init__.py b/beesdoo_product_usability/__init__.py similarity index 100% rename from beesdoo_custom/__init__.py rename to beesdoo_product_usability/__init__.py diff --git a/beesdoo_custom/__manifest__.py b/beesdoo_product_usability/__manifest__.py similarity index 73% rename from beesdoo_custom/__manifest__.py rename to beesdoo_product_usability/__manifest__.py index a327028..8709982 100644 --- a/beesdoo_custom/__manifest__.py +++ b/beesdoo_product_usability/__manifest__.py @@ -1,11 +1,11 @@ # Copyright 2017 - 2020 BEES coop SCRLfs # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': "BEES coop Custom", + 'name': "BEES coop Product Usability", 'description': """ - View and field definition specific to BEES' needs. - """, + Adapt the + """, 'author': "Beescoop - Cellule IT, Coop IT Easy", 'website': "https://github.com/beescoop/Obeesdoo", @@ -14,8 +14,7 @@ 'depends': [ 'beesdoo_product', 'beesdoo_stock_coverage', - 'purchase', - 'easy_my_coop', # for product views + 'beesdoo_purchase', ], 'data': [ 'views/beesdoo_product.xml', diff --git a/beesdoo_custom/models/__init__.py b/beesdoo_product_usability/models/__init__.py similarity index 100% rename from beesdoo_custom/models/__init__.py rename to beesdoo_product_usability/models/__init__.py diff --git a/beesdoo_custom/models/beesdoo_product.py b/beesdoo_product_usability/models/beesdoo_product.py similarity index 100% rename from beesdoo_custom/models/beesdoo_product.py rename to beesdoo_product_usability/models/beesdoo_product.py diff --git a/beesdoo_custom/views/beesdoo_product.xml b/beesdoo_product_usability/views/beesdoo_product.xml similarity index 100% rename from beesdoo_custom/views/beesdoo_product.xml rename to beesdoo_product_usability/views/beesdoo_product.xml