From f9a74758413d86faaad0e8a78a8605df564002b9 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 2 Jan 2024 13:18:17 +0100 Subject: [PATCH 001/100] [MIG] pos_receipt_clientinfo: Migration to 16.0 --- pos_receipt_clientinfo/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_receipt_clientinfo/__manifest__.py b/pos_receipt_clientinfo/__manifest__.py index d18c67b..ee59234 100644 --- a/pos_receipt_clientinfo/__manifest__.py +++ b/pos_receipt_clientinfo/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Pos Receipt Clientinfo', 'description': """ Adds a report to print a simplified invoice with client tax data""", - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'license': 'AGPL-3', 'author': 'Criptomart', 'website': 'https://criptomart.net', From 8fb784bdc32f94525d13c2a056457b1b1dab0ef9 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 2 Jan 2024 14:53:07 +0100 Subject: [PATCH 002/100] [MIG] pos_ticket_pricelist: Migration to 16.0 --- pos_ticket_pricelist/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_ticket_pricelist/__manifest__.py b/pos_ticket_pricelist/__manifest__.py index bcb4d1b..73c962f 100644 --- a/pos_ticket_pricelist/__manifest__.py +++ b/pos_ticket_pricelist/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Pos Ticket Pricelist', 'description': """ Prints the pricelist applied on tickets.""", - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'license': 'AGPL-3', 'author': 'Criptomart', 'website': 'https://criptomart.net', From 9846c183ec76d7421cedc29d5efc2b44759ecf1c Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 003/100] [MIG] website_search_products: Migration to 16.0 --- pos_ticket_pricelist/__manifest__.py | 9 ++++-- pos_ticket_pricelist/static/src/xml/pos.xml | 31 +++++++++---------- website_search_products/__manifest__.py | 2 +- .../controllers/controller.py | 3 +- website_search_products/models/stock_move.py | 1 - 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pos_ticket_pricelist/__manifest__.py b/pos_ticket_pricelist/__manifest__.py index 73c962f..3c64ab3 100644 --- a/pos_ticket_pricelist/__manifest__.py +++ b/pos_ticket_pricelist/__manifest__.py @@ -10,12 +10,15 @@ 'author': 'Criptomart', 'website': 'https://criptomart.net', 'depends': [ + "point_of_sale" ], 'data': [ ], - 'qweb': [ - 'static/src/xml/pos.xml', - ], + 'assets': { + 'point_of_sale.assets': [ + 'pos_ticket_pricelist/static/src/xml/pos.xml' + ], + }, 'demo': [ ], } diff --git a/pos_ticket_pricelist/static/src/xml/pos.xml b/pos_ticket_pricelist/static/src/xml/pos.xml index 4aa5aee..ff511c6 100644 --- a/pos_ticket_pricelist/static/src/xml/pos.xml +++ b/pos_ticket_pricelist/static/src/xml/pos.xml @@ -1,21 +1,20 @@ - - - - -
- -

+ + + + +
- - - - - - -
- - + + + {'oe_hidden': True} + + diff --git a/website_search_products/__manifest__.py b/website_search_products/__manifest__.py index 9f95ae0..dc4a66d 100644 --- a/website_search_products/__manifest__.py +++ b/website_search_products/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Website Search Products', 'description': """ Allows portal users to search products in a table with filters.""", - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'license': 'AGPL-3', 'author': 'Criptomart', 'website': 'https://criptomart.net', diff --git a/website_search_products/controllers/controller.py b/website_search_products/controllers/controller.py index 463cb5e..62d49f1 100644 --- a/website_search_products/controllers/controller.py +++ b/website_search_products/controllers/controller.py @@ -1,5 +1,4 @@ - # -*- coding: utf-8 -*- -from odoo import http + from odoo import http from odoo.http import request from odoo.addons.website.controllers.main import Website diff --git a/website_search_products/models/stock_move.py b/website_search_products/models/stock_move.py index 81f9b07..892f915 100644 --- a/website_search_products/models/stock_move.py +++ b/website_search_products/models/stock_move.py @@ -10,7 +10,6 @@ _logger = logging.getLogger(__name__) class StockMove(models.Model): _inherit = 'stock.move' - @api.multi def get_stock_moves_by_product(self, date_begin, date_end, location): if date_begin and date_end: From 27386c71cc69270862b1c47cfc4a5d6705069411 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 004/100] [MIG] product_category_default_pos_cat: Migration to 16.0 --- product_category_default_pos_cat/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_category_default_pos_cat/__manifest__.py b/product_category_default_pos_cat/__manifest__.py index 22438bc..63b0ddf 100644 --- a/product_category_default_pos_cat/__manifest__.py +++ b/product_category_default_pos_cat/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Product Category Default PoS Category', - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'author': "Criptomart", 'website': 'https://github.com/criptomart/obook', 'license': 'AGPL-3', From 9434c90457d48b6cb081edead4815508fd86d920 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 005/100] [MIG] purchase_collective: Migration to 16.0 --- purchase_collective/__manifest__.py | 2 +- purchase_collective/models/purchase_collective.py | 3 --- purchase_collective/models/sale_order.py | 1 - .../security/purchase_collective_security.xml | 6 ++---- purchase_collective/views/actions.xml | 3 --- purchase_collective/views/partner_net_views.xml | 2 +- purchase_collective/views/partner_node_views.xml | 2 +- purchase_collective/views/purchase_collective.xml | 2 +- purchase_collective/views/sale_order.xml | 2 +- 9 files changed, 7 insertions(+), 16 deletions(-) diff --git a/purchase_collective/__manifest__.py b/purchase_collective/__manifest__.py index 47c99f6..9df04a0 100644 --- a/purchase_collective/__manifest__.py +++ b/purchase_collective/__manifest__.py @@ -19,7 +19,7 @@ El Usuario que crea la orden es el encargado de distribuir los productos al rest 'author': "Criptomart", 'website': "https://criptomart.net", 'category': 'Purchase Management', - 'version': '0.12.0.1.0', + 'version': "16.0.1.0.0", 'depends': ["purchase","sale","product","network_partner"], 'data': [ 'security/purchase_collective_security.xml', diff --git a/purchase_collective/models/purchase_collective.py b/purchase_collective/models/purchase_collective.py index 6472888..51deaaf 100644 --- a/purchase_collective/models/purchase_collective.py +++ b/purchase_collective/models/purchase_collective.py @@ -7,7 +7,6 @@ from operator import attrgetter from odoo import models, fields, api, osv, _ from odoo.exceptions import Warning from odoo.tools.safe_eval import safe_eval as eval -import odoo.addons.decimal_precision as dp _logger = logging.getLogger(__name__) @@ -59,12 +58,10 @@ class PurchaseCollectiveOrder(models.Model): return res - @api.multi def subscribe(self, partner): self.message_subscribe(partner_ids=[(partner.id)]) self.message_post(body=("Order line created by %s" %(partner.name))) - @api.multi def button_details(self): context = self.env.context.copy() view_id = self.env.ref( diff --git a/purchase_collective/models/sale_order.py b/purchase_collective/models/sale_order.py index d7c3078..b5ee05b 100644 --- a/purchase_collective/models/sale_order.py +++ b/purchase_collective/models/sale_order.py @@ -15,7 +15,6 @@ class SaleOrder(models.Model): ) is_cp = fields.Boolean(string="Is part of a Collective Purchase") - @api.multi def action_confirm(self): for order in self: order.warehouse_id = order.partner_id.node_id.wh_id diff --git a/purchase_collective/security/purchase_collective_security.xml b/purchase_collective/security/purchase_collective_security.xml index ecd966e..e694ea6 100644 --- a/purchase_collective/security/purchase_collective_security.xml +++ b/purchase_collective/security/purchase_collective_security.xml @@ -1,6 +1,5 @@ - - + Collective Purchase @@ -44,5 +43,4 @@ - - + diff --git a/purchase_collective/views/actions.xml b/purchase_collective/views/actions.xml index 41b7da3..030e67a 100644 --- a/purchase_collective/views/actions.xml +++ b/purchase_collective/views/actions.xml @@ -5,7 +5,6 @@ Open ir.actions.act_window purchase_collective.order - form tree,form { 'search_default_my_sale_orders_filter': 1 @@ -22,7 +21,6 @@ Closed ir.actions.act_window purchase_collective.order - form tree,form { 'search_default_my_sale_orders_filter': 1 @@ -39,7 +37,6 @@ Cancelled ir.actions.act_window purchase_collective.order - form tree,form { 'search_default_my_sale_orders_filter': 1 diff --git a/purchase_collective/views/partner_net_views.xml b/purchase_collective/views/partner_net_views.xml index 9c67e3d..b88ad30 100644 --- a/purchase_collective/views/partner_net_views.xml +++ b/purchase_collective/views/partner_net_views.xml @@ -1,6 +1,6 @@ - + partner.net.form.wh.view diff --git a/purchase_collective/views/partner_node_views.xml b/purchase_collective/views/partner_node_views.xml index a6eb246..4a28462 100644 --- a/purchase_collective/views/partner_node_views.xml +++ b/purchase_collective/views/partner_node_views.xml @@ -1,6 +1,6 @@ - + partner.node.form.wh.view diff --git a/purchase_collective/views/purchase_collective.xml b/purchase_collective/views/purchase_collective.xml index dc83760..763d16c 100644 --- a/purchase_collective/views/purchase_collective.xml +++ b/purchase_collective/views/purchase_collective.xml @@ -1,5 +1,5 @@ - + purchase.collective.order.form.view diff --git a/purchase_collective/views/sale_order.xml b/purchase_collective/views/sale_order.xml index a5a0b1c..c1ef456 100644 --- a/purchase_collective/views/sale_order.xml +++ b/purchase_collective/views/sale_order.xml @@ -1,6 +1,6 @@ - + sale order collective purchase extension sale.order From 0d34939bf4700489b176dff5f11b890dc718a066 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 006/100] [MIG] network_partner: Migration to 16.0 --- network_partner/__manifest__.py | 2 +- network_partner/security/network_partner_security.xml | 2 +- network_partner/views/actions.xml | 2 -- network_partner/views/menus.xml | 2 +- network_partner/views/partner_net_views.xml | 2 +- network_partner/views/partner_node_views.xml | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/network_partner/__manifest__.py b/network_partner/__manifest__.py index 0a736fd..e840c9b 100644 --- a/network_partner/__manifest__.py +++ b/network_partner/__manifest__.py @@ -16,7 +16,7 @@ No proporciona funcionalidad por sí mismo, se usará luego en otros módulos. 'author': 'Criptomart', 'website': "https://criptomart.net", 'category': 'Contacts', - 'version': '12.0.1.0', + 'version': "16.0.1.0.0", 'license': 'AGPL-3', 'depends': ['base','stock'], 'data': [ diff --git a/network_partner/security/network_partner_security.xml b/network_partner/security/network_partner_security.xml index ee1ebad..6b3a9a8 100644 --- a/network_partner/security/network_partner_security.xml +++ b/network_partner/security/network_partner_security.xml @@ -1,6 +1,6 @@ - + Network Partner module access diff --git a/network_partner/views/actions.xml b/network_partner/views/actions.xml index 5ccf0b5..37d898c 100644 --- a/network_partner/views/actions.xml +++ b/network_partner/views/actions.xml @@ -5,7 +5,6 @@ Networks ir.actions.act_window partner.network - form tree,form { } @@ -19,7 +18,6 @@ Nodes ir.actions.act_window partner.node - form tree,form { } diff --git a/network_partner/views/menus.xml b/network_partner/views/menus.xml index 24c451d..84e3f2a 100644 --- a/network_partner/views/menus.xml +++ b/network_partner/views/menus.xml @@ -1,5 +1,5 @@ - + - + partner.network.nets.form diff --git a/network_partner/views/partner_node_views.xml b/network_partner/views/partner_node_views.xml index a44ed34..7191d75 100644 --- a/network_partner/views/partner_node_views.xml +++ b/network_partner/views/partner_node_views.xml @@ -1,6 +1,6 @@ - + partner.network.node.form From 6ecf2812a0a1fc7b56838d8d94fae82a0b7fa1c9 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 007/100] [MIG] product_update_price_last_purchase: Migration to 16.0 --- product_update_price_last_purchase/__manifest__.py | 2 +- .../models/ir_actions_report.py | 1 - .../models/product_pricelist.py | 1 - .../models/product_product.py | 4 +--- .../models/product_template.py | 7 ++----- product_update_price_last_purchase/models/res_config.py | 1 - product_update_price_last_purchase/models/stock_move.py | 1 - product_update_price_last_purchase/views/actions.xml | 1 - 8 files changed, 4 insertions(+), 14 deletions(-) diff --git a/product_update_price_last_purchase/__manifest__.py b/product_update_price_last_purchase/__manifest__.py index 2aa78df..8e94770 100644 --- a/product_update_price_last_purchase/__manifest__.py +++ b/product_update_price_last_purchase/__manifest__.py @@ -1,6 +1,6 @@ { 'name': 'Product Update Price From Last Purchase', - 'version': '12.0.2.1.0', + 'version': "16.0.1.0.0", 'category': 'purchase', 'summary' : 'Product Update Price From Last Purchase', 'description' : """ diff --git a/product_update_price_last_purchase/models/ir_actions_report.py b/product_update_price_last_purchase/models/ir_actions_report.py index b8bf3eb..4faf6d1 100644 --- a/product_update_price_last_purchase/models/ir_actions_report.py +++ b/product_update_price_last_purchase/models/ir_actions_report.py @@ -7,7 +7,6 @@ _logger = logging.getLogger(__name__) class IrActionsReport(models.Model): _inherit = 'ir.actions.report' - @api.multi def render_qweb_pdf(self, res_ids=None, data=None): _logger.debug("render_qweb_pdf : %s -- %s" %(res_ids, data)) if res_ids: diff --git a/product_update_price_last_purchase/models/product_pricelist.py b/product_update_price_last_purchase/models/product_pricelist.py index e568758..15ffb29 100644 --- a/product_update_price_last_purchase/models/product_pricelist.py +++ b/product_update_price_last_purchase/models/product_pricelist.py @@ -8,7 +8,6 @@ from odoo import api, models class ProductPricelist(models.Model): _inherit = 'product.pricelist' - @api.multi def _compute_price_rule(self, products_qty_partner, date=False, uom_id=False): ProductPricelistItem = self.env['product.pricelist.item'] ProductProduct = self.env['product.product'] diff --git a/product_update_price_last_purchase/models/product_product.py b/product_update_price_last_purchase/models/product_product.py index 51baf7d..aa2d836 100644 --- a/product_update_price_last_purchase/models/product_product.py +++ b/product_update_price_last_purchase/models/product_product.py @@ -5,14 +5,12 @@ import logging from odoo import models, fields, api -from odoo.addons import decimal_precision as dp _logger = logging.getLogger(__name__) class ProductProduct(models.Model): _inherit = "product.product" - @api.multi def write(self, vals): if vals.get('last_purchase_price'): vals['list_price_updated'] = True @@ -22,5 +20,5 @@ class ProductProduct(models.Model): class ProductPackaging(models.Model): _inherit = "product.packaging" - qty = fields.Float('Contained Quantity', help="The total number of products you can have per pallet or box.", digits=dp.get_precision('Product Unit of Measure')) + qty = fields.Float('Contained Quantity', help="The total number of products you can have per pallet or box.", digits='Product Unit of Measure') diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py index fdaab14..d94e7e1 100644 --- a/product_update_price_last_purchase/models/product_template.py +++ b/product_update_price_last_purchase/models/product_template.py @@ -7,14 +7,12 @@ import math from odoo import exceptions, models, fields, api, _ from odoo.exceptions import UserError -from odoo.addons import decimal_precision as dp _logger = logging.getLogger(__name__) class ProductTemplate(models.Model): _inherit = "product.template" - @api.multi def _compute_theoritical_price(self): partner = self.env['res.users'].browse(self.env.uid).partner_id pricelist_obj = self.env['product.pricelist'] @@ -41,7 +39,7 @@ class ProductTemplate(models.Model): list_price = fields.Float( string="Sale price with VAT", help="Price calculated according to the configured pricelist, including VAT.", - digits=dp.get_precision('Product Price') + digits='Product Price' ) list_price_updated = fields.Boolean( @@ -68,7 +66,7 @@ class ProductTemplate(models.Model): string="Last purchase price", help="The last price at which the product was purchased. It is used as the base price field for calculating the product sale price.", #readonly=True, - digits=dp.get_precision('Product Price') + digits='Product Price' ) last_purchase_price_compute_type = fields.Selection([ @@ -95,7 +93,6 @@ class ProductTemplate(models.Model): vals['list_price_updated'] = True return super(ProductTemplate, self).create(vals) - @api.multi def write(self, vals): # Set supplier tax same than customer tax if vals.get('taxes_id'): diff --git a/product_update_price_last_purchase/models/res_config.py b/product_update_price_last_purchase/models/res_config.py index 338ad5c..5aa1510 100644 --- a/product_update_price_last_purchase/models/res_config.py +++ b/product_update_price_last_purchase/models/res_config.py @@ -18,7 +18,6 @@ class ResConfigSettings(models.TransientModel): "product_update_price_last_purchase.product_pricelist_automatic", default=0) return res - @api.multi def set_values(self): super(ResConfigSettings, self).set_values() config_obj = self.env["ir.config_parameter"] diff --git a/product_update_price_last_purchase/models/stock_move.py b/product_update_price_last_purchase/models/stock_move.py index b254f54..41a0b5e 100644 --- a/product_update_price_last_purchase/models/stock_move.py +++ b/product_update_price_last_purchase/models/stock_move.py @@ -16,7 +16,6 @@ _logger = logging.getLogger(__name__) class StockMove(models.Model): _inherit = 'stock.move' - @api.multi def product_price_update_before_done(self): super(StockMove, self).product_price_update_before_done() for move in self.filtered(lambda move: move.location_id.usage == 'supplier'): diff --git a/product_update_price_last_purchase/views/actions.xml b/product_update_price_last_purchase/views/actions.xml index bf22acc..b95ef88 100644 --- a/product_update_price_last_purchase/views/actions.xml +++ b/product_update_price_last_purchase/views/actions.xml @@ -23,7 +23,6 @@ Productos con PVP actualizable ir.actions.act_window product.template - form tree,form [] From e5699203dc5d35dcfbe810a6107bd861d4cb14a9 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 008/100] [MIG] cm_must_have: Migration to 16.0 --- cm_must_have/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cm_must_have/__manifest__.py b/cm_must_have/__manifest__.py index 89a8e94..3db494a 100644 --- a/cm_must_have/__manifest__.py +++ b/cm_must_have/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Criptomart - Must Have Modules", "summary": "Install must have modules", - "version": "12.0.0.0.1", + "version": "16.0.1.0.0", "category": "CriptoMart - Custom", "author": "Criptmart", "website": "https://github.com/criptomart", From 5b0c8adec01d2983cf6fab47910879bbb82ffa3c Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 009/100] [MIG] product_category_tax: Migration to 16.0 --- product_category_tax/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_category_tax/__manifest__.py b/product_category_tax/__manifest__.py index 2383ec5..67f4a7a 100644 --- a/product_category_tax/__manifest__.py +++ b/product_category_tax/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Product Category Tax', - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'author': "Criptomart", 'website': 'https://github.com/criptomart/obook', 'license': 'AGPL-3', From 40b9ebc45266856257bcdbe0356038aaec4ba2f6 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 010/100] [MIG] product_category_default_ecommerce_cat: Migration to 16.0 --- product_category_default_ecommerce_cat/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product_category_default_ecommerce_cat/__manifest__.py b/product_category_default_ecommerce_cat/__manifest__.py index f22505c..b81d5ca 100644 --- a/product_category_default_ecommerce_cat/__manifest__.py +++ b/product_category_default_ecommerce_cat/__manifest__.py @@ -4,7 +4,7 @@ { 'name': 'Product Category Default e-commerce Category', 'summary': "Set up default public categories based in internal category.", - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'author': "Criptomart", 'website': 'https://criptomart.net', 'license': 'AGPL-3', From 61ed3eeb3eb78449c379d48f2e9df3e6be9fe02f Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 011/100] [MIG] stock_inventory_cost_info_sum: Migration to 16.0 --- stock_inventory_cost_info_sum/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_inventory_cost_info_sum/__manifest__.py b/stock_inventory_cost_info_sum/__manifest__.py index 152ce51..40937df 100644 --- a/stock_inventory_cost_info_sum/__manifest__.py +++ b/stock_inventory_cost_info_sum/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Stock Inventory Cost Info Sum', 'description': """ Extends the OCA module stock_inventory_cost_info to store in the Inventory model the sum of the cost information of the inventory lines. This allows exporting and filtering by this field in the inventory adjustments tree view without having to export each inventory line.""", - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'license': 'AGPL-3', 'author': 'Criptomart', 'website': 'https://criptomart.net', From 66939b4989bfa3a60d32a6a07ec80a188832103a Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 012/100] [MIG] website_sale_product_sort_creation_date: Migration to 16.0 --- website_sale_product_sort_creation_date/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_sale_product_sort_creation_date/__manifest__.py b/website_sale_product_sort_creation_date/__manifest__.py index 1a24024..0e96ea8 100644 --- a/website_sale_product_sort_creation_date/__manifest__.py +++ b/website_sale_product_sort_creation_date/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Website Sale Product Sort Creation Date', 'summary': 'Permite ordenar por la fecha de creación de los productos.', - 'version': '12.0.1.0.1', + 'version': "16.0.1.0.0", 'development_status': 'Beta', 'category': 'Website', 'website': 'https://github.com/criptomart/obook', From f9d660c245d60b6f9c8e5d7f0c3b3d81a8ce1c07 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 11 Jan 2024 10:42:00 +0100 Subject: [PATCH 013/100] [MIG] pos_picking_load_selected_partner: Migration to 16.0 --- pos_picking_load_selected_partner/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_picking_load_selected_partner/__manifest__.py b/pos_picking_load_selected_partner/__manifest__.py index 5b466d0..e3727e8 100644 --- a/pos_picking_load_selected_partner/__manifest__.py +++ b/pos_picking_load_selected_partner/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Pos Picking Load Selected Partner', 'description': """ If a partner is selected in the PoS Order as client, search only the pickings related to this partner.""", - 'version': '12.0.1.0.0', + 'version': "16.0.1.0.0", 'license': 'AGPL-3', 'author': 'Criptomart', 'website': 'https://criptomart.net', From 1bd3fab4dc3d754059decd6b735082ea2f458f7d Mon Sep 17 00:00:00 2001 From: luis Date: Mon, 15 Jan 2024 20:25:34 +0100 Subject: [PATCH 014/100] #15 new module product_update_price_last_purchase based on product_margin_classification to update sell prices on products when purchase price changes. --- .../__init__.py | 2 - .../__manifest__.py | 49 +++-- .../data/report_paperformat.xml | 20 -- .../models/__init__.py | 4 - .../models/ir_actions_report.py | 21 -- .../models/product_pricelist.py | 25 --- .../models/product_pricelist_item.py | 12 -- .../models/product_product.py | 47 ++++- .../models/product_template.py | 182 +++++++----------- .../models/res_company.py | 17 -- .../models/res_config.py | 36 +--- .../models/stock_move.py | 58 ++++-- .../report/product_barcode.xml | 74 ------- .../report/report_product_barcode.xml | 35 ---- .../report/report_product_shelf_tag.xml | 44 ----- .../views/actions.xml | 12 +- .../views/product_view.xml | 145 ++++++-------- .../views/res_config.xml | 32 +++ 18 files changed, 279 insertions(+), 536 deletions(-) delete mode 100644 product_update_price_last_purchase/data/report_paperformat.xml delete mode 100644 product_update_price_last_purchase/models/ir_actions_report.py delete mode 100644 product_update_price_last_purchase/models/product_pricelist.py delete mode 100644 product_update_price_last_purchase/models/product_pricelist_item.py delete mode 100644 product_update_price_last_purchase/models/res_company.py delete mode 100644 product_update_price_last_purchase/report/product_barcode.xml delete mode 100644 product_update_price_last_purchase/report/report_product_barcode.xml delete mode 100644 product_update_price_last_purchase/report/report_product_shelf_tag.xml create mode 100644 product_update_price_last_purchase/views/res_config.xml diff --git a/product_update_price_last_purchase/__init__.py b/product_update_price_last_purchase/__init__.py index 2ed39cb..0650744 100644 --- a/product_update_price_last_purchase/__init__.py +++ b/product_update_price_last_purchase/__init__.py @@ -1,3 +1 @@ from . import models -from . import report - diff --git a/product_update_price_last_purchase/__manifest__.py b/product_update_price_last_purchase/__manifest__.py index 8e94770..1159df3 100644 --- a/product_update_price_last_purchase/__manifest__.py +++ b/product_update_price_last_purchase/__manifest__.py @@ -1,32 +1,29 @@ { - 'name': 'Product Update Price From Last Purchase', - 'version': "16.0.1.0.0", - 'category': 'purchase', - 'summary' : 'Product Update Price From Last Purchase', - 'description' : """ + "name": "Product Update Price From Last Purchase", + "version": "16.0.1.0.0", + "category": "purchase", + "summary": """" Personaliza el comportamiento de Product para supermercados: - * setea los impuestos del proveedor al mismo tipo que el impuesto de venta. - * Actualiza el precio de venta según el precio de coste aplicado a una tarifa. - * Filtro para productos actualizados el precio de coste. + * Campo que guarda el último precio de compra en vez de usar standard_price + y no afectar a la valoración de inventario. + * Actualiza el precio de venta según el último precio de coste aplicado a una tarifa. + * Filtro para productos actualizados el último precio de coste. * Filtro para productos que necesitan etiqueta nueva. - * Campo que guarda el último precio de compra en vez de usar standard_price y no afectar a la valoración de inventario. - """, - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'license': 'AGPL-3', - 'depends': [ - 'base', - 'product', - 'account', - 'stock_account', + """, + "author": "Criptomart", + "website": "https://criptomart.net", + "license": "AGPL-3", + "depends": [ + "account", + "stock_account", + "sale", + "product_margin_classification", + "product_print_category", ], - 'data': [ - 'views/actions.xml', - 'views/product_view.xml', - 'data/report_paperformat.xml', - 'report/report_product_shelf_tag.xml', - #'report/report_product_barcode.xml', - #'report/product_barcode.xml' + "data": [ + "views/actions.xml", + "views/product_view.xml", + "views/res_config.xml", ], - 'installable': True, + "installable": True, } diff --git a/product_update_price_last_purchase/data/report_paperformat.xml b/product_update_price_last_purchase/data/report_paperformat.xml deleted file mode 100644 index 03e74be..0000000 --- a/product_update_price_last_purchase/data/report_paperformat.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Barcodes stickers format - - A4 - 0 - 0 - Portrait - 10 - 5 - 8 - 8 - - 0 - 75 - - - diff --git a/product_update_price_last_purchase/models/__init__.py b/product_update_price_last_purchase/models/__init__.py index e23f31b..6440ced 100644 --- a/product_update_price_last_purchase/models/__init__.py +++ b/product_update_price_last_purchase/models/__init__.py @@ -1,8 +1,4 @@ from . import product_template from . import product_product -from . import res_company from . import res_config -from . import ir_actions_report from . import stock_move -from . import product_pricelist -from . import product_pricelist_item diff --git a/product_update_price_last_purchase/models/ir_actions_report.py b/product_update_price_last_purchase/models/ir_actions_report.py deleted file mode 100644 index 4faf6d1..0000000 --- a/product_update_price_last_purchase/models/ir_actions_report.py +++ /dev/null @@ -1,21 +0,0 @@ -import logging - -from odoo import api, fields, models - -_logger = logging.getLogger(__name__) - -class IrActionsReport(models.Model): - _inherit = 'ir.actions.report' - - def render_qweb_pdf(self, res_ids=None, data=None): - _logger.debug("render_qweb_pdf : %s -- %s" %(res_ids, data)) - if res_ids: - Model = self.env[self.model] - record_ids = Model.browse(res_ids) - wk_record_ids = Model - for record_id in record_ids: - if self.report_name == "product.report_producttemplatelabel": - record_id.to_print = False - return super(IrActionsReport, self).render_qweb_pdf(res_ids, data) - - diff --git a/product_update_price_last_purchase/models/product_pricelist.py b/product_update_price_last_purchase/models/product_pricelist.py deleted file mode 100644 index 15ffb29..0000000 --- a/product_update_price_last_purchase/models/product_pricelist.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2020: Criptomart (https://criptomart.net) -# @author Santi Noreña () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import api, models - - -class ProductPricelist(models.Model): - _inherit = 'product.pricelist' - - def _compute_price_rule(self, products_qty_partner, date=False, uom_id=False): - ProductPricelistItem = self.env['product.pricelist.item'] - ProductProduct = self.env['product.product'] - res = super()._compute_price_rule(products_qty_partner, date=date, uom_id=uom_id) - new_res = res.copy() - item_id = [] - for product_id, values in res.items(): - if values[1]: - item_id = values[1] - if item_id: - item = ProductPricelistItem.browse(item_id) - if item.base == 'last_purchase_price': - product = ProductProduct.browse(product_id) - new_res[product_id] = (product.last_purchase_price, item_id) - return new_res diff --git a/product_update_price_last_purchase/models/product_pricelist_item.py b/product_update_price_last_purchase/models/product_pricelist_item.py deleted file mode 100644 index 36f1b80..0000000 --- a/product_update_price_last_purchase/models/product_pricelist_item.py +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2020: Criptomart (https://criptomart.net) -# @author Santi Noreña () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import fields, models - - -class ProductPricelistItem(models.Model): - _inherit = 'product.pricelist.item' - - base = fields.Selection(selection_add=[ - ('last_purchase_price', 'Last purchase price')]) diff --git a/product_update_price_last_purchase/models/product_product.py b/product_update_price_last_purchase/models/product_product.py index aa2d836..ca2d585 100644 --- a/product_update_price_last_purchase/models/product_product.py +++ b/product_update_price_last_purchase/models/product_product.py @@ -4,21 +4,54 @@ import logging -from odoo import models, fields, api +from odoo import api, fields, models _logger = logging.getLogger(__name__) + class ProductProduct(models.Model): _inherit = "product.product" - def write(self, vals): - if vals.get('last_purchase_price'): - vals['list_price_updated'] = True - return super(ProductProduct, self).write(vals) + @api.depends( + "standard_price", + "last_purchase_price_received", + "lst_price", + "margin_classification_id", + "margin_classification_id.markup", + "margin_classification_id.price_round", + "margin_classification_id.price_surcharge", + "product_tmpl_id.taxes_id", + "product_tmpl_id.list_price", + ) + def _compute_theoretical_multi(self): + res = super()._compute_theoretical_multi() + for product in self: + if product.last_purchase_price_received != 0: + ( + product.margin_state, + product.theoretical_price, + product.theoretical_difference, + ) = self._get_margin_info( + product.margin_classification_id, + product.taxes_id, + product.name, + product.last_purchase_price_received, + product.lst_price, + ) + return res + + def use_theoretical_price(self): + res = super().use_theoretical_price() + for product in self: + product.to_print_label = True + return res class ProductPackaging(models.Model): _inherit = "product.packaging" - qty = fields.Float('Contained Quantity', help="The total number of products you can have per pallet or box.", digits='Product Unit of Measure') - + qty = fields.Float( + "Contained Quantity", + help="The total number of products you can have per pallet or box.", + digits="Product Unit of Measure", + ) diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py index d94e7e1..a6c766e 100644 --- a/product_update_price_last_purchase/models/product_template.py +++ b/product_update_price_last_purchase/models/product_template.py @@ -3,136 +3,88 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). import logging -import math -from odoo import exceptions, models, fields, api, _ -from odoo.exceptions import UserError +from odoo import api, fields, models _logger = logging.getLogger(__name__) +MARGIN_STATE_SELECTION = [ + ("correct", "Correct Margin"), + ("too_cheap", "Too Cheap"), + ("too_expensive", "Too Expensive"), +] + + class ProductTemplate(models.Model): _inherit = "product.template" - def _compute_theoritical_price(self): - partner = self.env['res.users'].browse(self.env.uid).partner_id - pricelist_obj = self.env['product.pricelist'] - pricelist_id = self.env['ir.config_parameter'].sudo().get_param('product_update_price_last_purchase.product_pricelist_automatic') or False - pricelist = pricelist_obj.browse(int(pricelist_id)) - _logger.debug("Calculating price with PriceList : %s" %pricelist.name) - if pricelist: - for template in self: - if template.name and template.id and template.product_variant_id and template.last_purchase_price_compute_type != 'manual_update': - partial_price = pricelist.get_product_price(template.product_variant_id, "1", partner) - _logger.debug("partial_price : %s" %partial_price) - # Suma el IVA - for tax in template.taxes_id: - partial_price = partial_price * ( 1 + ( tax.amount / 100) ) - _logger.debug("partial_price after taxes : %s" %partial_price) - # Redondea a 0,05 de precisión - template.list_price = round(round(partial_price / 0.05) * 0.05, -int(math.floor(math.log10(0.05)))) - _logger.debug("final price : %s" %template.list_price) - template.list_price_updated = False - else: - raise UserError(_('Not found a valid pricelist to compute sale price. Check configuration in General Settings.')) - return False - - list_price = fields.Float( - string="Sale price with VAT", - help="Price calculated according to the configured pricelist, including VAT.", - digits='Product Price' + margin_state = fields.Selection( + string="Theoretical Price State", + compute="_compute_theoretical_multi_template", + selection=MARGIN_STATE_SELECTION, + store=True, ) - list_price_updated = fields.Boolean( - string="Last purchase price updated", - help="The last cost price has been updated and you need to update the selling price in the database, shelves and scales.", - default=False, - readonly=True - ) - - list_price_automatic = fields.Boolean( - string="Automatic Sale Price", - help="Automatic computation of the PVP from the cost price and the rate defined in the configuration.", - default=True - ) - - to_print = fields.Boolean( + to_print_label = fields.Boolean( string="To print label", - help="The sale price has been updated on this product and needs to be updated on the shelf.", + help="""The sale price has been updated on this product + and needs to be updated on the shelf.""", default=False, - readonly=True + readonly=True, ) - last_purchase_price = fields.Float( + last_purchase_price_received = fields.Float( string="Last purchase price", - help="The last price at which the product was purchased. It is used as the base price field for calculating the product sale price.", - #readonly=True, - digits='Product Price' + help="The last price at which the product was purchased. " + "It is used as the base price field for calculating the product sale price.", + readonly=True, + digits="Product Price", ) - - last_purchase_price_compute_type = fields.Selection([ - ('without_discounts', 'Without discounts'), - ('with_discount', 'First discount'), - ('with_three_discounts', 'Triple discount'), - ('manual_update', 'Manual update')], + + last_purchase_price_received_compute_type = fields.Selection( + [ + ("without_discounts", "Without discounts"), + ("with_discount", "First discount"), + ("with_three_discounts", "Triple discount"), + ("manual_update", "Manual update"), + ], string="Last purchase price calculation type", - help='Choose whether discounts should influence the calculation of the last purchase price. Select Never update for manual configuration of cost and sale prices.\n' - '\n* Without discounts: does not take into account discounts when updating the last purchase price.\n' - '* First discount: take into account only first discount when updating the last purchase price.\n' - '* Triple discount: take into account all discounts when updating the last purchase price. Needs "Purchase Triple Discount" OCA module.\n' - '* Manual update: Select this for manual configuration of cost and sale price. The sales price will not be calculated automatically.', - default='without_discounts', - required=True + help=""" + Choose whether discounts should influence the calculation of the last purchase price. + Select Never update for manual configuration of cost and sale prices.\n + * Without discounts: does not take into account discounts when updating + the last purchase price.\n + * First discount: take into account only first discount when updating + the last purchase price.\n + * Triple discount: take into account all discounts when updating + the last purchase price. + Needs "Purchase Triple Discount" OCA module.\n + * Manual update: Select this for manual configuration of cost and sale price. + The sales price will not be calculated automatically. + """, + default="without_discounts", + required=True, ) - @api.model - def create(self, vals): - # Set supplier tax same than customer tax - if vals.get('taxes_id'): - tax = self.get_supplier_tax(vals.get('taxes_id')) - vals['supplier_taxes_id'] = tax - vals['list_price_updated'] = True - return super(ProductTemplate, self).create(vals) - - def write(self, vals): - # Set supplier tax same than customer tax - if vals.get('taxes_id'): - tax = self.get_supplier_tax(vals.get('taxes_id')) - vals['supplier_taxes_id'] = tax - # Mark if product needs list price update - if vals.get('last_purchase_price'): - vals['list_price_updated'] = True - # Mark if product needs update the shelf tag - if vals.get('list_price'): - vals['to_print'] = True - return super(ProductTemplate, self).write(vals) - - def get_supplier_tax(self, taxes_id): - tax_obj = self.env['account.tax'] - tax_res = [] - if taxes_id: - if "6, False, []" not in taxes_id: - for tupla in taxes_id: - a, b, c = tupla - if c: - for i in c: - tax = tax_obj.browse(i) - val = tax.amount - if val == 21: - record_id = self.env.ref('l10n_es.1_account_tax_template_p_iva21_bc').id - elif val == 10: - record_id = self.env.ref('l10n_es.1_account_tax_template_p_iva10_bc').id - elif val == 4: - record_id = self.env.ref('l10n_es.1_account_tax_template_p_iva4_bc').id - else: - record_id = self.env['account.tax'].search([ - ('amount','=', val), - ('active','=', True), - ('type_tax_use','=','purchase') - ], - limit=1).id - tax_res.append(record_id) - - return [(6, 0, tax_res)] - - - + @api.onchange( + "last_purchase_price_received", + "standard_price", + "taxes_id", + "margin_classification_id", + "list_price", + ) + def _onchange_standard_price(self): + res = super()._onchange_standard_price() + if self.last_purchase_price_received != 0: + ( + self.margin_state, + self.theoretical_price, + self.theoretical_difference, + ) = self.env["product.product"]._get_margin_info( + self.margin_classification_id, + self.taxes_id, + self.name, + self.last_purchase_price_received, + self.list_price, + ) + return res diff --git a/product_update_price_last_purchase/models/res_company.py b/product_update_price_last_purchase/models/res_company.py deleted file mode 100644 index 4d7b39b..0000000 --- a/product_update_price_last_purchase/models/res_company.py +++ /dev/null @@ -1,17 +0,0 @@ -#import logging - -from odoo import models, fields, api - -#_logger = logging.getLogger(__name__) - -class ResCompany(models.Model): - _inherit = "res.company" - - product_pricelist_automatic = fields.Many2one( - comodel_name='product.pricelist', - string='Pricelist applied to the automatic selling price', - help='Rate that applies to all products that update the selling price automatically.', - ) - - - diff --git a/product_update_price_last_purchase/models/res_config.py b/product_update_price_last_purchase/models/res_config.py index 5aa1510..a44ac0b 100644 --- a/product_update_price_last_purchase/models/res_config.py +++ b/product_update_price_last_purchase/models/res_config.py @@ -1,30 +1,12 @@ -from odoo import models, fields, api +from odoo import fields, models + class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' - - product_pricelist_automatic = fields.Many2one( - related='company_id.product_pricelist_automatic', - comodel_name='product.pricelist', - string='Pricelist applied to automatic calculation of sales price', - readonly=False, - ) - - @api.model - def get_values(self): - res = super(ResConfigSettings, self).get_values() - config_obj = self.env["ir.config_parameter"] - product_pricelist_automatic = config_obj.sudo().get_param( - "product_update_price_last_purchase.product_pricelist_automatic", default=0) - return res - - def set_values(self): - super(ResConfigSettings, self).set_values() - config_obj = self.env["ir.config_parameter"] - config_obj.sudo().set_param( - "product_update_price_last_purchase.product_pricelist_automatic", - int(self.product_pricelist_automatic.id) - ) - - + _inherit = "res.config.settings" + product_pricelist_automatic = fields.Many2one( + required=False, + comodel_name="product.pricelist", + string="Pricelist applied to automatic calculation of sales price", + config_parameter="product_update_price_last_purchase.product_pricelist_automatic", + ) diff --git a/product_update_price_last_purchase/models/stock_move.py b/product_update_price_last_purchase/models/stock_move.py index 41a0b5e..aad3091 100644 --- a/product_update_price_last_purchase/models/stock_move.py +++ b/product_update_price_last_purchase/models/stock_move.py @@ -5,28 +5,56 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). import logging -import math -from odoo import exceptions, models, fields, api, _ -from odoo.tools import float_is_zero, float_round, float_compare +from odoo import models +from odoo.tools import float_compare, float_is_zero, float_round _logger = logging.getLogger(__name__) class StockMove(models.Model): - _inherit = 'stock.move' + _inherit = "stock.move" def product_price_update_before_done(self): - super(StockMove, self).product_price_update_before_done() - for move in self.filtered(lambda move: move.location_id.usage == 'supplier'): - if move.product_id.last_purchase_price_compute_type == 'with_three_discounts': - price_updated = float_round(move.purchase_line_id.price_subtotal / move.purchase_line_id.product_qty, precision_digits=2) - elif move.product_id.last_purchase_price_compute_type == 'with_discount': - price_updated = float_round(move.purchase_line_id.price_unit * (1 - move.purchase_line_id.discount / 100), precision_digits=2) + res = super(StockMove, self).product_price_update_before_done() + for move in self.filtered(lambda move: move.location_id.usage == "supplier"): + if ( + move.product_id.last_purchase_price_received_compute_type + == "with_three_discounts" + ): + price_updated = float_round( + move.purchase_line_id.price_subtotal + / move.purchase_line_id.product_qty, + precision_digits=2, + ) + elif ( + move.product_id.last_purchase_price_received_compute_type + == "with_discount" + ): + price_updated = float_round( + move.purchase_line_id.price_unit + * (1 - move.purchase_line_id.discount / 100), + precision_digits=2, + ) else: price_updated = move.purchase_line_id.price_unit - - if float_compare(move.product_id.last_purchase_price, price_updated, precision_digits=2) and not float_is_zero(move.quantity_done, precision_digits=3): - _logger.info("Update last_purchase_price: %s for product %s Previous price: %s" % (price_updated, move.product_id.default_code, move.product_id.last_purchase_price)) - # Write the last purchase price, as SUPERUSER_ID because a warehouse manager may not have the right to write on products - move.product_id.with_context(force_company=move.company_id.id).sudo().write({'last_purchase_price': price_updated}) + + if float_compare( + move.product_id.last_purchase_price_received, + price_updated, + precision_digits=2, + ) and not float_is_zero(move.quantity_done, precision_digits=3): + _logger.info( + "Update last_purchase_price_received: %s for product %s Previous price: %s" + % ( + price_updated, + move.product_id.default_code, + move.product_id.last_purchase_price_received, + ) + ) + # Write last purchase price as SUPERUSER_ID + # warehouse manager may not have the right to write on products + move.product_id.with_company(move.company_id.id).sudo().write( + {"last_purchase_price_received": price_updated} + ) + return res diff --git a/product_update_price_last_purchase/report/product_barcode.xml b/product_update_price_last_purchase/report/product_barcode.xml deleted file mode 100644 index 1cbce8c..0000000 --- a/product_update_price_last_purchase/report/product_barcode.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/product_update_price_last_purchase/report/report_product_barcode.xml b/product_update_price_last_purchase/report/report_product_barcode.xml deleted file mode 100644 index e7a69fc..0000000 --- a/product_update_price_last_purchase/report/report_product_barcode.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - diff --git a/product_update_price_last_purchase/report/report_product_shelf_tag.xml b/product_update_price_last_purchase/report/report_product_shelf_tag.xml deleted file mode 100644 index 399d3d4..0000000 --- a/product_update_price_last_purchase/report/report_product_shelf_tag.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - diff --git a/product_update_price_last_purchase/views/actions.xml b/product_update_price_last_purchase/views/actions.xml index b95ef88..04c6e36 100644 --- a/product_update_price_last_purchase/views/actions.xml +++ b/product_update_price_last_purchase/views/actions.xml @@ -1,24 +1,23 @@ - + - Update Sales Price - - + + code - records._compute_theoritical_price() + records.use_theoretical_price() - - diff --git a/product_update_price_last_purchase/views/product_view.xml b/product_update_price_last_purchase/views/product_view.xml index 2201e36..e534cbf 100644 --- a/product_update_price_last_purchase/views/product_view.xml +++ b/product_update_price_last_purchase/views/product_view.xml @@ -1,91 +1,66 @@ - + - + - - - product.list.price.automatic.form - product.template - form - - - - - - - - - - - - - - + + + product.list.price.automatic.form + product.template + form + + + + + + + + - - - product_update_price_last_purchase.res.config.settings.form - res.config.settings - - - - -

Default pricelists for Coops

-
-
-
-
- - - + + product.template.product.tree + product.template + + + + + + + + - - - view.product.search.form.inherit.updated - product.template - - - - - - - - - - - - product_update_price_last_purchase.product.search.form.inherit.tags - product.template - - - - - - - - + + + view.product.search.form.inherit.updated + product.template + + + + + + + + + - + diff --git a/product_update_price_last_purchase/views/res_config.xml b/product_update_price_last_purchase/views/res_config.xml new file mode 100644 index 0000000..1903939 --- /dev/null +++ b/product_update_price_last_purchase/views/res_config.xml @@ -0,0 +1,32 @@ + + + + + product.update.price.last.purchase.res.config.settings.form + res.config.settings + + + + +
+
+
+
+ + + + + From 9811042260a917b0b13f1e898c5cf6ed4d442bf6 Mon Sep 17 00:00:00 2001 From: luis Date: Mon, 15 Jan 2024 20:28:02 +0100 Subject: [PATCH 015/100] product_update_price_last_purchase: Add readme --- product_update_price_last_purchase/README.rst | 56 +++ .../readme/DESCRIPTION.md | 2 + .../static/description/index.html | 409 ++++++++++++++++++ 3 files changed, 467 insertions(+) create mode 100644 product_update_price_last_purchase/README.rst create mode 100644 product_update_price_last_purchase/readme/DESCRIPTION.md create mode 100644 product_update_price_last_purchase/static/description/index.html diff --git a/product_update_price_last_purchase/README.rst b/product_update_price_last_purchase/README.rst new file mode 100644 index 0000000..7b1561d --- /dev/null +++ b/product_update_price_last_purchase/README.rst @@ -0,0 +1,56 @@ +======================================= +Product Update Price From Last Purchase +======================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:9a3d6dc2e0410212d91f0fba1627ece05131bc10535ebe1e51b03c5a7026f30d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-Criptomart%2Faddons_cm-lightgray.png?logo=github + :target: https://github.com/Criptomart/addons_cm/tree/16.0/product_update_price_last_purchase + :alt: Criptomart/addons_cm + +|badge1| |badge2| |badge3| + +Update price from last purchase price, using product classification +margin + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Criptomart + +Maintainers +----------- + +This module is part of the `Criptomart/addons_cm `_ project on GitHub. + +You are welcome to contribute. diff --git a/product_update_price_last_purchase/readme/DESCRIPTION.md b/product_update_price_last_purchase/readme/DESCRIPTION.md new file mode 100644 index 0000000..d10e429 --- /dev/null +++ b/product_update_price_last_purchase/readme/DESCRIPTION.md @@ -0,0 +1,2 @@ +Update price from last purchase price, using product classification +margin diff --git a/product_update_price_last_purchase/static/description/index.html b/product_update_price_last_purchase/static/description/index.html new file mode 100644 index 0000000..bb81519 --- /dev/null +++ b/product_update_price_last_purchase/static/description/index.html @@ -0,0 +1,409 @@ + + + + + +Product Update Price From Last Purchase + + + +
+

Product Update Price From Last Purchase

+ + +

Beta License: AGPL-3 Criptomart/addons_cm

+

Update price from last purchase price, using product classification +margin

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Criptomart
    • +
+
+
+

Maintainers

+

This module is part of the Criptomart/addons_cm project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + From b16d09ded7af3aca09d61e930a567927cb831241 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 16 Jan 2024 10:22:43 +0100 Subject: [PATCH 016/100] product_update_price_last_purchase: remove unused dependency --- product_update_price_last_purchase/__manifest__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/product_update_price_last_purchase/__manifest__.py b/product_update_price_last_purchase/__manifest__.py index 1159df3..c044cbb 100644 --- a/product_update_price_last_purchase/__manifest__.py +++ b/product_update_price_last_purchase/__manifest__.py @@ -18,7 +18,6 @@ "stock_account", "sale", "product_margin_classification", - "product_print_category", ], "data": [ "views/actions.xml", From 39dd06bacc34e976a07a216f778f0a3df6f346db Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 18 Jan 2024 17:09:34 +0100 Subject: [PATCH 017/100] product_update_price_last_purchase: add double discount to compute options --- .../__manifest__.py | 1 - .../models/__init__.py | 1 - .../models/product_product.py | 6 ++-- .../models/product_template.py | 3 ++ .../models/res_config.py | 12 ------- .../models/stock_move.py | 14 +++++++- .../views/res_config.xml | 32 ------------------- 7 files changed, 19 insertions(+), 50 deletions(-) delete mode 100644 product_update_price_last_purchase/models/res_config.py delete mode 100644 product_update_price_last_purchase/views/res_config.xml diff --git a/product_update_price_last_purchase/__manifest__.py b/product_update_price_last_purchase/__manifest__.py index c044cbb..1cd63ae 100644 --- a/product_update_price_last_purchase/__manifest__.py +++ b/product_update_price_last_purchase/__manifest__.py @@ -22,7 +22,6 @@ "data": [ "views/actions.xml", "views/product_view.xml", - "views/res_config.xml", ], "installable": True, } diff --git a/product_update_price_last_purchase/models/__init__.py b/product_update_price_last_purchase/models/__init__.py index 6440ced..fb351a4 100644 --- a/product_update_price_last_purchase/models/__init__.py +++ b/product_update_price_last_purchase/models/__init__.py @@ -1,4 +1,3 @@ from . import product_template from . import product_product -from . import res_config from . import stock_move diff --git a/product_update_price_last_purchase/models/product_product.py b/product_update_price_last_purchase/models/product_product.py index ca2d585..dbdacbc 100644 --- a/product_update_price_last_purchase/models/product_product.py +++ b/product_update_price_last_purchase/models/product_product.py @@ -41,10 +41,10 @@ class ProductProduct(models.Model): return res def use_theoretical_price(self): - res = super().use_theoretical_price() for product in self: - product.to_print_label = True - return res + if product.last_purchase_price_received_compute_type != "manual_update": + product.lst_price = product.theoretical_price + product.to_print_label = True class ProductPackaging(models.Model): diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py index a6c766e..7f8e08e 100644 --- a/product_update_price_last_purchase/models/product_template.py +++ b/product_update_price_last_purchase/models/product_template.py @@ -45,6 +45,7 @@ class ProductTemplate(models.Model): [ ("without_discounts", "Without discounts"), ("with_discount", "First discount"), + ("with_two_discounts", "Double discount"), ("with_three_discounts", "Triple discount"), ("manual_update", "Manual update"), ], @@ -56,6 +57,8 @@ class ProductTemplate(models.Model): the last purchase price.\n * First discount: take into account only first discount when updating the last purchase price.\n + * Double discount: take into account two first discounts when updating + the last purchase price.\n * Triple discount: take into account all discounts when updating the last purchase price. Needs "Purchase Triple Discount" OCA module.\n diff --git a/product_update_price_last_purchase/models/res_config.py b/product_update_price_last_purchase/models/res_config.py deleted file mode 100644 index a44ac0b..0000000 --- a/product_update_price_last_purchase/models/res_config.py +++ /dev/null @@ -1,12 +0,0 @@ -from odoo import fields, models - - -class ResConfigSettings(models.TransientModel): - _inherit = "res.config.settings" - - product_pricelist_automatic = fields.Many2one( - required=False, - comodel_name="product.pricelist", - string="Pricelist applied to automatic calculation of sales price", - config_parameter="product_update_price_last_purchase.product_pricelist_automatic", - ) diff --git a/product_update_price_last_purchase/models/stock_move.py b/product_update_price_last_purchase/models/stock_move.py index aad3091..10c7675 100644 --- a/product_update_price_last_purchase/models/stock_move.py +++ b/product_update_price_last_purchase/models/stock_move.py @@ -18,6 +18,7 @@ class StockMove(models.Model): def product_price_update_before_done(self): res = super(StockMove, self).product_price_update_before_done() for move in self.filtered(lambda move: move.location_id.usage == "supplier"): + _logger.warning("move: %s" % move) if ( move.product_id.last_purchase_price_received_compute_type == "with_three_discounts" @@ -36,6 +37,17 @@ class StockMove(models.Model): * (1 - move.purchase_line_id.discount / 100), precision_digits=2, ) + elif ( + move.product_id.last_purchase_price_received_compute_type + == "with_two_discounts" + ): + price_updated = float_round( + move.purchase_line_id.price_unit + * (1 - move.purchase_line_id.discount / 100) + * (1 - move.purchase_line_id.discount2 / 100), + precision_digits=2, + ) + else: price_updated = move.purchase_line_id.price_unit @@ -57,4 +69,4 @@ class StockMove(models.Model): move.product_id.with_company(move.company_id.id).sudo().write( {"last_purchase_price_received": price_updated} ) - return res + return res diff --git a/product_update_price_last_purchase/views/res_config.xml b/product_update_price_last_purchase/views/res_config.xml deleted file mode 100644 index 1903939..0000000 --- a/product_update_price_last_purchase/views/res_config.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - product.update.price.last.purchase.res.config.settings.form - res.config.settings - - - - -
-
-
-
- - - - - From ed2cab2b15d7dfe904bb934b05cdb48112e732c2 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 18 Jan 2024 17:28:17 +0100 Subject: [PATCH 018/100] product_update_price_last_purchase: clean logger --- product_update_price_last_purchase/models/stock_move.py | 1 - 1 file changed, 1 deletion(-) diff --git a/product_update_price_last_purchase/models/stock_move.py b/product_update_price_last_purchase/models/stock_move.py index 10c7675..e30e522 100644 --- a/product_update_price_last_purchase/models/stock_move.py +++ b/product_update_price_last_purchase/models/stock_move.py @@ -18,7 +18,6 @@ class StockMove(models.Model): def product_price_update_before_done(self): res = super(StockMove, self).product_price_update_before_done() for move in self.filtered(lambda move: move.location_id.usage == "supplier"): - _logger.warning("move: %s" % move) if ( move.product_id.last_purchase_price_received_compute_type == "with_three_discounts" From 846235f9ca4b26c56b50a1af7ccb2bca12bc9ffb Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 20 Feb 2024 10:27:45 +0100 Subject: [PATCH 019/100] website_search_products: Fix permissions --- .../controllers/controller.py | 37 ++++++--- website_search_products/data/ir_rule.xml | 13 --- .../views/web_templates.xml | 79 +++++++++++-------- 3 files changed, 71 insertions(+), 58 deletions(-) delete mode 100644 website_search_products/data/ir_rule.xml diff --git a/website_search_products/controllers/controller.py b/website_search_products/controllers/controller.py index 463cb5e..b734bad 100644 --- a/website_search_products/controllers/controller.py +++ b/website_search_products/controllers/controller.py @@ -1,34 +1,47 @@ - # -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- from odoo import http from odoo.http import request from odoo.addons.website.controllers.main import Website import logging + _logger = logging.getLogger(__name__) + class IntentoryForm(http.Controller): - @http.route(['/inventory/search'], type='http', auth="user", website=True) + @http.route(["/inventory/search"], type="http", auth="user", website=True) def inventory_form(self, **post): - if not request.env['res.users'].browse(request.uid).has_group('base.group_portal')\ - and not request.env['res.users'].browse(request.uid).has_group('base.group_user'): - redirect = b'/web?' + if not request.env["res.users"].browse(request.uid).has_group( + "base.group_portal" + ) and not request.env["res.users"].browse(request.uid).has_group( + "base.group_user" + ): + redirect = b"/web?" return http.redirect_with_hash(redirect) - products = request.env["product.template"].search([('active', '=', 'True'), ('available_in_pos', '=', 'True')]) - vals = {'products': products} + products = ( + request.env["product.template"] + .sudo() + .search([("active", "=", "True"), ("available_in_pos", "=", "True")]) + ) + vals = {"products": products} return request.render("website_search_products.web_list_products", vals) - + class Website(Website): @http.route(website=True, auth="public") def web_login(self, redirect=None, *args, **kw): response = super(Website, self).web_login(redirect=redirect, *args, **kw) - if not redirect and request.params['login_success']: - if request.env['res.users'].browse(request.uid).has_group('base.group_user'): - redirect = b'/web?' + request.httprequest.query_string + if not redirect and request.params["login_success"]: + if ( + request.env["res.users"] + .browse(request.uid) + .has_group("base.group_user") + ): + redirect = b"/web?" + request.httprequest.query_string else: - redirect = '/inventory/search' + redirect = "/inventory/search" return http.redirect_with_hash(redirect) return response diff --git a/website_search_products/data/ir_rule.xml b/website_search_products/data/ir_rule.xml deleted file mode 100644 index 1c1ab21..0000000 --- a/website_search_products/data/ir_rule.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Portal Consult Products - - - - - - - - - \ No newline at end of file diff --git a/website_search_products/views/web_templates.xml b/website_search_products/views/web_templates.xml index 47c03be..dab3f6a 100644 --- a/website_search_products/views/web_templates.xml +++ b/website_search_products/views/web_templates.xml @@ -9,57 +9,70 @@
-
- Displayed products -
+
+ Displayed products +
-
- Products not found -
+
+ Products not found +
-

In this table you can consult all the products available in the store

+
+

In this table you can consult all the products available in the + store

+
- +
- + - + - - - - - + + + + + - +
NameCategoryCategory Price Quantity UoM
+ + + + + + + + + +
- - - + + + + + - - - + \ No newline at end of file From e6d6ad01ef881cef928b1e762143c9adcd766643 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 20 Feb 2024 10:50:37 +0100 Subject: [PATCH 020/100] website_search_products: Fix manifest --- website_search_products/__manifest__.py | 26 +++++++++---------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/website_search_products/__manifest__.py b/website_search_products/__manifest__.py index 9f95ae0..44e654c 100644 --- a/website_search_products/__manifest__.py +++ b/website_search_products/__manifest__.py @@ -2,22 +2,14 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Website Search Products', - 'description': """ + "name": "Website Search Products", + "description": """ Allows portal users to search products in a table with filters.""", - 'version': '12.0.1.0.0', - 'license': 'AGPL-3', - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'depends': [ - "stock", - "website" - ], - 'data': [ - "data/menu.xml", - "data/ir_rule.xml", - "views/web_templates.xml" - ], - 'demo': [ - ], + "version": "12.0.1.0.0", + "license": "AGPL-3", + "author": "Criptomart", + "website": "https://criptomart.net", + "depends": ["stock", "website"], + "data": ["data/menu.xml", "views/web_templates.xml"], + "demo": [], } From ed90fc24bc6ae2a436154e7e4375d16078cf4780 Mon Sep 17 00:00:00 2001 From: luis Date: Sat, 6 Apr 2024 11:35:12 +0200 Subject: [PATCH 021/100] product_update_price_last_purchase: to_print field editable --- product_update_price_last_purchase/models/product_template.py | 1 - 1 file changed, 1 deletion(-) diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py index 7f8e08e..e6bb20b 100644 --- a/product_update_price_last_purchase/models/product_template.py +++ b/product_update_price_last_purchase/models/product_template.py @@ -30,7 +30,6 @@ class ProductTemplate(models.Model): help="""The sale price has been updated on this product and needs to be updated on the shelf.""", default=False, - readonly=True, ) last_purchase_price_received = fields.Float( From 688782abd83119f5a6c5367ee17e625791b16ebd Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 25 Apr 2024 13:27:31 +0200 Subject: [PATCH 022/100] fix missing license warning. Add readme to pass pre-commit --- purchase_collective/README.rst | 75 ++++ purchase_collective/__manifest__.py | 60 +-- .../static/description/index.html | 425 ++++++++++++++++++ 3 files changed, 523 insertions(+), 37 deletions(-) create mode 100644 purchase_collective/README.rst create mode 100644 purchase_collective/static/description/index.html diff --git a/purchase_collective/README.rst b/purchase_collective/README.rst new file mode 100644 index 0000000..330686b --- /dev/null +++ b/purchase_collective/README.rst @@ -0,0 +1,75 @@ +==================== +Collective Purchases +==================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:3de867dc126c0b86e4d1cf5583f6823d92094851b21e228b2b364b2d444f2ce1 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-Criptomart%2Faddons_cm-lightgray.png?logo=github + :target: https://github.com/Criptomart/addons_cm/tree/16.0/purchase_collective + :alt: Criptomart/addons_cm + +|badge1| |badge2| |badge3| + +Compras Colectivas +------------------ + +Éste módulo permite a varios usuarios de Odoo realizar una compra de +productos a un mismo proveedor que acepta pedidos conjuntos. El Usuario +que crea la orden es el encargado de distribuir los productos al resto +de usuarios, cobrar de ellos y pagar al productor. + +- modelo CollectivePurchases, con un campo que linka diferentes sales + orders +- crea un único albarán de salida al proveedor con la suma de todas las + sale orders +- cuando se recibe el cargamente del proveedor, una acción permite + crear albaranes de entrega a los almacenes dde los nodo --> ¿poner en + un módulo aparte y quitar la dependencia a network_partner? +- nueva secuencia para collective order purchase +- workflow propio, por añadir los estados de entrega en subalmacén y + entrega al cliente. +- reglas de seguridad y grupos. +- extiende partner.network añadiendo un nuevo almacén que hace posible + el flujo. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Criptomart + +Maintainers +----------- + +This module is part of the `Criptomart/addons_cm `_ project on GitHub. + +You are welcome to contribute. diff --git a/purchase_collective/__manifest__.py b/purchase_collective/__manifest__.py index 9df04a0..d7e96d3 100644 --- a/purchase_collective/__manifest__.py +++ b/purchase_collective/__manifest__.py @@ -1,40 +1,26 @@ { - 'name': "Collective Purchases", - 'summary': "Compras colectivas", - 'description': """ -Compras Colectivas -================================================== -Éste módulo permite a varios usuarios de Odoo realizar una compra de productos a un mismo proveedor que acepta pedidos conjuntos. -El Usuario que crea la orden es el encargado de distribuir los productos al resto de usuarios, cobrar de ellos y pagar al productor. - -- modelo CollectivePurchases, con un campo que linka diferentes sales orders -- crea un único albarán de salida al proveedor con la suma de todas las sale orders -- cuando se recibe el cargamente del proveedor, una acción permite crear albaranes de entrega a los almacenes dde los nodo - --> ¿poner en un módulo aparte y quitar la dependencia a network_partner? -- nueva secuencia para collective order purchase -- workflow propio, por añadir los estados de entrega en subalmacén y entrega al cliente. -- reglas de seguridad y grupos. -- extiende partner.network añadiendo un nuevo almacén que hace posible el flujo. - """, - 'author': "Criptomart", - 'website': "https://criptomart.net", - 'category': 'Purchase Management', - 'version': "16.0.1.0.0", - 'depends': ["purchase","sale","product","network_partner"], - 'data': [ - 'security/purchase_collective_security.xml', - 'security/ir.model.access.csv', - #'data/purchase_collective_workflow.xml', - #'data/purchase_collective_sequence.xml', - 'views/purchase_collective.xml', - 'views/sale_order.xml', - 'views/actions.xml', - 'views/menus.xml', - 'views/partner_node_views.xml', - 'views/partner_net_views.xml', + "name": "Collective Purchases", + "summary": "Compras Colectivas", + "author": "Criptomart", + "website": "https://criptomart.net", + "category": "Purchase Management", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "depends": ["purchase", "sale", "product", "network_partner"], + "data": [ + "security/purchase_collective_security.xml", + "security/ir.model.access.csv", + # 'data/purchase_collective_workflow.xml', + # 'data/purchase_collective_sequence.xml', + "views/purchase_collective.xml", + "views/sale_order.xml", + "views/actions.xml", + "views/menus.xml", + "views/partner_node_views.xml", + "views/partner_net_views.xml", ], - 'demo': [], - 'installable': True, - 'auto_install': False, - 'application': False, + "demo": [], + "installable": True, + "auto_install": False, + "application": False, } diff --git a/purchase_collective/static/description/index.html b/purchase_collective/static/description/index.html new file mode 100644 index 0000000..d9fbd8b --- /dev/null +++ b/purchase_collective/static/description/index.html @@ -0,0 +1,425 @@ + + + + + +Collective Purchases + + + +
+

Collective Purchases

+ + +

Beta License: AGPL-3 Criptomart/addons_cm

+
+

Compras Colectivas

+

Éste módulo permite a varios usuarios de Odoo realizar una compra de +productos a un mismo proveedor que acepta pedidos conjuntos. El Usuario +que crea la orden es el encargado de distribuir los productos al resto +de usuarios, cobrar de ellos y pagar al productor.

+
    +
  • modelo CollectivePurchases, con un campo que linka diferentes sales +orders
    • +
  • crea un único albarán de salida al proveedor con la suma de todas las +sale orders
    • +
  • cuando se recibe el cargamente del proveedor, una acción permite +crear albaranes de entrega a los almacenes dde los nodo –> ¿poner en +un módulo aparte y quitar la dependencia a network_partner?
    • +
  • nueva secuencia para collective order purchase
    • +
  • workflow propio, por añadir los estados de entrega en subalmacén y +entrega al cliente.
    • +
  • reglas de seguridad y grupos.
    • +
  • extiende partner.network añadiendo un nuevo almacén que hace posible +el flujo.
    • +
+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+ +
+
+

Authors

+
    +
  • Criptomart
    • +
+
+
+

Maintainers

+

This module is part of the Criptomart/addons_cm project on GitHub.

+

You are welcome to contribute.

+
+
+ + From 412d897695f08e3376bc8df0ac3b1d5e24ae6eb9 Mon Sep 17 00:00:00 2001 From: snt Date: Wed, 4 Sep 2024 23:07:41 +0200 Subject: [PATCH 023/100] =?UTF-8?q?upgrade=20v16=20addons=20valores=20por?= =?UTF-8?q?=20defecto=20seg=C3=BAn=20la=20categor=C3=ADa=20interna?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 613 ------------------ README.md | 3 - cm_must_have/__init__.py | 0 cm_must_have/__manifest__.py | 29 - network_partner/__init__.py | 1 - network_partner/__manifest__.py | 35 - network_partner/models/__init__.py | 4 - network_partner/models/partner_network.py | 15 - network_partner/models/partner_node.py | 16 - network_partner/models/res_partner.py | 14 - network_partner/security/ir.model.access.csv | 5 - .../security/network_partner_security.xml | 79 --- network_partner/static/description/icon.png | Bin 6876 -> 0 bytes network_partner/views/actions.xml | 38 -- network_partner/views/menus.xml | 33 - network_partner/views/partner_net_views.xml | 31 - network_partner/views/partner_node_views.xml | 40 -- network_partner/views/res_partner_views.xml | 24 - network_partner/workflow.txt | 34 - pos_picking_load_selected_partner/__init__.py | 1 - .../__manifest__.py | 21 - .../models/__init__.py | 1 - .../models/stock_picking.py | 15 - .../static/src/js/widget.js | 20 - .../views/assets.xml | 11 - pos_receipt_clientinfo/__init__.py | 0 pos_receipt_clientinfo/__manifest__.py | 24 - pos_receipt_clientinfo/static/src/xml/pos.xml | 308 --------- .../views/report_receipt.xml | 303 --------- pos_ticket_pricelist/__init__.py | 0 pos_ticket_pricelist/__manifest__.py | 24 - pos_ticket_pricelist/static/src/xml/pos.xml | 20 - .../__manifest__.py | 2 +- .../models/product_product.py | 8 - .../__manifest__.py | 1 + product_category_tax/__manifest__.py | 3 +- product_update_price_last_purchase/README.rst | 56 -- .../__init__.py | 1 - .../__manifest__.py | 27 - product_update_price_last_purchase/i18n/es.po | 282 -------- .../models/__init__.py | 3 - .../models/product_product.py | 57 -- .../models/product_template.py | 92 --- .../models/stock_move.py | 71 -- .../readme/DESCRIPTION.md | 2 - .../static/description/index.html | 409 ------------ .../views/actions.xml | 36 - .../views/product_view.xml | 66 -- purchase_collective/README.rst | 75 --- purchase_collective/__init__.py | 1 - purchase_collective/__manifest__.py | 26 - .../data/purchase_collective_sequence.xml | 17 - .../data/purchase_collective_workflow.xml | 240 ------- purchase_collective/models/__init__.py | 4 - purchase_collective/models/partner_network.py | 25 - purchase_collective/models/partner_node.py | 25 - .../models/purchase_collective.py | 251 ------- purchase_collective/models/sale_order.py | 22 - .../security/ir.model.access.csv | 4 - .../security/purchase_collective_security.xml | 46 -- .../static/description/index.html | 425 ------------ purchase_collective/views/actions.xml | 53 -- purchase_collective/views/menus.xml | 25 - .../views/partner_net_views.xml | 28 - .../views/partner_node_views.xml | 28 - .../views/purchase_collective.xml | 111 ---- purchase_collective/views/sale_order.xml | 18 - stock_inventory_cost_info_sum/__init__.py | 1 - stock_inventory_cost_info_sum/__manifest__.py | 21 - .../models/__init__.py | 1 - .../models/stock_inventory.py | 26 - .../views/actions.xml | 14 - .../views/stock_inventory.xml | 31 - .../__init__.py | 1 - .../__manifest__.py | 20 - .../models/__init__.py | 2 - .../models/website.py | 26 - website_search_products/__init__.py | 3 - website_search_products/__manifest__.py | 23 - .../controllers/__init__.py | 3 - .../controllers/controller.py | 33 - website_search_products/data/ir_rule.xml | 13 - website_search_products/data/menu.xml | 11 - website_search_products/i18n/es.po | 68 -- .../i18n/website_search_products.pot | 67 -- website_search_products/models/__init__.py | 2 - website_search_products/models/stock_move.py | 58 -- .../views/web_templates.xml | 65 -- 88 files changed, 4 insertions(+), 4787 deletions(-) delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 cm_must_have/__init__.py delete mode 100644 cm_must_have/__manifest__.py delete mode 100644 network_partner/__init__.py delete mode 100644 network_partner/__manifest__.py delete mode 100644 network_partner/models/__init__.py delete mode 100644 network_partner/models/partner_network.py delete mode 100644 network_partner/models/partner_node.py delete mode 100644 network_partner/models/res_partner.py delete mode 100644 network_partner/security/ir.model.access.csv delete mode 100644 network_partner/security/network_partner_security.xml delete mode 100644 network_partner/static/description/icon.png delete mode 100644 network_partner/views/actions.xml delete mode 100644 network_partner/views/menus.xml delete mode 100644 network_partner/views/partner_net_views.xml delete mode 100644 network_partner/views/partner_node_views.xml delete mode 100644 network_partner/views/res_partner_views.xml delete mode 100644 network_partner/workflow.txt delete mode 100644 pos_picking_load_selected_partner/__init__.py delete mode 100644 pos_picking_load_selected_partner/__manifest__.py delete mode 100644 pos_picking_load_selected_partner/models/__init__.py delete mode 100644 pos_picking_load_selected_partner/models/stock_picking.py delete mode 100644 pos_picking_load_selected_partner/static/src/js/widget.js delete mode 100644 pos_picking_load_selected_partner/views/assets.xml delete mode 100644 pos_receipt_clientinfo/__init__.py delete mode 100644 pos_receipt_clientinfo/__manifest__.py delete mode 100644 pos_receipt_clientinfo/static/src/xml/pos.xml delete mode 100644 pos_receipt_clientinfo/views/report_receipt.xml delete mode 100644 pos_ticket_pricelist/__init__.py delete mode 100644 pos_ticket_pricelist/__manifest__.py delete mode 100644 pos_ticket_pricelist/static/src/xml/pos.xml delete mode 100644 product_update_price_last_purchase/README.rst delete mode 100644 product_update_price_last_purchase/__init__.py delete mode 100644 product_update_price_last_purchase/__manifest__.py delete mode 100644 product_update_price_last_purchase/i18n/es.po delete mode 100644 product_update_price_last_purchase/models/__init__.py delete mode 100644 product_update_price_last_purchase/models/product_product.py delete mode 100644 product_update_price_last_purchase/models/product_template.py delete mode 100644 product_update_price_last_purchase/models/stock_move.py delete mode 100644 product_update_price_last_purchase/readme/DESCRIPTION.md delete mode 100644 product_update_price_last_purchase/static/description/index.html delete mode 100644 product_update_price_last_purchase/views/actions.xml delete mode 100644 product_update_price_last_purchase/views/product_view.xml delete mode 100644 purchase_collective/README.rst delete mode 100644 purchase_collective/__init__.py delete mode 100644 purchase_collective/__manifest__.py delete mode 100644 purchase_collective/data/purchase_collective_sequence.xml delete mode 100644 purchase_collective/data/purchase_collective_workflow.xml delete mode 100644 purchase_collective/models/__init__.py delete mode 100644 purchase_collective/models/partner_network.py delete mode 100644 purchase_collective/models/partner_node.py delete mode 100644 purchase_collective/models/purchase_collective.py delete mode 100644 purchase_collective/models/sale_order.py delete mode 100644 purchase_collective/security/ir.model.access.csv delete mode 100644 purchase_collective/security/purchase_collective_security.xml delete mode 100644 purchase_collective/static/description/index.html delete mode 100644 purchase_collective/views/actions.xml delete mode 100644 purchase_collective/views/menus.xml delete mode 100644 purchase_collective/views/partner_net_views.xml delete mode 100644 purchase_collective/views/partner_node_views.xml delete mode 100644 purchase_collective/views/purchase_collective.xml delete mode 100644 purchase_collective/views/sale_order.xml delete mode 100644 stock_inventory_cost_info_sum/__init__.py delete mode 100644 stock_inventory_cost_info_sum/__manifest__.py delete mode 100644 stock_inventory_cost_info_sum/models/__init__.py delete mode 100644 stock_inventory_cost_info_sum/models/stock_inventory.py delete mode 100644 stock_inventory_cost_info_sum/views/actions.xml delete mode 100644 stock_inventory_cost_info_sum/views/stock_inventory.xml delete mode 100644 website_sale_product_sort_creation_date/__init__.py delete mode 100644 website_sale_product_sort_creation_date/__manifest__.py delete mode 100644 website_sale_product_sort_creation_date/models/__init__.py delete mode 100644 website_sale_product_sort_creation_date/models/website.py delete mode 100644 website_search_products/__init__.py delete mode 100644 website_search_products/__manifest__.py delete mode 100644 website_search_products/controllers/__init__.py delete mode 100644 website_search_products/controllers/controller.py delete mode 100644 website_search_products/data/ir_rule.xml delete mode 100644 website_search_products/data/menu.xml delete mode 100644 website_search_products/i18n/es.po delete mode 100644 website_search_products/i18n/website_search_products.pot delete mode 100644 website_search_products/models/__init__.py delete mode 100644 website_search_products/models/stock_move.py delete mode 100644 website_search_products/views/web_templates.xml diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e37e32e..0000000 --- a/LICENSE +++ /dev/null @@ -1,613 +0,0 @@ -GNU AFFERO GENERAL PUBLIC LICENSE - -Version 3, 19 November 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - -Preamble - -The GNU Affero General Public License is a free, copyleft license for software -and other kinds of works, specifically designed to ensure cooperation with -the community in the case of network server software. - -The licenses for most software and other practical works are designed to take -away your freedom to share and change the works. By contrast, our General -Public Licenses are intended to guarantee your freedom to share and change -all versions of a program--to make sure it remains free software for all its -users. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for them if you wish), that -you receive source code or can get it if you want it, that you can change -the software or use pieces of it in new free programs, and that you know you -can do these things. - -Developers that use our General Public Licenses protect your rights with two -steps: (1) assert copyright on the software, and (2) offer you this License -which gives you legal permission to copy, distribute and/or modify the software. - -A secondary benefit of defending all users' freedom is that improvements made -in alternate versions of the program, if they receive widespread use, become -available for other developers to incorporate. Many developers of free software -are heartened and encouraged by the resulting cooperation. However, in the -case of software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and letting -the public access it on a server without ever releasing its source code to -the public. - -The GNU Affero General Public License is designed specifically to ensure that, -in such cases, the modified source code becomes available to the community. -It requires the operator of a network server to provide the source code of -the modified version running there to the users of that server. Therefore, -public use of a modified version, on a publicly accessible server, gives the -public access to the source code of the modified version. - -An older license, called the Affero General Public License and published by -Affero, was designed to accomplish similar goals. This is a different license, -not a version of the Affero GPL, but Affero has released a new version of -the Affero GPL which permits relicensing under this license. - -The precise terms and conditions for copying, distribution and modification -follow. - -TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, -such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. -Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals -or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in -a fashion requiring copyright permission, other than the making of an exact -copy. The resulting work is called a "modified version" of the earlier work -or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the -Program. - -To "propagate" a work means to do anything with it that, without permission, -would make you directly or secondarily liable for infringement under applicable -copyright law, except executing it on a computer or modifying a private copy. -Propagation includes copying, distribution (with or without modification), -making available to the public, and in some countries other activities as -well. - -To "convey" a work means any kind of propagation that enables other parties -to make or receive copies. Mere interaction with a user through a computer -network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the -extent that it includes a convenient and prominently visible feature that -(1) displays an appropriate copyright notice, and (2) tells the user that -there is no warranty for the work (except to the extent that warranties are -provided), that licensees may convey the work under this License, and how -to view a copy of this License. If the interface presents a list of user commands -or options, such as a menu, a prominent item in the list meets this criterion. - - 1. Source Code. - -The "source code" for a work means the preferred form of the work for making -modifications to it. "Object code" means any non-source form of a work. - -A "Standard Interface" means an interface that either is an official standard -defined by a recognized standards body, or, in the case of interfaces specified -for a particular programming language, one that is widely used among developers -working in that language. - -The "System Libraries" of an executable work include anything, other than -the work as a whole, that (a) is included in the normal form of packaging -a Major Component, but which is not part of that Major Component, and (b) -serves only to enable use of the work with that Major Component, or to implement -a Standard Interface for which an implementation is available to the public -in source code form. A "Major Component", in this context, means a major essential -component (kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to produce -the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source -code needed to generate, install, and (for an executable work) run the object -code and to modify the work, including scripts to control those activities. -However, it does not include the work's System Libraries, or general-purpose -tools or generally available free programs which are used unmodified in performing -those activities but which are not part of the work. For example, Corresponding -Source includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically linked -subprograms that the work is specifically designed to require, such as by -intimate data communication or control flow between those - - subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate -automatically from other parts of the Corresponding Source. - - The Corresponding Source for a work in source code form is that same work. - - 2. Basic Permissions. - -All rights granted under this License are granted for the term of copyright -on the Program, and are irrevocable provided the stated conditions are met. -This License explicitly affirms your unlimited permission to run the unmodified -Program. The output from running a covered work is covered by this License -only if the output, given its content, constitutes a covered work. This License -acknowledges your rights of fair use or other equivalent, as provided by copyright -law. - -You may make, run and propagate covered works that you do not convey, without -conditions so long as your license otherwise remains in force. You may convey -covered works to others for the sole purpose of having them make modifications -exclusively for you, or provide you with facilities for running those works, -provided that you comply with the terms of this License in conveying all material -for which you do not control copyright. Those thus making or running the covered -works for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of your copyrighted -material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions -stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - -No covered work shall be deemed part of an effective technological measure -under any applicable law fulfilling obligations under article 11 of the WIPO -copyright treaty adopted on 20 December 1996, or similar laws prohibiting -or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention -of technological measures to the extent such circumvention is effected by -exercising rights under this License with respect to the covered work, and -you disclaim any intention to limit operation or modification of the work -as a means of enforcing, against the work's users, your or third parties' -legal rights to forbid circumvention of technological measures. - - 4. Conveying Verbatim Copies. - -You may convey verbatim copies of the Program's source code as you receive -it, in any medium, provided that you conspicuously and appropriately publish -on each copy an appropriate copyright notice; keep intact all notices stating -that this License and any non-permissive terms added in accord with section -7 apply to the code; keep intact all notices of the absence of any warranty; -and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you -may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - -You may convey a work based on the Program, or the modifications to produce -it from the Program, in the form of source code under the terms of section -4, provided that you also meet all of these conditions: - -a) The work must carry prominent notices stating that you modified it, and -giving a relevant date. - -b) The work must carry prominent notices stating that it is released under -this License and any conditions added under section 7. This requirement modifies -the requirement in section 4 to "keep intact all notices". - -c) You must license the entire work, as a whole, under this License to anyone -who comes into possession of a copy. This License will therefore apply, along -with any applicable section 7 additional terms, to the whole of the work, -and all its parts, regardless of how they are packaged. This License gives -no permission to license the work in any other way, but it does not invalidate -such permission if you have separately received it. - -d) If the work has interactive user interfaces, each must display Appropriate -Legal Notices; however, if the Program has interactive interfaces that do -not display Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, -which are not by their nature extensions of the covered work, and which are -not combined with it such as to form a larger program, in or on a volume of -a storage or distribution medium, is called an "aggregate" if the compilation -and its resulting copyright are not used to limit the access or legal rights -of the compilation's users beyond what the individual works permit. Inclusion -of a covered work in an aggregate does not cause this License to apply to -the other parts of the aggregate. - - 6. Conveying Non-Source Forms. - -You may convey a covered work in object code form under the terms of sections -4 and 5, provided that you also convey the machine-readable Corresponding -Source under the terms of this License, in one of these ways: - -a) Convey the object code in, or embodied in, a physical product (including -a physical distribution medium), accompanied by the Corresponding Source fixed -on a durable physical medium customarily used for software interchange. - -b) Convey the object code in, or embodied in, a physical product (including -a physical distribution medium), accompanied by a written offer, valid for -at least three years and valid for as long as you offer spare parts or customer -support for that product model, to give anyone who possesses the object code -either (1) a copy of the Corresponding Source for all the software in the -product that is covered by this License, on a durable physical medium customarily -used for software interchange, for a price no more than your reasonable cost -of physically performing this conveying of source, or (2) access to copy the -Corresponding Source from a network server at no charge. - -c) Convey individual copies of the object code with a copy of the written -offer to provide the Corresponding Source. This alternative is allowed only -occasionally and noncommercially, and only if you received the object code -with such an offer, in accord with subsection 6b. - -d) Convey the object code by offering access from a designated place (gratis -or for a charge), and offer equivalent access to the Corresponding Source -in the same way through the same place at no further charge. You need not -require recipients to copy the Corresponding Source along with the object -code. If the place to copy the object code is a network server, the Corresponding -Source may be on a different server (operated by you or a third party) that -supports equivalent copying facilities, provided you maintain clear directions -next to the object code saying where to find the Corresponding Source. Regardless -of what server hosts the Corresponding Source, you remain obligated to ensure -that it is available for as long as needed to satisfy these requirements. - -e) Convey the object code using peer-to-peer transmission, provided you inform -other peers where the object code and Corresponding Source of the work are -being offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from -the Corresponding Source as a System Library, need not be included in conveying -the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible -personal property which is normally used for personal, family, or household -purposes, or (2) anything designed or sold for incorporation into a dwelling. -In determining whether a product is a consumer product, doubtful cases shall -be resolved in favor of coverage. For a particular product received by a particular -user, "normally used" refers to a typical or common use of that class of product, -regardless of the status of the particular user or of the way in which the -particular user actually uses, or expects or is expected to use, the product. -A product is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent the -only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, -authorization keys, or other information required to install and execute modified -versions of a covered work in that User Product from a modified version of -its Corresponding Source. The information must suffice to ensure that the -continued functioning of the modified object code is in no case prevented -or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically -for use in, a User Product, and the conveying occurs as part of a transaction -in which the right of possession and use of the User Product is transferred -to the recipient in perpetuity or for a fixed term (regardless of how the -transaction is characterized), the Corresponding Source conveyed under this -section must be accompanied by the Installation Information. But this requirement -does not apply if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has been installed -in ROM). - -The requirement to provide Installation Information does not include a requirement -to continue to provide support service, warranty, or updates for a work that -has been modified or installed by the recipient, or for the User Product in -which it has been modified or installed. Access to a network may be denied -when the modification itself materially and adversely affects the operation -of the network or violates the rules and protocols for communication across -the network. - -Corresponding Source conveyed, and Installation Information provided, in accord -with this section must be in a format that is publicly documented (and with -an implementation available to the public in source code form), and must require -no special password or key for unpacking, reading or copying. - - 7. Additional Terms. - -"Additional permissions" are terms that supplement the terms of this License -by making exceptions from one or more of its conditions. Additional permissions -that are applicable to the entire Program shall be treated as though they -were included in this License, to the extent that they are valid under applicable -law. If additional permissions apply only to part of the Program, that part -may be used separately under those permissions, but the entire Program remains -governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any -additional permissions from that copy, or from any part of it. (Additional -permissions may be written to require their own removal in certain cases when -you modify the work.) You may place additional permissions on material, added -by you to a covered work, for which you have or can give appropriate copyright -permission. - -Notwithstanding any other provision of this License, for material you add -to a covered work, you may (if authorized by the copyright holders of that -material) supplement the terms of this License with terms: - -a) Disclaiming warranty or limiting liability differently from the terms of -sections 15 and 16 of this License; or - -b) Requiring preservation of specified reasonable legal notices or author -attributions in that material or in the Appropriate Legal Notices displayed -by works containing it; or - -c) Prohibiting misrepresentation of the origin of that material, or requiring -that modified versions of such material be marked in reasonable ways as different -from the original version; or - -d) Limiting the use for publicity purposes of names of licensors or authors -of the material; or - -e) Declining to grant rights under trademark law for use of some trade names, -trademarks, or service marks; or - -f) Requiring indemnification of licensors and authors of that material by -anyone who conveys the material (or modified versions of it) with contractual -assumptions of liability to the recipient, for any liability that these contractual -assumptions directly impose on those licensors and authors. - -All other non-permissive additional terms are considered "further restrictions" -within the meaning of section 10. If the Program as you received it, or any -part of it, contains a notice stating that it is governed by this License -along with a term that is a further restriction, you may remove that term. -If a license document contains a further restriction but permits relicensing -or conveying under this License, you may add to a covered work material governed -by the terms of that license document, provided that the further restriction -does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, -in the relevant source files, a statement of the additional terms that apply -to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form -of a separately written license, or stated as exceptions; the above requirements -apply either way. - - 8. Termination. - -You may not propagate or modify a covered work except as expressly provided -under this License. Any attempt otherwise to propagate or modify it is void, -and will automatically terminate your rights under this License (including -any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from -a particular copyright holder is reinstated (a) provisionally, unless and -until the copyright holder explicitly and finally terminates your license, -and (b) permanently, if the copyright holder fails to notify you of the violation -by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently -if the copyright holder notifies you of the violation by some reasonable means, -this is the first time you have received notice of violation of this License -(for any work) from that copyright holder, and you cure the violation prior -to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses -of parties who have received copies or rights from you under this License. -If your rights have been terminated and not permanently reinstated, you do -not qualify to receive new licenses for the same material under section 10. - - 9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or run a copy -of the Program. Ancillary propagation of a covered work occurring solely as -a consequence of using peer-to-peer transmission to receive a copy likewise -does not require acceptance. However, nothing other than this License grants -you permission to propagate or modify any covered work. These actions infringe -copyright if you do not accept this License. Therefore, by modifying or propagating -a covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically receives -a license from the original licensors, to run, modify and propagate that work, -subject to this License. You are not responsible for enforcing compliance -by third parties with this License. - -An "entity transaction" is a transaction transferring control of an organization, -or substantially all assets of one, or subdividing an organization, or merging -organizations. If propagation of a covered work results from an entity transaction, -each party to that transaction who receives a copy of the work also receives -whatever licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the Corresponding -Source of the work from the predecessor in interest, if the predecessor has -it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights -granted or affirmed under this License. For example, you may not impose a -license fee, royalty, or other charge for exercise of rights granted under -this License, and you may not initiate litigation (including a cross-claim -or counterclaim in a lawsuit) alleging that any patent claim is infringed -by making, using, selling, offering for sale, or importing the Program or -any portion of it. - - 11. Patents. - -A "contributor" is a copyright holder who authorizes use under this License -of the Program or a work on which the Program is based. The work thus licensed -is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims owned or controlled -by the contributor, whether already acquired or hereafter acquired, that would -be infringed by some manner, permitted by this License, of making, using, -or selling its contributor version, but do not include claims that would be -infringed only as a consequence of further modification of the contributor -version. For purposes of this definition, "control" includes the right to -grant patent sublicenses in a manner consistent with the requirements of this -License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent -license under the contributor's essential patent claims, to make, use, sell, -offer for sale, import and otherwise run, modify and propagate the contents -of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement -or commitment, however denominated, not to enforce a patent (such as an express -permission to practice a patent or covenant not to s ue for patent infringement). -To "grant" such a patent license to a party means to make such an agreement -or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the -Corresponding Source of the work is not available for anyone to copy, free -of charge and under the terms of this License, through a publicly available -network server or other readily accessible means, then you must either (1) -cause the Corresponding Source to be so available, or (2) arrange to deprive -yourself of the benefit of the patent license for this particular work, or -(3) arrange, in a manner consistent with the requirements of this License, -to extend the patent - -license to downstream recipients. "Knowingly relying" means you have actual -knowledge that, but for the patent license, your conveying the covered work -in a country, or your recipient's use of the covered work in a country, would -infringe one or more identifiable patents in that country that you have reason -to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, -you convey, or propagate by procuring conveyance of, a covered work, and grant -a patent license to some of the parties receiving the covered work authorizing -them to use, propagate, modify or convey a specific copy of the covered work, -then the patent license you grant is automatically extended to all recipients -of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope -of its coverage, prohibits the exercise of, or is conditioned on the non-exercise -of one or more of the rights that are specifically granted under this License. -You may not convey a covered work if you are a party to an arrangement with -a third party that is in the business of distributing software, under which -you make payment to the third party based on the extent of your activity of -conveying the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory patent -license (a) in connection with copies of the covered work conveyed by you -(or copies made from those copies), or (b) primarily for and in connection -with specific products or compilations that contain the covered work, unless -you entered into that arrangement, or that patent license was granted, prior -to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied -license or other defenses to infringement that may otherwise be available -to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or otherwise) -that contradict the conditions of this License, they do not excuse you from -the conditions of this License. If you cannot convey a covered work so as -to satisfy simultaneously your obligations under this License and any other -pertinent obligations, then as a consequence you may - -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey the -Program, the only way you could satisfy both those terms and this License -would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the Program, -your modified version must prominently offer all users interacting with it -remotely through a computer network (if your version supports such interaction) -an opportunity to receive the Corresponding Source of your version by providing -access to the Corresponding Source from a network server at no charge, through -some standard or customary means of facilitating copying of software. This -Corresponding Source shall include the Corresponding Source for any work covered -by version 3 of the GNU General Public License that is incorporated pursuant -to the following paragraph. - -Notwithstanding any other provision of this License, you have permission to -link or combine any covered work with a work licensed under version 3 of the -GNU General Public License into a single combined work, and to convey the -resulting work. The terms of this License will continue to apply to the part -which is the covered work, but the work with which it is combined will remain -governed by version 3 of the GNU General Public License. - - 14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of the -GNU Affero General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to address -new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies -that a certain numbered version of the GNU Affero General Public License "or -any later version" applies to it, you have the option of following the terms -and conditions either of that numbered version or of any later version published -by the Free Software Foundation. If the Program does not specify a version -number of the GNU Affero General Public License, you may choose any version -ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of -the GNU Affero General Public License can be used, that proxy's public statement -of acceptance of a version permanently authorizes you to choose that version -for the Program. - -Later license versions may give you additional or different permissions. However, -no additional obligations are imposed on any author or copyright holder as -a result of your choosing to follow a later version. - - 15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE -LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER -EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM -PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - - 16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL -ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM -AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, -INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO -USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED -INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE -PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER -PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided above cannot -be given local legal effect according to their terms, reviewing courts shall -apply local law that most closely approximates an absolute waiver of all civil -liability in connection with the Program, unless a warranty or assumption -of liability accompanies a copy of the Program in return for a fee. END OF -TERMS AND CONDITIONS - -How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible -use to the public, the best way to achieve this is to make it free software -which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach -them to the start of each source file to most effectively state the exclusion -of warranty; and each file should have at least the "copyright" line and a -pointer to where the full notice is found. - - - -Copyright (C) - -This program is free software: you can redistribute it and/or modify it under -the terms of the GNU Affero General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more -details. - -You should have received a copy of the GNU Affero General Public License along -with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer network, -you should also make sure that it provides a way for users to get its source. -For example, if your program is a web application, its interface could display -a "Source" link that leads users to an archive of the code. There are many -ways you could offer source, and different solutions will be better for different -programs; see section 13 for the specific requirements. - -You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. For -more information on this, and how to apply and follow the GNU AGPL, see . diff --git a/README.md b/README.md deleted file mode 100644 index 70e1e63..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# addons_cm - -addons personalizados por Criptomart \ No newline at end of file diff --git a/cm_must_have/__init__.py b/cm_must_have/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/cm_must_have/__manifest__.py b/cm_must_have/__manifest__.py deleted file mode 100644 index 3db494a..0000000 --- a/cm_must_have/__manifest__.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2022 - Today: Criptomart (https://criptomart.net) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -{ - "name": "Criptomart - Must Have Modules", - "summary": "Install must have modules", - "version": "16.0.1.0.0", - "category": "CriptoMart - Custom", - "author": "Criptmart", - "website": "https://github.com/criptomart", - "license": "AGPL-3", - "depends": [ - "web_responsive", - "web_refresher", - "web_no_bubble", - "web_favicon", - "web_decimal_numpad_dot", - "pos_accented_search", - "remove_odoo_enterprise", - "website_odoo_debranding", - "disable_odoo_online", - "partner_disable_gravatar", - "base_technical_features", - "module_auto_update", - "mass_editing", - "auto_backup" - ], - "installable": True, -} diff --git a/network_partner/__init__.py b/network_partner/__init__.py deleted file mode 100644 index 0650744..0000000 --- a/network_partner/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/network_partner/__manifest__.py b/network_partner/__manifest__.py deleted file mode 100644 index e840c9b..0000000 --- a/network_partner/__manifest__.py +++ /dev/null @@ -1,35 +0,0 @@ -{ - 'name': "Network Partner", - 'summary': "Makes networks based in nodes of Partners.", - 'description': """ -Network partners -================================================== -Introduce el concepto de "nodo" y "red" en contactos asociados. - -No proporciona funcionalidad por sí mismo, se usará luego en otros módulos. - -- Modelo network -- Modelo nodo -- Añade campos node_id, is_node a res.partner -- Reglas de seguridad y access lists - """, - 'author': 'Criptomart', - 'website': "https://criptomart.net", - 'category': 'Contacts', - 'version': "16.0.1.0.0", - 'license': 'AGPL-3', - 'depends': ['base','stock'], - 'data': [ - 'views/res_partner_views.xml', - 'views/partner_node_views.xml', - 'views/partner_net_views.xml', - 'security/network_partner_security.xml', - 'security/ir.model.access.csv', - 'views/actions.xml', - 'views/menus.xml', - ], - 'demo': [], - 'installable': True, - 'auto_install': False, - 'application': False, -} diff --git a/network_partner/models/__init__.py b/network_partner/models/__init__.py deleted file mode 100644 index 956489d..0000000 --- a/network_partner/models/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from . import res_partner -from . import partner_node -from . import partner_network - diff --git a/network_partner/models/partner_network.py b/network_partner/models/partner_network.py deleted file mode 100644 index adda645..0000000 --- a/network_partner/models/partner_network.py +++ /dev/null @@ -1,15 +0,0 @@ -#import logging - -from odoo import models, fields, api - -#_logger = logging.getLogger(__name__) - - -class PartnerNetwork(models.Model): - _name = 'partner.network' - #_inherit = 'mail.thread' - _description = 'A network of nodes.' - - name = fields.Char(string="Nombre", help="El nombre de la red.") - nodes_ids = fields.One2many('partner.node', 'network_id', string="Nodos de la red", help="Los nodos de usuarios finales que conforman la red") - diff --git a/network_partner/models/partner_node.py b/network_partner/models/partner_node.py deleted file mode 100644 index f5f578e..0000000 --- a/network_partner/models/partner_node.py +++ /dev/null @@ -1,16 +0,0 @@ -#import logging - -from odoo import models, fields, api - - -#_logger = logging.getLogger(__name__) - - -class PartnerNode(models.Model): - _name = 'partner.node' - _description = 'A node of partners in a network' - - name = fields.Char(string="Nombre", help="Cómo se denomina el nodo.") - network_id = fields.Many2one('partner.network', string="Red", help="La red a la que pertenece el nodo.") - partner_ids = fields.One2many('res.partner', 'node_id', string='Contactos del nodo', help='Los contactos asociados a éste nodo.') - diff --git a/network_partner/models/res_partner.py b/network_partner/models/res_partner.py deleted file mode 100644 index c34f67c..0000000 --- a/network_partner/models/res_partner.py +++ /dev/null @@ -1,14 +0,0 @@ -#import logging - -from odoo import models, fields, api - - -#_logger = logging.getLogger(__name__) - - -class ResPartner(models.Model): - _inherit = 'res.partner' - #'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'), - node_id = fields.Many2one('partner.node', string="Nodo") - is_node = fields.Boolean(string="Es un nodo", help="Éste partner representa un nodo en una red.") - diff --git a/network_partner/security/ir.model.access.csv b/network_partner/security/ir.model.access.csv deleted file mode 100644 index 43ee717..0000000 --- a/network_partner/security/ir.model.access.csv +++ /dev/null @@ -1,5 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_network_partner_node_group_user,network.partner.node.user,network_partner.model_partner_node,network_partner.group_np_user,1,0,0,0 -access_network_partner_node_group_manager,network.partner.node.manager,network_partner.model_partner_node,network_partner.group_np_manager,1,1,1,1 -access_network_partner_net_group_user,network.partner.net.user,network_partner.model_partner_network,network_partner.group_np_user,1,0,0,0 -access_network_partner_net_group_manager,network.partner.net.manager,network_partner.model_partner_network,network_partner.group_np_manager,1,1,1,1 diff --git a/network_partner/security/network_partner_security.xml b/network_partner/security/network_partner_security.xml deleted file mode 100644 index 6b3a9a8..0000000 --- a/network_partner/security/network_partner_security.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - Network Partner module access - User access level for this module - 3 - - - - User - - - - - - Manager - - - - - - - - - - - - - network.partner.node.read.rule - - - [(1, '=', 1)] - - - - - - - - - network.partner.node.write.rule - - - [(1, '=', 1)] - - - - - - - - - network.partner.net.read.rule - - - [(1, '=', 1)] - - - - - - - - - network.partner.net.write.rule - - - [(1, '=', 1)] - - - - - - - - - diff --git a/network_partner/static/description/icon.png b/network_partner/static/description/icon.png deleted file mode 100644 index 13890ffea081d04ca8c06ddce2e3935655a2e823..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6876 zcmV<28YAV2P)%=8R~hK4XUK8E@Ec`VE?V0n3& zH*K6K4kko&bg-T+j0Z>nv7lHq3YSghV}XF(`J0Flq-$cCIL6^UWjyE04O*Xw^-0V1 zPnM8#Mv)5?D+;VzzYd!=Z2Iy1=}Sf02jH@uzj3~MaeDFV=TD!Dfq?;-nH+HhP6ZGO zwz#{4>qYxT;W#dck43@xiw+GiX|0$<7IeK9BM~ex<4LRIWB%BWloNWodr)pK$IC5c zx1BzB`q-P7Z%)q4&HN1zcjx~T^ji)!J|EcKd4oVE?Wvh>}+16R5o3gLwI${?P$~aj!9Bg7tML zNheI<7sTuHhXU86Q=MH3uXz&7nhO40PdzoA%CbCfhYlZl>hQjAq?*A_!$1&2XAoD; z{9qIKR6eEWUO5yNQOQ!~$&PwL>@u6Cc5KfOA_ai!)nrKLya$TFqoaaYzMC7DD>I*!Nvxtv>Q59)(?6M}1$Ewu_DqER<} zh>EAle6R5RGyc_={c=y+P6c^V3?%>#fmkujM0lu&&q(_d_;K3}#4<`{1FIRT35Y;w z_x)ENtyu62rqsIrAj|-QKJDBh>cy>Xao(XiAZiXCXBt+OjA&{Hp2XfFID2qsl;$Bm zm%BOrGrjI23<3!^Nler|CJ6)VC%Z{KcUI}FCEsJOr}{xj0DL$*y#G<5NZo*tV@tm6 ze;HEMG+hR~Q}5G2E&&(8f!|V? zp>00M5_LHoSi_dw4F8zOKIrEE%;b6n*VhAp<=SID)2I*(?_7==MIm~hrZ3xnhAFlI z-$Bjw{lmT)pvn!yP>>uo$@cz7NLdUZrqxa=ER$_(07_zue*9KXmM1tV7*B&tSK?tL z)A;&A{n5|UAg1s%q0#nPyv$U_)5HwJ^hbeEk$L*9^E4cDc^Vhg{af%UJWV1dD{9rA ztobJbmi2GJq$i|0kI~Q5aJU888aX-i@idI}ES?6?*7@VS^7|oX468|MJPrP%-^|m5 zSjy9&Em7!Pmw6iSFo+q~!M;WflhORPxqR2b(;z0^xozD?E9*QBM>kJ1o=xRx!WGa* z9%f`1Z;X*|!3K?p&ePbbtIpH>=V`)dOd zjc>g0G}zz`Q2Nvr2L*C5l$`)%@&enAf5)E#%-^Yr!j#iJdF#d#M4MN z!TVrIm=HF_tpcNkr*W&q+VAFRIJkL46e>Iov)A~y^EBJ>I>^H?00N68Eahn!(|H;S zy1>&Q<^-Mwf~xW~jLGtX&nrC55DaXDeuqYm@Gv4Y{X8?zUS4$f@-!GTc^a{;l{^if zBko%;))#zby5RQ1DnBm7r65@EZ*Zf;b}q*69aPdlGc3) zCOl2jx)1Xo#?#2g`sVfVG+{LGG(zo#48y{b*+$ZS#$)*L*l(=!chBc(-1fX+WzlLp z4c^V=X}04$uHRXVeBG}+21jmN%F|%elle%)6`lt1m+>^P5x-b;o`xB54o|aDF!>*7 z89~w?Vv7CzyF5*yp|+N%8G`vWfLq9WC{J;vMIGk(38~7{h^2APB%a2ROvwOg7U|$= z{O&0n-S=~kpP8i1A^wuHW3?8#6h-k%M(1h3b8x+98s}*|=976EKC^qgU`bHE^-TOE zv!17+ZFvDafv3UTzlo9z%{~RiOMQdshu5#}P#TC=sNJ1(}(dnVISM%yjT9X2!(K zcWXQ{+mV@>BVl-(N|9!V?N`Cv7GF(9`qkpj9IqHe^ zk-MHojWBjyP6iaIrwPN52s85PNUIa3SUn9dz+Lq;oG>=B1|FUbEw!EoSU8P>2!73{ z-y3~(v?R>GOHV^Trh8)s&&r=f2vzQSnlK27FdSus>9evgLFTNd zX?EzS-z)Fx>B^KFZ>s;Dpr?`c2B^UGeZN^DToPum4<7z~dKw}OOEapTf-}}ePs4X# zgD^nNuQluS2^U^?q5WhLdl+B84&gsi5n%8CmtTLe_Ll)PJ&l9EjA37lYM7>>O+RnZ zqL86`$_rdkPcu0=X>9LhJqIJW0C`@LyPn3LXyzG4M;>(~fB!rx*z0Ko!$c75*N-9$ zTL9hXjE6AEUxpoK1|b!=s-7k%j2sng$RQJlk+Fc;OHNUdljn$|j`&yVX}r$v&ipdI z;7=moD3J9uIiisES?JF-Jq!^>U0gxdsiqED*2tmgVVon4sa~K6Y(!@<~lk6Gaidd6Ts#f2<>qI1)>iEI}*d@h2X~_MO}L=VX0}|1Z4wAaJHPLBZ(bdXpJ zYG{BlRXT^&_93@z))ofzyA8`zr&vfSv|st5yN0#!OxHKZpg2R8er|dOb{fbklMB)z0G6zAQLuBQ=3|4*4R1us-yz|^Tz zQG#?rn73daCydK{Y(@%qJ&o7V*^%i!_h$drIF2a|nPAY<@VbUDcg|dF-n1Dd>e#qt zBdU{CcYm6K^)y5nd0vir!bP1dJTFR@-OTmO`RARFJMX*`CF&R%8^PCKf9-UCiAR|t z^fW{m9?F#A-1K7{5m}IVnR>2bp{F6-efQls_ndQ4qKuHEEszD(1m)F z3|)2QRk-c8+fd>_y#3DG`0%3-by5f|w!M40JnfbU!{rLx>NHJKiY!Pu>%`q#F*WgD z&wFSdPCW5MlsFK-{q`H48+y*o!4p}rdYbkQN=Zg5)Fh#r#prX(7^v%M3@!JQPdtg4 zGiRd2f!MouFP1J}D(GPxW-7>pG7^y@jHxJ1(u7)PW@E}ymnwO*5@?T)kE4Vc5A;2t zI*Hou2+OHWzF|obrrCoxMi$Axt_eZx^fW9rO^i>VgcjxrWhVo3f0qiZ5?gYB{lT@6j{V`mMfk+l>|2t7n!ydmRjCD$KUwB3)mY%HiG?bDk@gy1c`TNxI zwff;ABM<+zL0n!EMkkCzG%**$aMROJgh|ts#81Kki-fVd6jl~_vgxh?(S~+ z@hijoE#i+q{)i0jwyu2roabF#bL};my4^22F3RIVhl6x#!c6CO+N&f%FR2_)2!F8Neojs$Po5Y3NIE5dKx!Gef{g}zvh4b{c}U( z@#Dwrd}d9zC)20jJ~cF+Jbe;nua)+H{PiQQfAHf$Go4Pa9Chc;9XKK`wcnHRtx1NT zA3R@LW7)a9aCnb~^)znPbolDf+_dmHGNJQnyfgNWem>$brBT2@2VQIt55P&#)AWET zF+;o@<>b#YjjyNi0rT?kC9)Z8Kt`C+2h2}LQ3kWl4FTrl?Fn^f0RSXaNYKAh48t!L zt%KtwHvjIkfz#E1sIAf6%=vrcPzHFxC}6M`FB=-Kj$Yv* zNp@5K2D;fn-U7SVcC6hWTse#`!2S4)PX|xc(}-aR);(+14+u?jBYjf|4VOC9+!4U^%>S^@* zA1*#Ln;#sK>h1SK((B{b=1n&^7<+_Mc&gCDSinSb8SeK(iC|a`AcncgfRQtcbPv^& z&oIYt`~wc!q;C7M`35kcC-DGOr>Ef~&Ta+6faV3>y{XNz$1rhl6wc>?%E|aBuBT}i z3njg*dtsqezMkebFbq^AV1F1eCWnCg4~&qkr!jy52UGR*J$jnbxP=T8*Zy#uWdVkB z77j05(bnr}{sD}JqbGrps;7}C9KnYfFZ!;o=>AS!((@MmmR=6wEbr_D?!|iyJkEdH~07M zM|W=Vx7s#UPa}p|PfwyzUuv_SCI}b+c`#(Mo(Apg0psl}kt2GBvA-p-H0^N6wY5=B z!&eYBWi$W1IU)Yp;u(v;p*+?TnyjY*z!a*E`txa+nweqDe7iOu!qhX&xAqU8l#IHo zdvovJJ+HaEFMr6_(^$ZOLn^;b;+%%{Gz3CsF#I;0B@w>;8taJQk+u8Y3X|!CdxS$W zn*gYI0q>u!x5Rzu5=xOvj zn>e2)Ur(d8_21SR0t@O|paQkm3v83Crx9Q@*3gcC0zXktqmg(%O$po;{hq*10C%_3 zHIvE2l^Q@!Q@BU5_e-n;=D%y_i@8D)Q$CcO8`sk$oKI64ar~~>PnY8A$Oq{FnBe9Ul*cztPZO)i`1<{wW|%Lq_>92epBVwK zB~ec!;0Q3VfSt^&bKQCxGlxK)ucxv0Td>e|u5dKiZ+#O_SmX8wk2n*<*u2BdKbUFa z4u&uH?wI9*RO8jXh1SzU4C z-wIi_is)$sib7~x@q11}8x3s+Fz{lLSYb1I8m*b3r(ye@986)ztj)3p%Gs>r3-$vb z()Bc&Bfzkp1gac(a%)cE%-7RsaFtWA-xp1ZSxhNw8^i-}P^u8FlD=P06FadA7={~U z*MD!l{O{;#hMZ+O?ZZ$+Ph%Vh*NR|*b#wGI044zjl0i+Ro!0Br)5LYh3CS>2YoqPa z0G4*EcNX-0CMU9S+Kt0*r=B_2Ar_qo=WKkgBI?2Cyi>6=T4D3x^8M zOA19o#evNhytR6o_UZiTGN>ovcKo+WPh;1N+rK^9?lri@yu@5nu_6n9XvPU^hMq>Y z_<9-v2J?krY`gt>8sGjQ4E=BF=wsP_IfwNy3^XVNEFeM*#!0#P-5xN-r%b~?pCnyR zBO@~PG`J?~X_Vmhe~)?^*fc|NQ}p_ydKy?8{AV`?A?Yn9mN7jB9^dhIcW13-MG%DH z|1aF#;VEz@LUP<505aZ#j2wrMCm_b2fMg|E*K5hl-e#F|3TdcQ-G^(3THkxeyG#E5 zrf0Bu8h_ogLaN3hlsGT3;dY;=(f6k=KL|XHdKf?H^h4A@^EBG?vUwWO#vr^}8|KMq$o@M>IxXSsvEDyNn&*EuJ zzD1Ys6;Go^L+vHY?}%ot-EMC(9uMPtga8aQPotK}(}+j~Y+JqC%R5r^7SJE>%H(Nu znXd3OBx}5M<$mPM@ifu$nzO8}au!p$jlx>QzUuFG_==V{ zdwnN)8nqmrCid>5BcmUA^ytyI%MIqHKD{*S;_A;%^EA#nJI2#Q>lKmejzn1@ks@jz zKWXp3>++p_?Hx~Jhb{eCTdZMxeEd0&969okic(|8&>^V4`djZG4EoTph>T)@P{1Sq`6lP6CeD9dt$!j)UMY{lv|tNnPJ$&)0E za%arXlK1G}5PY6SR*1^|Nf*IOp!Fh|JPqvx7-4XDnxZT)H#>*<`FVh-aVHP(!nF%% z3^yJJghv3dX7w7Z->|-t!9@hJLi~m^Ks=59p32iusEx(oY0No>ZO@m=)5NcLhNscL zvv`{JQX6GiqF5?W7A0!+8d}ZPuY}=U0IzxB!UgQwwQKe8@bEJLx3bGrAYaDsJOk|Q zX9h^+9%n8#;aR`tr&06D_ZkBq0C)`mRfAD$Hk;={2=@cS5rT&huo1v&zv1}voA_Ex zTB+_Q(QcmQkpFq$d1O8&8Qfb~Gv=pp8eQ~%2bd~D2rZH=03(6nE6MlV!FK=}`o3?V Wyb6SggqhU<0000 - - - - Networks - ir.actions.act_window - partner.network - tree,form - { } - -

- Click to create a new Partner Network. -

- - - - - Nodes - ir.actions.act_window - partner.node - tree,form - { } - -

- Click to create a new Node. -

- - - - - - tree - - - - - - diff --git a/network_partner/views/menus.xml b/network_partner/views/menus.xml deleted file mode 100644 index 84e3f2a..0000000 --- a/network_partner/views/menus.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - diff --git a/network_partner/views/partner_net_views.xml b/network_partner/views/partner_net_views.xml deleted file mode 100644 index 889c47a..0000000 --- a/network_partner/views/partner_net_views.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - partner.network.nets.form - partner.network - - -
- - - - -
- - - - - partner.network.nets.tree - partner.network - - - - - - - - - - - diff --git a/network_partner/views/partner_node_views.xml b/network_partner/views/partner_node_views.xml deleted file mode 100644 index 7191d75..0000000 --- a/network_partner/views/partner_node_views.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - partner.network.node.form - partner.node - 20 - -
-
-

Soy el header...

-
- - - - - - - -
- - - - - partner.network.node.tree - partner.node - 10 - - - - - - - - - - - - diff --git a/network_partner/views/res_partner_views.xml b/network_partner/views/res_partner_views.xml deleted file mode 100644 index 2199a24..0000000 --- a/network_partner/views/res_partner_views.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Nodo - res.partner - - 2 - - - - - - - - - - - - - - diff --git a/network_partner/workflow.txt b/network_partner/workflow.txt deleted file mode 100644 index 59d6608..0000000 --- a/network_partner/workflow.txt +++ /dev/null @@ -1,34 +0,0 @@ -Order: - -The status of the purchase order or the quotation request. " - -A request for quotation is a purchase order in a 'Draft' status. - -Then the order has to be confirmed by the user responsible , the status switch to 'Confirmed'. - -Then the supplier must confirm the order to change the status to 'Approved'. - -When the purchase order is paid and received, the status becomes 'Done'. - -If a cancel action occurs in the invoice or in the receipt of goods, the status becomes "in exception." - - STATE_SELECTION = [ - ('draft', 'Draft PO'), - ('sent', 'RFQ'), - ('bid', 'Bid Received'), - ('confirmed', 'Waiting Approval'), - ('approved', 'Purchase Confirmed'), - ('except_picking', 'Shipping Exception'), - ('except_invoice', 'Invoice Exception'), - ('done', 'Done'), - ('cancel', 'Cancelled') - -Order.Line: - -'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], - 'Status', required=True, readonly=True, copy=False, - help=' * The \'Draft\' status is set automatically when purchase order in draft status. \ - \n* The \'Confirmed\' status is set automatically as confirm when purchase order in confirm status. \ - \n* The \'Done\' status is set automatically when purchase order is set as done. \ - \n* The \'Cancelled\' status is set automatically when user cancel purchase order.'), - diff --git a/pos_picking_load_selected_partner/__init__.py b/pos_picking_load_selected_partner/__init__.py deleted file mode 100644 index 0650744..0000000 --- a/pos_picking_load_selected_partner/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/pos_picking_load_selected_partner/__manifest__.py b/pos_picking_load_selected_partner/__manifest__.py deleted file mode 100644 index e3727e8..0000000 --- a/pos_picking_load_selected_partner/__manifest__.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - 'name': 'Pos Picking Load Selected Partner', - 'description': """ - If a partner is selected in the PoS Order as client, search only the pickings related to this partner.""", - 'version': "16.0.1.0.0", - 'license': 'AGPL-3', - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'depends': [ - "point_of_sale", - "pos_picking_load" - ], - 'data': [ - 'views/assets.xml' - ], - 'demo': [ - ], -} diff --git a/pos_picking_load_selected_partner/models/__init__.py b/pos_picking_load_selected_partner/models/__init__.py deleted file mode 100644 index ae4c272..0000000 --- a/pos_picking_load_selected_partner/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import stock_picking diff --git a/pos_picking_load_selected_partner/models/stock_picking.py b/pos_picking_load_selected_partner/models/stock_picking.py deleted file mode 100644 index 5d77546..0000000 --- a/pos_picking_load_selected_partner/models/stock_picking.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import api, fields, models, _ -from odoo.tools import date_utils -import json - -import logging -_logger = logging.getLogger(__name__) - - -class StockPicking(models.Model): - - _inherit = 'stock.picking' - diff --git a/pos_picking_load_selected_partner/static/src/js/widget.js b/pos_picking_load_selected_partner/static/src/js/widget.js deleted file mode 100644 index 70a4d6f..0000000 --- a/pos_picking_load_selected_partner/static/src/js/widget.js +++ /dev/null @@ -1,20 +0,0 @@ -odoo.define('pos_picking_load_selected_partner.picking_partner', function (require) { - "use strict"; - - var screens = require('point_of_sale.screens'); - var gui = require('point_of_sale.gui'); - - var PickingPartner = gui.Gui.prototype.screen_classes.filter(function(el) { - return el.name == 'load_picking' - })[0].widget.include({ - - show: function () { - this._super(); - var partner = this.pos.get_order().get_client(); - var query = ""; - if (partner){ query = partner.name; } - this.search_pickings(query); - } - }); - return PickingPartner; -}); \ No newline at end of file diff --git a/pos_picking_load_selected_partner/views/assets.xml b/pos_picking_load_selected_partner/views/assets.xml deleted file mode 100644 index d705648..0000000 --- a/pos_picking_load_selected_partner/views/assets.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/pos_receipt_clientinfo/__init__.py b/pos_receipt_clientinfo/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pos_receipt_clientinfo/__manifest__.py b/pos_receipt_clientinfo/__manifest__.py deleted file mode 100644 index ee59234..0000000 --- a/pos_receipt_clientinfo/__manifest__.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - 'name': 'Pos Receipt Clientinfo', - 'description': """ - Adds a report to print a simplified invoice with client tax data""", - 'version': "16.0.1.0.0", - 'license': 'AGPL-3', - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'depends': [ - 'point_of_sale', - 'l10n_es_pos' - ], - 'data': [ - 'views/report_receipt.xml' - ], - 'qweb': [ - 'static/src/xml/pos.xml', - ], - 'demo': [ - ], -} diff --git a/pos_receipt_clientinfo/static/src/xml/pos.xml b/pos_receipt_clientinfo/static/src/xml/pos.xml deleted file mode 100644 index 828cb9c..0000000 --- a/pos_receipt_clientinfo/static/src/xml/pos.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - -
-
-

-
- -
-

-
- Phone:
-
-
-
- -
- Cooperativista:
- Name:
- - VAT:
- - - - - - -
- -
-
- -
-
- - - - - - - - - - - - -
- -
- - Ud. - - - - - -
- x -
- 		- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Subtotal: - -
- -
Discount: - -
Total: - -
Total Redondeado: - -
Total: - -
-
- - - - - - - -
- - - -
-
- - -
Change: - -
- -
-
- -
- -
-
- - -
Simplified invoice: - - -
-
- - - - - - - - Logo -
- - -
- - -
- -
- - -
VAT:
- - -
Tel:
- -
--------------------------------
- - Cooperativista:
- Name:
- VAT:
- Address: - -
--------------------------------
- - - - -
- - -
-
Served by
-
--------------------------------
-
- - -
- -
- -
- -
- -
- - - - - Ud. - - - - - -
- x -
- - - - - - - - - -
-
--------------------------------
-
- - Subtotal: - - - - - - - - - - - - - - - Discount: - - - - - - - - Total: - - - - - - Total (Redondeado): - - - - - - - - Total: - - - - - -
-
--------------------------------
-
- - - - - - - - - - -
-
- Change: - - - - -
- - - - - - -
- -
-
- - -
- - -
Simplified invoice: - - -
- - - - - diff --git a/pos_receipt_clientinfo/views/report_receipt.xml b/pos_receipt_clientinfo/views/report_receipt.xml deleted file mode 100644 index c52ded5..0000000 --- a/pos_receipt_clientinfo/views/report_receipt.xml +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - Point Of Sale Receipt - - custom - 150 - 60 - Portrait - 3 - 3 - 3 - 3 - - 3 - 130 - - - - - - diff --git a/pos_ticket_pricelist/__init__.py b/pos_ticket_pricelist/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pos_ticket_pricelist/__manifest__.py b/pos_ticket_pricelist/__manifest__.py deleted file mode 100644 index 3c64ab3..0000000 --- a/pos_ticket_pricelist/__manifest__.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - 'name': 'Pos Ticket Pricelist', - 'description': """ - Prints the pricelist applied on tickets.""", - 'version': "16.0.1.0.0", - 'license': 'AGPL-3', - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'depends': [ - "point_of_sale" - ], - 'data': [ - ], - 'assets': { - 'point_of_sale.assets': [ - 'pos_ticket_pricelist/static/src/xml/pos.xml' - ], - }, - 'demo': [ - ], -} diff --git a/pos_ticket_pricelist/static/src/xml/pos.xml b/pos_ticket_pricelist/static/src/xml/pos.xml deleted file mode 100644 index ff511c6..0000000 --- a/pos_ticket_pricelist/static/src/xml/pos.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - -
- - - - {'oe_hidden': True} - - - - diff --git a/product_category_default_ecommerce_cat/__manifest__.py b/product_category_default_ecommerce_cat/__manifest__.py index b81d5ca..7d8d9c2 100644 --- a/product_category_default_ecommerce_cat/__manifest__.py +++ b/product_category_default_ecommerce_cat/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Product Category Default e-commerce Category', - 'summary': "Set up default public categories based in internal category.", + 'summary': "Set up website categories based in internal category.", 'version': "16.0.1.0.0", 'author': "Criptomart", 'website': 'https://criptomart.net', diff --git a/product_category_default_ecommerce_cat/models/product_product.py b/product_category_default_ecommerce_cat/models/product_product.py index 935b418..95e9464 100644 --- a/product_category_default_ecommerce_cat/models/product_product.py +++ b/product_category_default_ecommerce_cat/models/product_product.py @@ -1,9 +1,5 @@ - -#import logging - from odoo import api, fields, models -#_logger = logging.getLogger(__name__) class ProductProduct(models.Model): _inherit = 'product.product' @@ -25,16 +21,12 @@ class ProductProduct(models.Model): if pub_cat: new_cats.append(pub_cat) vals['public_categ_ids'] = [[6,0,new_cats]] - #vals['is_published'] = True elif template_id: template = self.env["product.template"].browse(template_id) category = template.categ_id pub_cat = self.get_category_public_category(category) if pub_cat: template.public_categ_ids += pub_cat - # autopublish - #if template.public_categ_id: - # template.is_published = True return super().create(vals) diff --git a/product_category_default_pos_cat/__manifest__.py b/product_category_default_pos_cat/__manifest__.py index 63b0ddf..52a1ab9 100644 --- a/product_category_default_pos_cat/__manifest__.py +++ b/product_category_default_pos_cat/__manifest__.py @@ -3,6 +3,7 @@ { 'name': 'Product Category Default PoS Category', + 'summary': "Set up point of sale category based in internal category.", 'version': "16.0.1.0.0", 'author': "Criptomart", 'website': 'https://github.com/criptomart/obook', diff --git a/product_category_tax/__manifest__.py b/product_category_tax/__manifest__.py index 67f4a7a..4c2fc55 100644 --- a/product_category_tax/__manifest__.py +++ b/product_category_tax/__manifest__.py @@ -2,7 +2,8 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Product Category Tax', + 'name': 'Product Category Default Tax', + 'summary': "Set up website categories based in internal category.", 'version': "16.0.1.0.0", 'author': "Criptomart", 'website': 'https://github.com/criptomart/obook', diff --git a/product_update_price_last_purchase/README.rst b/product_update_price_last_purchase/README.rst deleted file mode 100644 index 7b1561d..0000000 --- a/product_update_price_last_purchase/README.rst +++ /dev/null @@ -1,56 +0,0 @@ -======================================= -Product Update Price From Last Purchase -======================================= - -.. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! This file is generated by oca-gen-addon-readme !! - !! changes will be overwritten. !! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:9a3d6dc2e0410212d91f0fba1627ece05131bc10535ebe1e51b03c5a7026f30d - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png - :target: https://odoo-community.org/page/development-status - :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 -.. |badge3| image:: https://img.shields.io/badge/github-Criptomart%2Faddons_cm-lightgray.png?logo=github - :target: https://github.com/Criptomart/addons_cm/tree/16.0/product_update_price_last_purchase - :alt: Criptomart/addons_cm - -|badge1| |badge2| |badge3| - -Update price from last purchase price, using product classification -margin - -**Table of contents** - -.. contents:: - :local: - -Bug Tracker -=========== - -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. - -Do not contact contributors directly about support or help with technical issues. - -Credits -======= - -Authors -------- - -* Criptomart - -Maintainers ------------ - -This module is part of the `Criptomart/addons_cm `_ project on GitHub. - -You are welcome to contribute. diff --git a/product_update_price_last_purchase/__init__.py b/product_update_price_last_purchase/__init__.py deleted file mode 100644 index 0650744..0000000 --- a/product_update_price_last_purchase/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/product_update_price_last_purchase/__manifest__.py b/product_update_price_last_purchase/__manifest__.py deleted file mode 100644 index 1cd63ae..0000000 --- a/product_update_price_last_purchase/__manifest__.py +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "Product Update Price From Last Purchase", - "version": "16.0.1.0.0", - "category": "purchase", - "summary": """" - Personaliza el comportamiento de Product para supermercados: - * Campo que guarda el último precio de compra en vez de usar standard_price - y no afectar a la valoración de inventario. - * Actualiza el precio de venta según el último precio de coste aplicado a una tarifa. - * Filtro para productos actualizados el último precio de coste. - * Filtro para productos que necesitan etiqueta nueva. - """, - "author": "Criptomart", - "website": "https://criptomart.net", - "license": "AGPL-3", - "depends": [ - "account", - "stock_account", - "sale", - "product_margin_classification", - ], - "data": [ - "views/actions.xml", - "views/product_view.xml", - ], - "installable": True, -} diff --git a/product_update_price_last_purchase/i18n/es.po b/product_update_price_last_purchase/i18n/es.po deleted file mode 100644 index 722f46d..0000000 --- a/product_update_price_last_purchase/i18n/es.po +++ /dev/null @@ -1,282 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * product_update_price_last_purchase -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-28 17:11+0000\n" -"PO-Revision-Date: 2022-03-28 17:11+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__list_price_automatic -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__list_price_automatic -msgid "Automatic Sale Price" -msgstr "Precio de venta automático" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__list_price_automatic -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__list_price_automatic -msgid "Automatic computation of the PVP from the cost price and the rate defined in the configuration." -msgstr "Cálculo automático del PVP a partir del precio de coste y la tarifa definida en la configuración." - -#. module: product_update_price_last_purchase -#: model:ir.actions.report,name:product_update_price_last_purchase.report_productbarcode -msgid "Barcode" -msgstr "Código de barras" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_pricelist_item__base -msgid "Base price for computation.\n" -"Public Price: The base price will be the Sale/public Price.\n" -"Cost Price : The base price will be the cost price.\n" -"Other Pricelist : Computation of the base price based on another Pricelist." -msgstr "Precio base de cálculo.\n" -"Precio Público: El precio base será el Precio Público / Venta.\n" -"Precio de costo: El precio base será el precio de costo.\n" -"Otra lista de precios: cálculo del precio base basado en otra lista de precios." - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_pricelist_item__base -msgid "Based on" -msgstr "Basado en" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__last_purchase_price_compute_type -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__last_purchase_price_compute_type -msgid "Choose whether discounts should influence the calculation of the last purchase price. Select Never update for manual configuration of cost and sale prices.\n" -"\n" -"* Without discounts: does not take into account discounts when updating the last purchase price.\n" -"* First discount: take into account only first discount when updating the last purchase price.\n" -"* Triple discount: take into account all discounts when updating the last purchase price. Needs \"Purchase Triple Discount\" OCA module.\n" -"* Manual update: Select this for manual configuration of cost and sale price. The sales price will not be calculated automatically." -msgstr "Elija si los descuentos deben influir en la actualización del último precio de compra. Seleccione No actualizar nunca para la configuración manual de los precios de coste y venta.\n" -"\n" -"* Sin descuentos: no tiene en cuenta ningún descuento al actualizar el último precio de compra.\n" -"* Primer descuento: tiene en cuenta sólo el primer descuento al actualizar el último precio de compra.\n" -"* Triple descuento: tiene en cuenta todos los descuentos al actualizar el último precio de compra. Necesita el módulo OCA \"Purchase Triple Discount\".\n" -"* Actualización manual: configuración manual del precio de coste y de venta. El precio de venta no se calculará automáticamente." - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_res_company -msgid "Companies" -msgstr "Compañías" - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_res_config_settings -msgid "Config Settings" -msgstr "Opciones de Configuración" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_packaging__qty -msgid "Contained Quantity" -msgstr "Cantidad contenida" - -#. module: product_update_price_last_purchase -#: selection:product.pricelist.item,base:0 -msgid "Cost" -msgstr "Coste" - -#. module: product_update_price_last_purchase -#: selection:product.pricelist.item,base:0 -msgid "Cost Price Tax Included" -msgstr "Precio de coste con impuesto incluido" - -#. module: product_update_price_last_purchase -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.res_config_settings_view_form_pricelists -msgid "Default pricelists for Coops" -msgstr "Tarifas por defecto para cooperativas" - -#. module: product_update_price_last_purchase -#: selection:product.template,last_purchase_price_compute_type:0 -msgid "First discount" -msgstr "Primer descuento" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__last_purchase_price -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__last_purchase_price -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.product_view_inherit_list_price_auto -#: selection:product.pricelist.item,base:0 -msgid "Last purchase price" -msgstr "Último precio de compra" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__last_purchase_price_compute_type -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__last_purchase_price_compute_type -msgid "Last purchase price calculation type" -msgstr "Cálculo de último precio de compra" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__list_price_updated -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__list_price_updated -msgid "Last purchase price updated" -msgstr "Último precio de compra actualizado" - -#. module: product_update_price_last_purchase -#: selection:product.template,last_purchase_price_compute_type:0 -msgid "Manual update" -msgstr "Actualización manual" - -#. module: product_update_price_last_purchase -#: code:addons/product_update_price_last_purchase/models/product_template.py:38 -#, python-format -msgid "Not found a valid pricelist to compute sale price. Check configuration in General Settings." -msgstr "" - -#. module: product_update_price_last_purchase -#: selection:product.pricelist.item,base:0 -msgid "Other Pricelist" -msgstr "Otra tarifa" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__list_price -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__list_price -msgid "Price calculated according to the configured pricelist, including VAT." -msgstr "Precio calculado según la tarifa configurada, incluyendo el IVA." - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_product_pricelist -msgid "Pricelist" -msgstr "Tarifa" - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_product_pricelist_item -msgid "Pricelist Item" -msgstr "Elemento de tarifa" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_res_config_settings__product_pricelist_automatic -msgid "Pricelist applied to automatic calculation of sales price" -msgstr "Tarifa aplicada al cálculo automático del precio de venta" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_res_company__product_pricelist_automatic -msgid "Pricelist applied to the automatic selling price" -msgstr "Tarifa aplicada al PVP automáticamente" - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_product_product -msgid "Product" -msgstr "Producto" - -#. module: product_update_price_last_purchase -#: model:ir.actions.report,name:product_update_price_last_purchase.report_product_product_barcode -#: model:ir.actions.report,name:product_update_price_last_purchase.report_product_template_barcode -#: model:ir.actions.report,name:product_update_price_last_purchase.report_productbarcode_laosa -#: model:ir.actions.report,name:product_update_price_last_purchase.report_simple_barcode_laosa -msgid "Product Barcode (PDF)" -msgstr "Código de barras del producto (PDF)" - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_product_packaging -msgid "Product Packaging" -msgstr "Empaquetado del producto" - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_product_template -msgid "Product Template" -msgstr "Plantilla de producto" - -#. module: product_update_price_last_purchase -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_tags -msgid "Products that have changed their sales price and no label has been printed." -msgstr "Productos que han cambiado su PVP y no se ha impreso su etiqueta." - -#. module: product_update_price_last_purchase -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_updated -msgid "Products that have recently changed their cost price and have not updated their selling price." -msgstr "Productos que han cambiado recientemente su precio de coste y no han actualizado su PVP." - -#. module: product_update_price_last_purchase -#: selection:product.pricelist.item,base:0 -msgid "Public Price" -msgstr "Precio público" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_res_company__product_pricelist_automatic -#: model:ir.model.fields,help:product_update_price_last_purchase.field_res_config_settings__product_pricelist_automatic -msgid "Rate that applies to all products that update the selling price automatically." -msgstr "Tarifa que se aplica a todos los productos que actualizan el precio de venta automáticamente." - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_ir_actions_report -msgid "Report Action" -msgstr "Reportar la acción" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__list_price -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__list_price -msgid "Sale price with VAT" -msgstr "PVP con impuestos" - -#. module: product_update_price_last_purchase -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.product_view_inherit_list_price_auto -msgid "Sale price." -msgstr "PVP" - -#. module: product_update_price_last_purchase -#: model:ir.model,name:product_update_price_last_purchase.model_stock_move -msgid "Stock Move" -msgstr "Movimiento de stock" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__list_price_updated -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__list_price_updated -msgid "The last cost price has been updated and you need to update the selling price in the database, shelves and scales." -msgstr "Se ha actualizado el último precio de coste y hay que actualizar el PVP en la base de datos, lineales y las balanzas." - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__last_purchase_price -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__last_purchase_price -msgid "The last price at which the product was purchased. It is used as the base price field for calculating the product sale price." -msgstr "El último precio al que se compró el producto. Se utiliza como campo de precio base para calcular el precio de venta del producto." - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__to_print -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__to_print -msgid "The sale price has been updated on this product and needs to be updated on the shelf." -msgstr "El PVP ha sido actualizado en este producto y necesita ser actualizado en el lineal." - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_packaging__qty -msgid "The total number of products you can have per pallet or box." -msgstr "El numero total de productos que puede tener por palé o caja." - -#. module: product_update_price_last_purchase -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_tags -msgid "To print" -msgstr "Para imprimir" - -#. module: product_update_price_last_purchase -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__to_print -#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__to_print -msgid "To print label" -msgstr "Pendiente de imprimir etiqueta" - -#. module: product_update_price_last_purchase -#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_updated -msgid "To update sales price" -msgstr "Pendiente de actualizar PVP" - -#. module: product_update_price_last_purchase -#: selection:product.template,last_purchase_price_compute_type:0 -msgid "Triple discount" -msgstr "Triple decuento" - -#. module: product_update_price_last_purchase -#: model:ir.actions.server,name:product_update_price_last_purchase.action_product_calculate_theoritical_price -msgid "Update Sales Price" -msgstr "Actualizar PVP" - -#. module: product_update_price_last_purchase -#: selection:product.template,last_purchase_price_compute_type:0 -msgid "Without discounts" -msgstr "Sin descuentos" - diff --git a/product_update_price_last_purchase/models/__init__.py b/product_update_price_last_purchase/models/__init__.py deleted file mode 100644 index fb351a4..0000000 --- a/product_update_price_last_purchase/models/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from . import product_template -from . import product_product -from . import stock_move diff --git a/product_update_price_last_purchase/models/product_product.py b/product_update_price_last_purchase/models/product_product.py deleted file mode 100644 index dbdacbc..0000000 --- a/product_update_price_last_purchase/models/product_product.py +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2020: Criptomart (https://criptomart.net) -# @author Santi Noreña () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -import logging - -from odoo import api, fields, models - -_logger = logging.getLogger(__name__) - - -class ProductProduct(models.Model): - _inherit = "product.product" - - @api.depends( - "standard_price", - "last_purchase_price_received", - "lst_price", - "margin_classification_id", - "margin_classification_id.markup", - "margin_classification_id.price_round", - "margin_classification_id.price_surcharge", - "product_tmpl_id.taxes_id", - "product_tmpl_id.list_price", - ) - def _compute_theoretical_multi(self): - res = super()._compute_theoretical_multi() - for product in self: - if product.last_purchase_price_received != 0: - ( - product.margin_state, - product.theoretical_price, - product.theoretical_difference, - ) = self._get_margin_info( - product.margin_classification_id, - product.taxes_id, - product.name, - product.last_purchase_price_received, - product.lst_price, - ) - return res - - def use_theoretical_price(self): - for product in self: - if product.last_purchase_price_received_compute_type != "manual_update": - product.lst_price = product.theoretical_price - product.to_print_label = True - - -class ProductPackaging(models.Model): - _inherit = "product.packaging" - - qty = fields.Float( - "Contained Quantity", - help="The total number of products you can have per pallet or box.", - digits="Product Unit of Measure", - ) diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py deleted file mode 100644 index e6bb20b..0000000 --- a/product_update_price_last_purchase/models/product_template.py +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (C) 2020: Criptomart (https://criptomart.net) -# @author Santi Noreña () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -import logging - -from odoo import api, fields, models - -_logger = logging.getLogger(__name__) - -MARGIN_STATE_SELECTION = [ - ("correct", "Correct Margin"), - ("too_cheap", "Too Cheap"), - ("too_expensive", "Too Expensive"), -] - - -class ProductTemplate(models.Model): - _inherit = "product.template" - - margin_state = fields.Selection( - string="Theoretical Price State", - compute="_compute_theoretical_multi_template", - selection=MARGIN_STATE_SELECTION, - store=True, - ) - - to_print_label = fields.Boolean( - string="To print label", - help="""The sale price has been updated on this product - and needs to be updated on the shelf.""", - default=False, - ) - - last_purchase_price_received = fields.Float( - string="Last purchase price", - help="The last price at which the product was purchased. " - "It is used as the base price field for calculating the product sale price.", - readonly=True, - digits="Product Price", - ) - - last_purchase_price_received_compute_type = fields.Selection( - [ - ("without_discounts", "Without discounts"), - ("with_discount", "First discount"), - ("with_two_discounts", "Double discount"), - ("with_three_discounts", "Triple discount"), - ("manual_update", "Manual update"), - ], - string="Last purchase price calculation type", - help=""" - Choose whether discounts should influence the calculation of the last purchase price. - Select Never update for manual configuration of cost and sale prices.\n - * Without discounts: does not take into account discounts when updating - the last purchase price.\n - * First discount: take into account only first discount when updating - the last purchase price.\n - * Double discount: take into account two first discounts when updating - the last purchase price.\n - * Triple discount: take into account all discounts when updating - the last purchase price. - Needs "Purchase Triple Discount" OCA module.\n - * Manual update: Select this for manual configuration of cost and sale price. - The sales price will not be calculated automatically. - """, - default="without_discounts", - required=True, - ) - - @api.onchange( - "last_purchase_price_received", - "standard_price", - "taxes_id", - "margin_classification_id", - "list_price", - ) - def _onchange_standard_price(self): - res = super()._onchange_standard_price() - if self.last_purchase_price_received != 0: - ( - self.margin_state, - self.theoretical_price, - self.theoretical_difference, - ) = self.env["product.product"]._get_margin_info( - self.margin_classification_id, - self.taxes_id, - self.name, - self.last_purchase_price_received, - self.list_price, - ) - return res diff --git a/product_update_price_last_purchase/models/stock_move.py b/product_update_price_last_purchase/models/stock_move.py deleted file mode 100644 index e30e522..0000000 --- a/product_update_price_last_purchase/models/stock_move.py +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2016-2019 Akretion (http://www.akretion.com/) -# Copyright 2020 Criptomart -# @author: Alexis de Lattre -# @author Santi Noreña () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -import logging - -from odoo import models -from odoo.tools import float_compare, float_is_zero, float_round - -_logger = logging.getLogger(__name__) - - -class StockMove(models.Model): - _inherit = "stock.move" - - def product_price_update_before_done(self): - res = super(StockMove, self).product_price_update_before_done() - for move in self.filtered(lambda move: move.location_id.usage == "supplier"): - if ( - move.product_id.last_purchase_price_received_compute_type - == "with_three_discounts" - ): - price_updated = float_round( - move.purchase_line_id.price_subtotal - / move.purchase_line_id.product_qty, - precision_digits=2, - ) - elif ( - move.product_id.last_purchase_price_received_compute_type - == "with_discount" - ): - price_updated = float_round( - move.purchase_line_id.price_unit - * (1 - move.purchase_line_id.discount / 100), - precision_digits=2, - ) - elif ( - move.product_id.last_purchase_price_received_compute_type - == "with_two_discounts" - ): - price_updated = float_round( - move.purchase_line_id.price_unit - * (1 - move.purchase_line_id.discount / 100) - * (1 - move.purchase_line_id.discount2 / 100), - precision_digits=2, - ) - - else: - price_updated = move.purchase_line_id.price_unit - - if float_compare( - move.product_id.last_purchase_price_received, - price_updated, - precision_digits=2, - ) and not float_is_zero(move.quantity_done, precision_digits=3): - _logger.info( - "Update last_purchase_price_received: %s for product %s Previous price: %s" - % ( - price_updated, - move.product_id.default_code, - move.product_id.last_purchase_price_received, - ) - ) - # Write last purchase price as SUPERUSER_ID - # warehouse manager may not have the right to write on products - move.product_id.with_company(move.company_id.id).sudo().write( - {"last_purchase_price_received": price_updated} - ) - return res diff --git a/product_update_price_last_purchase/readme/DESCRIPTION.md b/product_update_price_last_purchase/readme/DESCRIPTION.md deleted file mode 100644 index d10e429..0000000 --- a/product_update_price_last_purchase/readme/DESCRIPTION.md +++ /dev/null @@ -1,2 +0,0 @@ -Update price from last purchase price, using product classification -margin diff --git a/product_update_price_last_purchase/static/description/index.html b/product_update_price_last_purchase/static/description/index.html deleted file mode 100644 index bb81519..0000000 --- a/product_update_price_last_purchase/static/description/index.html +++ /dev/null @@ -1,409 +0,0 @@ - - - - - -Product Update Price From Last Purchase - - - -
-

Product Update Price From Last Purchase

- - -

Beta License: AGPL-3 Criptomart/addons_cm

-

Update price from last purchase price, using product classification -margin

-

Table of contents

- -
-

Bug Tracker

-

Bugs are tracked on GitHub Issues. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

-

Do not contact contributors directly about support or help with technical issues.

-
-
-

Credits

-
-

Authors

-
    -
  • Criptomart
    • -
-
-
-

Maintainers

-

This module is part of the Criptomart/addons_cm project on GitHub.

-

You are welcome to contribute.

-
-
-
- - diff --git a/product_update_price_last_purchase/views/actions.xml b/product_update_price_last_purchase/views/actions.xml deleted file mode 100644 index 04c6e36..0000000 --- a/product_update_price_last_purchase/views/actions.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - Update Sales Price - - - code - - records.use_theoretical_price() - - - - - diff --git a/product_update_price_last_purchase/views/product_view.xml b/product_update_price_last_purchase/views/product_view.xml deleted file mode 100644 index e534cbf..0000000 --- a/product_update_price_last_purchase/views/product_view.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - product.list.price.automatic.form - product.template - form - - - - - - - - - - - product.template.product.tree - product.template - - - - - - - - - - - - view.product.search.form.inherit.updated - product.template - - - - - - - - - - - - diff --git a/purchase_collective/README.rst b/purchase_collective/README.rst deleted file mode 100644 index 330686b..0000000 --- a/purchase_collective/README.rst +++ /dev/null @@ -1,75 +0,0 @@ -==================== -Collective Purchases -==================== - -.. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! This file is generated by oca-gen-addon-readme !! - !! changes will be overwritten. !! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:3de867dc126c0b86e4d1cf5583f6823d92094851b21e228b2b364b2d444f2ce1 - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png - :target: https://odoo-community.org/page/development-status - :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 -.. |badge3| image:: https://img.shields.io/badge/github-Criptomart%2Faddons_cm-lightgray.png?logo=github - :target: https://github.com/Criptomart/addons_cm/tree/16.0/purchase_collective - :alt: Criptomart/addons_cm - -|badge1| |badge2| |badge3| - -Compras Colectivas ------------------- - -Éste módulo permite a varios usuarios de Odoo realizar una compra de -productos a un mismo proveedor que acepta pedidos conjuntos. El Usuario -que crea la orden es el encargado de distribuir los productos al resto -de usuarios, cobrar de ellos y pagar al productor. - -- modelo CollectivePurchases, con un campo que linka diferentes sales - orders -- crea un único albarán de salida al proveedor con la suma de todas las - sale orders -- cuando se recibe el cargamente del proveedor, una acción permite - crear albaranes de entrega a los almacenes dde los nodo --> ¿poner en - un módulo aparte y quitar la dependencia a network_partner? -- nueva secuencia para collective order purchase -- workflow propio, por añadir los estados de entrega en subalmacén y - entrega al cliente. -- reglas de seguridad y grupos. -- extiende partner.network añadiendo un nuevo almacén que hace posible - el flujo. - -**Table of contents** - -.. contents:: - :local: - -Bug Tracker -=========== - -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. - -Do not contact contributors directly about support or help with technical issues. - -Credits -======= - -Authors -------- - -* Criptomart - -Maintainers ------------ - -This module is part of the `Criptomart/addons_cm `_ project on GitHub. - -You are welcome to contribute. diff --git a/purchase_collective/__init__.py b/purchase_collective/__init__.py deleted file mode 100644 index 0650744..0000000 --- a/purchase_collective/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/purchase_collective/__manifest__.py b/purchase_collective/__manifest__.py deleted file mode 100644 index d7e96d3..0000000 --- a/purchase_collective/__manifest__.py +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "Collective Purchases", - "summary": "Compras Colectivas", - "author": "Criptomart", - "website": "https://criptomart.net", - "category": "Purchase Management", - "version": "16.0.1.0.0", - "license": "AGPL-3", - "depends": ["purchase", "sale", "product", "network_partner"], - "data": [ - "security/purchase_collective_security.xml", - "security/ir.model.access.csv", - # 'data/purchase_collective_workflow.xml', - # 'data/purchase_collective_sequence.xml', - "views/purchase_collective.xml", - "views/sale_order.xml", - "views/actions.xml", - "views/menus.xml", - "views/partner_node_views.xml", - "views/partner_net_views.xml", - ], - "demo": [], - "installable": True, - "auto_install": False, - "application": False, -} diff --git a/purchase_collective/data/purchase_collective_sequence.xml b/purchase_collective/data/purchase_collective_sequence.xml deleted file mode 100644 index 021a5d7..0000000 --- a/purchase_collective/data/purchase_collective_sequence.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Collective Purchase Order - purchase.collective.order - - - Collective Purchase Order - purchase.collective.order - CPO - 5 - - - - diff --git a/purchase_collective/data/purchase_collective_workflow.xml b/purchase_collective/data/purchase_collective_workflow.xml deleted file mode 100644 index 7196b2e..0000000 --- a/purchase_collective/data/purchase_collective_workflow.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - Collective Purchase Order Basic Workflow - purchase.collective.order - True - - - - - True - draft - - - - sent - function - write({'state':'sent'}) - - - - bid - function - wkf_bid_received() - - - - confirmed - OR - function - wkf_confirm_order() - - - - cancel - function - True - wkf_action_cancel() - - - - except_invoice - function - write({'state':'except_invoice'}) - - - - except_picking - function - write({'state':'except_picking'}) - - - - router - OR - function - AND - wkf_approve_order() - - - - - invoice - subflow - - action_invoice_create() - - - - - invoice_done - invoice_done() - function - - - - invoice_end - - - - picking - function - action_picking_create() - - - - - - - picking_done - picking_done() - function - - - - done - wkf_po_done() - function - True - AND - - - - - - purchase_confirm - - - - - send_rfq - - - - - purchase_confirm - - - - - bid_received - - - - - purchase_cancel - - - - - purchase_cancel - - - - - - purchase_cancel - - - - - purchase_cancel - - - - - - - - - - has_stockable_product() - - - - - not has_stockable_product() - - - - - - invoice_method=='order' - - - - - - invoice_method<>'order' - - - - - - picking_ok - - - - - invoice_ok - - - - - purchase_cancel - - - - - purchase_cancel - - - - - picking_cancel - - - - - - subflow.cancel - - - - - - picking_done - - - - - - subflow.paid - - - - - - - - - - - - - - invoiced - - - - - purchase_cancel - invoice_method<>'order' - - - - - diff --git a/purchase_collective/models/__init__.py b/purchase_collective/models/__init__.py deleted file mode 100644 index 59a30b9..0000000 --- a/purchase_collective/models/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from . import purchase_collective -from . import sale_order -from . import partner_node -from . import partner_network diff --git a/purchase_collective/models/partner_network.py b/purchase_collective/models/partner_network.py deleted file mode 100644 index 8292d68..0000000 --- a/purchase_collective/models/partner_network.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2022: Criptomart () -# @author: Criptomart () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -#import logging - -from odoo import models, fields, api -#from odoo.exceptions import ValidationError, Warning - -#_logger = logging.getLogger(__name__) - -class PartnerNetwork(models.Model): - _inherit = 'partner.network' - - wh_id = fields.Many2one('stock.warehouse', string="Almacén asociado", help='El almacén central donde recibe productos la red y se redistribuye a los nodos.') - - @api.model - def create(self, vals): - if vals.get('wh_id', False) == False: - vals['wh_id'] = self.env['stock.warehouse'].create({ - 'name': vals.get('name'), - 'code': vals.get('name')[4:] - }).id - return super().create(vals) - diff --git a/purchase_collective/models/partner_node.py b/purchase_collective/models/partner_node.py deleted file mode 100644 index 3c0e762..0000000 --- a/purchase_collective/models/partner_node.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2022: Criptomart () -# @author: Criptomart () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -#import logging - -from odoo import models, fields, api -#from odoo.exceptions import ValidationError, Warning - -#_logger = logging.getLogger(__name__) - -class PartnerNode(models.Model): - _inherit = 'partner.node' - - wh_id = fields.Many2one('stock.warehouse', string="Almacén asociado", help='El almacén donde recibe productos el nodo y los manda a los socios finales.') - - @api.model - def create(self, vals): - if vals.get('wh_id', False) == False: - vals['wh_id'] = self.env['stock.warehouse'].create({ - 'name': vals.get('name'), - 'code': vals.get('name')[4:] - }).id - return super().create(vals) - diff --git a/purchase_collective/models/purchase_collective.py b/purchase_collective/models/purchase_collective.py deleted file mode 100644 index 51deaaf..0000000 --- a/purchase_collective/models/purchase_collective.py +++ /dev/null @@ -1,251 +0,0 @@ -import pytz -import logging -from datetime import datetime -from dateutil.relativedelta import relativedelta -from operator import attrgetter - -from odoo import models, fields, api, osv, _ -from odoo.exceptions import Warning -from odoo.tools.safe_eval import safe_eval as eval - -_logger = logging.getLogger(__name__) - -class PurchaseCollectiveOrder(models.Model): - _name = 'purchase_collective.order' - _inherit = ['purchase.order'] - _description = 'Collective Purchases' - - sales_order_lines = fields.One2many('sale.order','cp_order_id','Collective Order Lines',states={'approved':[('readonly',True)],'done':[('readonly',True)]},copy=True ) - deadline_date = fields.Date(string='Order Deadline', required=True, help="End date of the order. Place your orders before this date") - amount_untaxed = fields.Float('Amount untaxed') - amount_tax = fields.Float('Taxes') - amount_total = fields.Float('Amount Total') - wh_id = fields.Many2one('stock.warehouse',string="Almacén asociado",help="El almacén central de distribución.") - qty_min =fields.Float('Cantidad mínima del pedido', required=True, help='Cantidad mínima del pedido requerida para ejecutar la orden de compra') - - #@api.onchange('sales_order_lines') - def onchange_order_line(self, args=None): - _logger.info("onchange_order_lines -- args: %s" %(args)) - res = { - 'amount_untaxed': 0.0, - 'amount_tax': 0.0, - 'amount_total': 0.0, - } - val = val1 = 0.0 - order_list = self.sales_order_lines - #_logger.info("order %s " %order.id) - val_tax = 0.0 - val_untax = 0.0 - if order_list: - cur = self.pricelist_id.currency_id - for line in order.sales_order_lines: - if line.state in ['done','approved']: - val += line.amount_total - #val_tax += val.get('amount_tax',0.0) - #val_untax += val.get('amount_untaxed',0.0) - - res['amount_tax'] = cur.round(val_tax) - res['amount_untaxed'] = val - res['amount_total']= val - - #_logger.info("Res : %s " %res) - - order.write({'amount_untaxed': res['amount_untaxed']}) - order.write({'amount_tax': res['amount_tax']}) - order.write({'amount_total': res['amount_total']}) - _logger.info("res : %s" %(res)) - _logger.warning("returning : %s" %res) - return res - - - def subscribe(self, partner): - self.message_subscribe(partner_ids=[(partner.id)]) - self.message_post(body=("Order line created by %s" %(partner.name))) - - def button_details(self): - context = self.env.context.copy() - view_id = self.env.ref( - 'sale.' - 'view_order_form').id - - context['default_is_cp'] = True - context['default_cp_order_id'] = self.id - context['supplier'] = self.partner_id - #context['default_partner_id'] = self.partner_id.id - context['default_pricelist_id'] = self.pricelist_id.id - context['default_order_date'] = self.date_order - context['default_date_planned'] = self.deadline_date - context['view_buttons'] = True - #context['fiscal_position'] = self.fiscal_position - #context['state'] = self.state - #context['parent'] = self.id - - #partial_id = self.pool.get("purchase.collective.order.line").create(context=context) - - view = { - 'name': _('Details'), - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'sale.order', - 'view_id': view_id, - 'type': 'ir.actions.act_window', - 'target': 'new', - 'readonly': False, - #'res_id': partial_id, - 'context': context - } - return view - - def _get_order(self, ids): - result = {} - for line in self.pool.get('sale.order').browse(ids): - result[line.id] = True - return result.keys() - """ - def create(self, vals=None): - _logger.warning("Creating order %s" %(vals)) - - if vals.get('name','/')=='/': - vals['name'] = self.env['ir.sequence'].get('purchase_collective.order', context=context) or '/' - if not vals.get('location_id'): - for user_obj in self.env['res.users'].browse(uid, context=context): - vals['location_id'] = user_obj.partner_id.property_stock_supplier.id - #logging.info('adding location info %s' %vals.get('location_id')) - if not vals.get('pricelist_id'): - for user_obj in self.env['res.users'].browse(uid, context=context): - vals['pricelist_id'] = user_obj.partner_id.property_product_pricelist.id - #logging.info('adding pricelist %s' %vals.get('pricelist_id')) - order = super(PurchaseCollectiveOrder, self).create(vals) - return order - """ - - def unlink(self, ids): - purchase_orders = self.read(ids, ['state'], context=context) - unlink_ids = [] - for s in purchase_orders: - if s['state'] in ['draft','cancel']: - unlink_ids.append(s['id']) - else: - raise Warning(_('Invalid Action!'), _('In order to delete a purchase order, you must cancel it first.')) - - # automatically sending subflow.delete upon deletion - self.signal_workflow(unlink_ids, 'purchase_cancel') - - return super(PurchaseCollectiveOrder, self).unlink(unlink_ids, context=context) - - def copy(self, id, default=None, context=None): - new_id = super(PurchaseCollectiveOrder, self).copy(id, default=default, context=context) - for po in self.browse([new_id], context=context): - for line in po.order_line: - vals = self.env['purchase_collective.order_line'].onchange_product_id( - line.id, po.pricelist_id.id, line.product_id.id, line.product_qty, - line.product_uom.id, po.partner_id.id, date_order=po.date_order, context=context - ) - if vals.get('value', {}).get('date_planned'): - line.write({'date_planned': vals['value']['date_planned']}) - return new_id - - def set_order_line_status(self, ids, status, context=None): - """ - line = self.pool.get('purchase_collective.order_line') - order_line_ids = [] - proc_obj = self.pool.get('procurement.order') - for order in self.browse(cr, uid, ids, context=context): - if status in ('draft', 'cancel'): - order_line_ids += [po_line.id for po_line in order.order_line] - else: # Do not change the status of already cancelled lines - order_line_ids += [po_line.id for po_line in order.order_line if po_line.state != 'cancel'] - if order_line_ids: - line.write(cr, uid, order_line_ids, {'state': status}, context=context) - if order_line_ids and status == 'cancel': - procs = proc_obj.search(cr, uid, [('purchase_line_id', 'in', order_line_ids)], context=context) - if procs: - proc_obj.write(cr, uid, procs, {'state': 'exception'}, context=context) - """ - return True - - def wkf_confirm_order(self, ids, context=None): - #_logger.info("Confirmando orden : %s" %ids) - todo = [] - for po in self.browse(ids, context=context): - if not any(line.state != 'cancel' for line in po.order_line): - raise Warning(_('Error!'),_('You cannot confirm a purchase order without any purchase order line.')) - #if po.invoice_method == 'picking' and not any([l.product_id and l.product_id.type in ('product', 'consu') and l.state != 'cancel' for l in po.order_line]): - # raise osv.except_osv( - # _('Error!'), - # _("You cannot confirm a purchase order with Invoice Control Method 'Based on incoming shipments' that doesn't contain any stockable item.")) - #for line in po.order_line: - # if line.state=='draft': - # todo.append(line.id) - #self.pool.get('purchase_collective.order_line').action_confirm(cr, uid, todo, context) - for id in ids: - self.write(id, {'state' : 'confirmed', 'validator' : uid}, context=context) - return True - - def _set_po_lines_invoiced(self, ids, context=None): - """ - for po in self.browse(cr, uid, ids, context=context): - is_invoiced = [] - if po.invoice_method == 'picking': - # We determine the invoiced state of the PO line based on the invoiced state - # of the associated moves. This should cover all possible cases: - # - all moves are done and invoiced - # - a PO line is split into multiple moves (e.g. if multiple pickings): some - # pickings are done, some are in progress, some are cancelled - for po_line in po.order_line: - if (po_line.move_ids and - all(move.state in ('done', 'cancel') for move in po_line.move_ids) and - not all(move.state == 'cancel' for move in po_line.move_ids) and - all(move.invoice_state == 'invoiced' for move in po_line.move_ids if move.state == 'done') - and po_line.invoice_lines and all(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines)): - is_invoiced.append(po_line.id) - elif po_line.product_id.type == 'service': - is_invoiced.append(po_line.id) - else: - for po_line in po.order_line: - if (po_line.invoice_lines and - all(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines)): - is_invoiced.append(po_line.id) - if is_invoiced: - self.pool['purchase_collective.order_line'].write(cr, uid, is_invoiced, {'invoiced': True}) - workflow.trg_write(uid, 'purchase_colective.order', po.id, cr) - """ - - def action_picking_create(self, ids, context=None): - for order in self.browse(ids): - picking_vals = { - 'picking_type_id': order.picking_type_id.id, - 'partner_id': order.partner_id.id, - 'date': order.date_order, - 'origin': order.name - } - picking_id = self.env['stock.picking'].create(picking_vals, context=context) - # esta llamada da fallo - #self._create_stock_moves(cr, uid, order, order.order_line, picking_id, context=context) - return picking_id - - # get the picking type for the warehouse defined in order - def _get_picking_in(self, context=None): - type_obj = self.env['stock.picking.type'] - types = type_obj.search([('code', '=', 'incoming'),('warehouse_id.id','=',self.wh_id.id)], context=context) - if not types: - types = type_obj.search(cr, uid, [('code', '=', 'incoming'), ('warehouse_id', '=', False)], context=context) - if not types: - raise Warning(_('Error!'), _("Make sure you have defined the warehouse in the order!")) - #logging.info("Types %s" %types) - return types[0] - - _defaults = { - 'date_order': fields.datetime.now, - 'state': 'draft', - 'name': '/', - 'shipped': 0, - 'invoice_method': 'order', - 'invoiced': 0, - 'picking_type_id': _get_picking_in, - } - - - - - diff --git a/purchase_collective/models/sale_order.py b/purchase_collective/models/sale_order.py deleted file mode 100644 index b5ee05b..0000000 --- a/purchase_collective/models/sale_order.py +++ /dev/null @@ -1,22 +0,0 @@ -import random - -from odoo import models, api, fields -from odoo.exceptions import ValidationError, Warning - - -class SaleOrder(models.Model): - _inherit = "sale.order" - - cp_order_id = fields.Many2one( - 'purchase_collective.order', - string='Parent Collective Purchase', - help='The collective purchase wich this order belongs', - ondelete='restrict' - ) - is_cp = fields.Boolean(string="Is part of a Collective Purchase") - - def action_confirm(self): - for order in self: - order.warehouse_id = order.partner_id.node_id.wh_id - - return super(SaleOrder, self).action_confirm() diff --git a/purchase_collective/security/ir.model.access.csv b/purchase_collective/security/ir.model.access.csv deleted file mode 100644 index 417694f..0000000 --- a/purchase_collective/security/ir.model.access.csv +++ /dev/null @@ -1,4 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_purchase_collective_order_public,purchase_collective.order,model_purchase_collective_order,base.group_public,1,0,0,0 -access_purchase_collective_order,purchase_collective.order,model_purchase_collective_order,group_purchase_collective_user,1,0,1,0 -access_purchase_collective_order_manager,purchase_collective.order,model_purchase_collective_order,group_purchase_collective_manager,1,1,1,1 diff --git a/purchase_collective/security/purchase_collective_security.xml b/purchase_collective/security/purchase_collective_security.xml deleted file mode 100644 index e694ea6..0000000 --- a/purchase_collective/security/purchase_collective_security.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - Collective Purchase - Make bulk purchases from several users - 20 - - - - User - - - - - - Manager - - - - - - - Collective Purchase Order All Read - - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.parent_id.id])] - - - - - - - - Collective Purchase Order multi-company - - - ['|',('create_uid','=',False),('create_uid','=',user.id)] - - - - - - - diff --git a/purchase_collective/static/description/index.html b/purchase_collective/static/description/index.html deleted file mode 100644 index d9fbd8b..0000000 --- a/purchase_collective/static/description/index.html +++ /dev/null @@ -1,425 +0,0 @@ - - - - - -Collective Purchases - - - -
-

Collective Purchases

- - -

Beta License: AGPL-3 Criptomart/addons_cm

-
-

Compras Colectivas

-

Éste módulo permite a varios usuarios de Odoo realizar una compra de -productos a un mismo proveedor que acepta pedidos conjuntos. El Usuario -que crea la orden es el encargado de distribuir los productos al resto -de usuarios, cobrar de ellos y pagar al productor.

-
    -
  • modelo CollectivePurchases, con un campo que linka diferentes sales -orders
    • -
  • crea un único albarán de salida al proveedor con la suma de todas las -sale orders
    • -
  • cuando se recibe el cargamente del proveedor, una acción permite -crear albaranes de entrega a los almacenes dde los nodo –> ¿poner en -un módulo aparte y quitar la dependencia a network_partner?
    • -
  • nueva secuencia para collective order purchase
    • -
  • workflow propio, por añadir los estados de entrega en subalmacén y -entrega al cliente.
    • -
  • reglas de seguridad y grupos.
    • -
  • extiende partner.network añadiendo un nuevo almacén que hace posible -el flujo.
    • -
-

Table of contents

- -
-

Bug Tracker

-

Bugs are tracked on GitHub Issues. -In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

-

Do not contact contributors directly about support or help with technical issues.

-
- -
-
-

Authors

-
    -
  • Criptomart
    • -
-
-
-

Maintainers

-

This module is part of the Criptomart/addons_cm project on GitHub.

-

You are welcome to contribute.

-
-
- - diff --git a/purchase_collective/views/actions.xml b/purchase_collective/views/actions.xml deleted file mode 100644 index 030e67a..0000000 --- a/purchase_collective/views/actions.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Open - ir.actions.act_window - purchase_collective.order - tree,form - { - 'search_default_my_sale_orders_filter': 1 - } - - -

- Click to create a new Collective Purchase. -

- - - - - Closed - ir.actions.act_window - purchase_collective.order - tree,form - { - 'search_default_my_sale_orders_filter': 1 - } - - -

- Click to create a new Collective Purchase. -

- - - - - Cancelled - ir.actions.act_window - purchase_collective.order - tree,form - { - 'search_default_my_sale_orders_filter': 1 - } - - -

- Click to create a new Collective Purchase. -

- - - - - diff --git a/purchase_collective/views/menus.xml b/purchase_collective/views/menus.xml deleted file mode 100644 index c4c2221..0000000 --- a/purchase_collective/views/menus.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/purchase_collective/views/partner_net_views.xml b/purchase_collective/views/partner_net_views.xml deleted file mode 100644 index b88ad30..0000000 --- a/purchase_collective/views/partner_net_views.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - partner.net.form.wh.view - partner.network - - - - - - - - - - partner.net.tree.wh.view - partner.network - - - - - - - - - - diff --git a/purchase_collective/views/partner_node_views.xml b/purchase_collective/views/partner_node_views.xml deleted file mode 100644 index 4a28462..0000000 --- a/purchase_collective/views/partner_node_views.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - partner.node.form.wh.view - partner.node - - - - - - - - - - partner.node.tree.wh.view - partner.node - - - - - - - - - - diff --git a/purchase_collective/views/purchase_collective.xml b/purchase_collective/views/purchase_collective.xml deleted file mode 100644 index 763d16c..0000000 --- a/purchase_collective/views/purchase_collective.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - purchase.collective.order.form.view - purchase_collective.order - -
-
-
- -
- -
-
- Request for Quotation - Purchase Order -

- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
-
- - - - - diff --git a/purchase_collective/views/sale_order.xml b/purchase_collective/views/sale_order.xml deleted file mode 100644 index c1ef456..0000000 --- a/purchase_collective/views/sale_order.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - sale order collective purchase extension - sale.order - - - - - - - - - - - - diff --git a/stock_inventory_cost_info_sum/__init__.py b/stock_inventory_cost_info_sum/__init__.py deleted file mode 100644 index 0650744..0000000 --- a/stock_inventory_cost_info_sum/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/stock_inventory_cost_info_sum/__manifest__.py b/stock_inventory_cost_info_sum/__manifest__.py deleted file mode 100644 index 40937df..0000000 --- a/stock_inventory_cost_info_sum/__manifest__.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - 'name': 'Stock Inventory Cost Info Sum', - 'description': """ - Extends the OCA module stock_inventory_cost_info to store in the Inventory model the sum of the cost information of the inventory lines. This allows exporting and filtering by this field in the inventory adjustments tree view without having to export each inventory line.""", - 'version': "16.0.1.0.0", - 'license': 'AGPL-3', - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'depends': [ - 'stock_inventory_cost_info', - ], - 'data': [ - 'views/stock_inventory.xml', - 'views/actions.xml', - ], - 'demo': [ - ], -} diff --git a/stock_inventory_cost_info_sum/models/__init__.py b/stock_inventory_cost_info_sum/models/__init__.py deleted file mode 100644 index 3553681..0000000 --- a/stock_inventory_cost_info_sum/models/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import stock_inventory diff --git a/stock_inventory_cost_info_sum/models/stock_inventory.py b/stock_inventory_cost_info_sum/models/stock_inventory.py deleted file mode 100644 index 109bc01..0000000 --- a/stock_inventory_cost_info_sum/models/stock_inventory.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from odoo import api, fields, models, _ - - -class StockInventory(models.Model): - _inherit = 'stock.inventory' - - currency_id = fields.Many2one( - string="Currency", - related="company_id.currency_id", - readonly=True, - ) - adjustment_cost_sum = fields.Monetary( - string="Adjustment cost", - compute="_compute_adjustment_cost_sum", - store=True, - ) - - @api.depends("line_ids") - def _compute_adjustment_cost_sum(self): - for record in self: - record.adjustment_cost_sum = 0 - for line in record.line_ids: - record.adjustment_cost_sum += line.adjustment_cost \ No newline at end of file diff --git a/stock_inventory_cost_info_sum/views/actions.xml b/stock_inventory_cost_info_sum/views/actions.xml deleted file mode 100644 index 6e2ee1e..0000000 --- a/stock_inventory_cost_info_sum/views/actions.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Recalculate Adjustment Cost - - - code - - records._compute_adjustment_cost_sum() - - - - \ No newline at end of file diff --git a/stock_inventory_cost_info_sum/views/stock_inventory.xml b/stock_inventory_cost_info_sum/views/stock_inventory.xml deleted file mode 100644 index 141a97b..0000000 --- a/stock_inventory_cost_info_sum/views/stock_inventory.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - stock.inventory.form (in stock_inventory_cost_info_sum) - stock.inventory - - - - - - - - - - - stock.inventory.tree (in stock_inventory_cost_info_sum) - stock.inventory - - - - - - - - - - diff --git a/website_sale_product_sort_creation_date/__init__.py b/website_sale_product_sort_creation_date/__init__.py deleted file mode 100644 index 0650744..0000000 --- a/website_sale_product_sort_creation_date/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import models diff --git a/website_sale_product_sort_creation_date/__manifest__.py b/website_sale_product_sort_creation_date/__manifest__.py deleted file mode 100644 index 0e96ea8..0000000 --- a/website_sale_product_sort_creation_date/__manifest__.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2021 Criptomart -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -{ - 'name': 'Website Sale Product Sort Creation Date', - 'summary': 'Permite ordenar por la fecha de creación de los productos.', - 'version': "16.0.1.0.0", - 'development_status': 'Beta', - 'category': 'Website', - 'website': 'https://github.com/criptomart/obook', - 'author': 'Criptomart', - 'license': 'AGPL-3', - 'depends': [ - 'website', - 'website_sale_product_sort', - ], - 'data': [ - ], - 'application': False, - 'installable': True, -} diff --git a/website_sale_product_sort_creation_date/models/__init__.py b/website_sale_product_sort_creation_date/models/__init__.py deleted file mode 100644 index 40b75e0..0000000 --- a/website_sale_product_sort_creation_date/models/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from . import website - diff --git a/website_sale_product_sort_creation_date/models/website.py b/website_sale_product_sort_creation_date/models/website.py deleted file mode 100644 index cc705d6..0000000 --- a/website_sale_product_sort_creation_date/models/website.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2021 Criptomart -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import _, api, fields, models - - -class Website(models.Model): - _inherit = "website" - - @api.model - def _get_product_sort_criterias(self): - return [ - ('website_sequence desc', _('Relevance')), - ('list_price desc', _('Catalog price: High to Low')), - ('list_price asc', _('Catalog price: Low to High')), - ('name asc', _('Name - A to Z')), - ('name desc', _('Name - Z to A')), - ('create_date desc', 'Novedades'), - ] - - default_product_sort_criteria = fields.Selection( - selection='_get_product_sort_criterias', - string="Sort products by", - help="Default criteria for sorting products in the shop", - default='create_date desc', - required=True, - ) diff --git a/website_search_products/__init__.py b/website_search_products/__init__.py deleted file mode 100644 index a19d6da..0000000 --- a/website_search_products/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import controllers -from . import models diff --git a/website_search_products/__manifest__.py b/website_search_products/__manifest__.py deleted file mode 100644 index dc4a66d..0000000 --- a/website_search_products/__manifest__.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2022 Criptomart -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -{ - 'name': 'Website Search Products', - 'description': """ - Allows portal users to search products in a table with filters.""", - 'version': "16.0.1.0.0", - 'license': 'AGPL-3', - 'author': 'Criptomart', - 'website': 'https://criptomart.net', - 'depends': [ - "stock", - "website" - ], - 'data': [ - "data/menu.xml", - "data/ir_rule.xml", - "views/web_templates.xml" - ], - 'demo': [ - ], -} diff --git a/website_search_products/controllers/__init__.py b/website_search_products/controllers/__init__.py deleted file mode 100644 index 2f34e6e..0000000 --- a/website_search_products/controllers/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from . import controller diff --git a/website_search_products/controllers/controller.py b/website_search_products/controllers/controller.py deleted file mode 100644 index 62d49f1..0000000 --- a/website_search_products/controllers/controller.py +++ /dev/null @@ -1,33 +0,0 @@ - from odoo import http -from odoo.http import request -from odoo.addons.website.controllers.main import Website - -import logging -_logger = logging.getLogger(__name__) - -class IntentoryForm(http.Controller): - - @http.route(['/inventory/search'], type='http', auth="user", website=True) - def inventory_form(self, **post): - if not request.env['res.users'].browse(request.uid).has_group('base.group_portal')\ - and not request.env['res.users'].browse(request.uid).has_group('base.group_user'): - redirect = b'/web?' - return http.redirect_with_hash(redirect) - - products = request.env["product.template"].search([('active', '=', 'True'), ('available_in_pos', '=', 'True')]) - vals = {'products': products} - return request.render("website_search_products.web_list_products", vals) - - -class Website(Website): - - @http.route(website=True, auth="public") - def web_login(self, redirect=None, *args, **kw): - response = super(Website, self).web_login(redirect=redirect, *args, **kw) - if not redirect and request.params['login_success']: - if request.env['res.users'].browse(request.uid).has_group('base.group_user'): - redirect = b'/web?' + request.httprequest.query_string - else: - redirect = '/inventory/search' - return http.redirect_with_hash(redirect) - return response diff --git a/website_search_products/data/ir_rule.xml b/website_search_products/data/ir_rule.xml deleted file mode 100644 index 1c1ab21..0000000 --- a/website_search_products/data/ir_rule.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - Portal Consult Products - - - - - - - - - \ No newline at end of file diff --git a/website_search_products/data/menu.xml b/website_search_products/data/menu.xml deleted file mode 100644 index 397e0c8..0000000 --- a/website_search_products/data/menu.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Products in Shop - /inventory/search - - 22 - - - diff --git a/website_search_products/i18n/es.po b/website_search_products/i18n/es.po deleted file mode 100644 index 6e3bc7a..0000000 --- a/website_search_products/i18n/es.po +++ /dev/null @@ -1,68 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * website_search_products -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-16 10:53+0000\n" -"PO-Revision-Date: 2023-01-16 12:07+0100\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: \n" -"Language: es\n" -"X-Generator: Poedit 2.3\n" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Category" -msgstr "Categoría" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Displayed products" -msgstr "Productos mostrados" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "In this table you can consult all the products available in the store" -msgstr "En esta tabla puedes consultar los productos disponibles en tienda" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Name" -msgstr "Nombre" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Price" -msgstr "Precio" - -#. module: website_search_products -#: model:website.menu,name:website_search_products.menu_partner_form -msgid "Products in Shop" -msgstr "Productos en tienda" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Products not found" -msgstr "Productos no encontrados" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Quantity" -msgstr "Cantidad" - -#. module: website_search_products -#: model:ir.model,name:website_search_products.model_stock_move -msgid "Stock Move" -msgstr "Movimiento de stock" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "UoM" -msgstr "UdM" diff --git a/website_search_products/i18n/website_search_products.pot b/website_search_products/i18n/website_search_products.pot deleted file mode 100644 index 5974cf3..0000000 --- a/website_search_products/i18n/website_search_products.pot +++ /dev/null @@ -1,67 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * website_search_products -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-16 10:53+0000\n" -"PO-Revision-Date: 2023-01-16 10:53+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Category" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Displayed products" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "In this table you can consult all the products available in the store" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Name" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Price" -msgstr "" - -#. module: website_search_products -#: model:website.menu,name:website_search_products.menu_partner_form -msgid "Products in Shop" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Products not found" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "Quantity" -msgstr "" - -#. module: website_search_products -#: model:ir.model,name:website_search_products.model_stock_move -msgid "Stock Move" -msgstr "" - -#. module: website_search_products -#: model_terms:ir.ui.view,arch_db:website_search_products.web_list_products -msgid "UoM" -msgstr "" - diff --git a/website_search_products/models/__init__.py b/website_search_products/models/__init__.py deleted file mode 100644 index c6fcb2f..0000000 --- a/website_search_products/models/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from . import stock_move diff --git a/website_search_products/models/stock_move.py b/website_search_products/models/stock_move.py deleted file mode 100644 index 892f915..0000000 --- a/website_search_products/models/stock_move.py +++ /dev/null @@ -1,58 +0,0 @@ -from odoo import tools -from odoo import models, fields, api - -from datetime import date,datetime -from dateutil.relativedelta import relativedelta - -import logging -_logger = logging.getLogger(__name__) - -class StockMove(models.Model): - _inherit = 'stock.move' - - def get_stock_moves_by_product(self, date_begin, date_end, location): - - if date_begin and date_end: - moves = self.env['stock.move'].search([ - '|', - ('location_id','=',int(location)), - ('location_dest_id','=',int(location)), - ('state', '=', 'done'), - ('date','>=',date_begin), - ('date','<=',date_end), - ]) - else: - return [] - - moves_grouped = {} - data = [] - - if moves: - for move in moves: - if move.product_id.id and move.product_id.type == 'product': - if not moves_grouped.get(move.product_id.id, False): - date_end_obj = datetime.strptime(date_end, '%Y-%m-%d').date() + relativedelta(days=1) - moves_grouped[move.product_id.id] = dict([]) - moves_grouped[move.product_id.id]['name'] = move.product_id.name - moves_grouped[move.product_id.id]['category'] = move.product_id.categ_id.name - moves_grouped[move.product_id.id]['list_price'] = move.product_id.list_price - moves_grouped[move.product_id.id]['qty_init'] = move.product_id.with_context({ - 'to_date':date_begin, - 'location': int(location) - }).qty_available - moves_grouped[move.product_id.id]['qty_end'] = move.product_id.with_context({ - 'to_date':date_end_obj, - 'location': int(location) - }).qty_available - - if not moves_grouped[move.product_id.id].get('in'): - moves_grouped[move.product_id.id]['in'] = 0.0 - if not moves_grouped[move.product_id.id].get('out'): - moves_grouped[move.product_id.id]['out'] = 0.0 - if int(move.location_id) == int(location): - moves_grouped[move.product_id.id]['out'] += move.product_qty - elif int(move.location_dest_id) == int(location): - moves_grouped[move.product_id.id]['in'] += move.product_qty - - data = list(moves_grouped.values()) - return data diff --git a/website_search_products/views/web_templates.xml b/website_search_products/views/web_templates.xml deleted file mode 100644 index 47c03be..0000000 --- a/website_search_products/views/web_templates.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - From b5bb678cbc44e086c7016bcbfed54a2a236427e9 Mon Sep 17 00:00:00 2001 From: luis Date: Mon, 30 Dec 2024 17:12:50 +0100 Subject: [PATCH 024/100] restore product_update_price_last_purchase and pos_ticket_pricelist --- pos_ticket_pricelist/__init__.py | 0 pos_ticket_pricelist/__manifest__.py | 24 + pos_ticket_pricelist/static/src/xml/pos.xml | 20 + product_update_price_last_purchase/README.rst | 56 +++ .../__init__.py | 1 + .../__manifest__.py | 27 ++ product_update_price_last_purchase/i18n/es.po | 282 ++++++++++++ .../product_update_price_last_purchase.pot | 166 +++++++ .../models/__init__.py | 3 + .../models/product_product.py | 57 +++ .../models/product_template.py | 76 ++++ .../models/stock_move.py | 71 +++ .../readme/DESCRIPTION.md | 2 + .../static/description/index.html | 409 ++++++++++++++++++ .../views/actions.xml | 36 ++ .../views/product_view.xml | 66 +++ 16 files changed, 1296 insertions(+) create mode 100644 pos_ticket_pricelist/__init__.py create mode 100644 pos_ticket_pricelist/__manifest__.py create mode 100644 pos_ticket_pricelist/static/src/xml/pos.xml create mode 100644 product_update_price_last_purchase/README.rst create mode 100644 product_update_price_last_purchase/__init__.py create mode 100644 product_update_price_last_purchase/__manifest__.py create mode 100644 product_update_price_last_purchase/i18n/es.po create mode 100644 product_update_price_last_purchase/i18n/product_update_price_last_purchase.pot create mode 100644 product_update_price_last_purchase/models/__init__.py create mode 100644 product_update_price_last_purchase/models/product_product.py create mode 100644 product_update_price_last_purchase/models/product_template.py create mode 100644 product_update_price_last_purchase/models/stock_move.py create mode 100644 product_update_price_last_purchase/readme/DESCRIPTION.md create mode 100644 product_update_price_last_purchase/static/description/index.html create mode 100644 product_update_price_last_purchase/views/actions.xml create mode 100644 product_update_price_last_purchase/views/product_view.xml diff --git a/pos_ticket_pricelist/__init__.py b/pos_ticket_pricelist/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pos_ticket_pricelist/__manifest__.py b/pos_ticket_pricelist/__manifest__.py new file mode 100644 index 0000000..3c64ab3 --- /dev/null +++ b/pos_ticket_pricelist/__manifest__.py @@ -0,0 +1,24 @@ +# Copyright 2022 Criptomart +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Pos Ticket Pricelist', + 'description': """ + Prints the pricelist applied on tickets.""", + 'version': "16.0.1.0.0", + 'license': 'AGPL-3', + 'author': 'Criptomart', + 'website': 'https://criptomart.net', + 'depends': [ + "point_of_sale" + ], + 'data': [ + ], + 'assets': { + 'point_of_sale.assets': [ + 'pos_ticket_pricelist/static/src/xml/pos.xml' + ], + }, + 'demo': [ + ], +} diff --git a/pos_ticket_pricelist/static/src/xml/pos.xml b/pos_ticket_pricelist/static/src/xml/pos.xml new file mode 100644 index 0000000..ff511c6 --- /dev/null +++ b/pos_ticket_pricelist/static/src/xml/pos.xml @@ -0,0 +1,20 @@ + + + + + + +
+ + + + {'oe_hidden': True} + + + + diff --git a/product_update_price_last_purchase/README.rst b/product_update_price_last_purchase/README.rst new file mode 100644 index 0000000..7b1561d --- /dev/null +++ b/product_update_price_last_purchase/README.rst @@ -0,0 +1,56 @@ +======================================= +Product Update Price From Last Purchase +======================================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:9a3d6dc2e0410212d91f0fba1627ece05131bc10535ebe1e51b03c5a7026f30d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-Criptomart%2Faddons_cm-lightgray.png?logo=github + :target: https://github.com/Criptomart/addons_cm/tree/16.0/product_update_price_last_purchase + :alt: Criptomart/addons_cm + +|badge1| |badge2| |badge3| + +Update price from last purchase price, using product classification +margin + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Criptomart + +Maintainers +----------- + +This module is part of the `Criptomart/addons_cm `_ project on GitHub. + +You are welcome to contribute. diff --git a/product_update_price_last_purchase/__init__.py b/product_update_price_last_purchase/__init__.py new file mode 100644 index 0000000..0650744 --- /dev/null +++ b/product_update_price_last_purchase/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/product_update_price_last_purchase/__manifest__.py b/product_update_price_last_purchase/__manifest__.py new file mode 100644 index 0000000..1cd63ae --- /dev/null +++ b/product_update_price_last_purchase/__manifest__.py @@ -0,0 +1,27 @@ +{ + "name": "Product Update Price From Last Purchase", + "version": "16.0.1.0.0", + "category": "purchase", + "summary": """" + Personaliza el comportamiento de Product para supermercados: + * Campo que guarda el último precio de compra en vez de usar standard_price + y no afectar a la valoración de inventario. + * Actualiza el precio de venta según el último precio de coste aplicado a una tarifa. + * Filtro para productos actualizados el último precio de coste. + * Filtro para productos que necesitan etiqueta nueva. + """, + "author": "Criptomart", + "website": "https://criptomart.net", + "license": "AGPL-3", + "depends": [ + "account", + "stock_account", + "sale", + "product_margin_classification", + ], + "data": [ + "views/actions.xml", + "views/product_view.xml", + ], + "installable": True, +} diff --git a/product_update_price_last_purchase/i18n/es.po b/product_update_price_last_purchase/i18n/es.po new file mode 100644 index 0000000..722f46d --- /dev/null +++ b/product_update_price_last_purchase/i18n/es.po @@ -0,0 +1,282 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_update_price_last_purchase +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-03-28 17:11+0000\n" +"PO-Revision-Date: 2022-03-28 17:11+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__list_price_automatic +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__list_price_automatic +msgid "Automatic Sale Price" +msgstr "Precio de venta automático" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__list_price_automatic +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__list_price_automatic +msgid "Automatic computation of the PVP from the cost price and the rate defined in the configuration." +msgstr "Cálculo automático del PVP a partir del precio de coste y la tarifa definida en la configuración." + +#. module: product_update_price_last_purchase +#: model:ir.actions.report,name:product_update_price_last_purchase.report_productbarcode +msgid "Barcode" +msgstr "Código de barras" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_pricelist_item__base +msgid "Base price for computation.\n" +"Public Price: The base price will be the Sale/public Price.\n" +"Cost Price : The base price will be the cost price.\n" +"Other Pricelist : Computation of the base price based on another Pricelist." +msgstr "Precio base de cálculo.\n" +"Precio Público: El precio base será el Precio Público / Venta.\n" +"Precio de costo: El precio base será el precio de costo.\n" +"Otra lista de precios: cálculo del precio base basado en otra lista de precios." + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_pricelist_item__base +msgid "Based on" +msgstr "Basado en" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__last_purchase_price_compute_type +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__last_purchase_price_compute_type +msgid "Choose whether discounts should influence the calculation of the last purchase price. Select Never update for manual configuration of cost and sale prices.\n" +"\n" +"* Without discounts: does not take into account discounts when updating the last purchase price.\n" +"* First discount: take into account only first discount when updating the last purchase price.\n" +"* Triple discount: take into account all discounts when updating the last purchase price. Needs \"Purchase Triple Discount\" OCA module.\n" +"* Manual update: Select this for manual configuration of cost and sale price. The sales price will not be calculated automatically." +msgstr "Elija si los descuentos deben influir en la actualización del último precio de compra. Seleccione No actualizar nunca para la configuración manual de los precios de coste y venta.\n" +"\n" +"* Sin descuentos: no tiene en cuenta ningún descuento al actualizar el último precio de compra.\n" +"* Primer descuento: tiene en cuenta sólo el primer descuento al actualizar el último precio de compra.\n" +"* Triple descuento: tiene en cuenta todos los descuentos al actualizar el último precio de compra. Necesita el módulo OCA \"Purchase Triple Discount\".\n" +"* Actualización manual: configuración manual del precio de coste y de venta. El precio de venta no se calculará automáticamente." + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_res_company +msgid "Companies" +msgstr "Compañías" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_res_config_settings +msgid "Config Settings" +msgstr "Opciones de Configuración" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_packaging__qty +msgid "Contained Quantity" +msgstr "Cantidad contenida" + +#. module: product_update_price_last_purchase +#: selection:product.pricelist.item,base:0 +msgid "Cost" +msgstr "Coste" + +#. module: product_update_price_last_purchase +#: selection:product.pricelist.item,base:0 +msgid "Cost Price Tax Included" +msgstr "Precio de coste con impuesto incluido" + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.res_config_settings_view_form_pricelists +msgid "Default pricelists for Coops" +msgstr "Tarifas por defecto para cooperativas" + +#. module: product_update_price_last_purchase +#: selection:product.template,last_purchase_price_compute_type:0 +msgid "First discount" +msgstr "Primer descuento" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__last_purchase_price +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__last_purchase_price +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.product_view_inherit_list_price_auto +#: selection:product.pricelist.item,base:0 +msgid "Last purchase price" +msgstr "Último precio de compra" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__last_purchase_price_compute_type +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__last_purchase_price_compute_type +msgid "Last purchase price calculation type" +msgstr "Cálculo de último precio de compra" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__list_price_updated +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__list_price_updated +msgid "Last purchase price updated" +msgstr "Último precio de compra actualizado" + +#. module: product_update_price_last_purchase +#: selection:product.template,last_purchase_price_compute_type:0 +msgid "Manual update" +msgstr "Actualización manual" + +#. module: product_update_price_last_purchase +#: code:addons/product_update_price_last_purchase/models/product_template.py:38 +#, python-format +msgid "Not found a valid pricelist to compute sale price. Check configuration in General Settings." +msgstr "" + +#. module: product_update_price_last_purchase +#: selection:product.pricelist.item,base:0 +msgid "Other Pricelist" +msgstr "Otra tarifa" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__list_price +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__list_price +msgid "Price calculated according to the configured pricelist, including VAT." +msgstr "Precio calculado según la tarifa configurada, incluyendo el IVA." + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_pricelist +msgid "Pricelist" +msgstr "Tarifa" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_pricelist_item +msgid "Pricelist Item" +msgstr "Elemento de tarifa" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_res_config_settings__product_pricelist_automatic +msgid "Pricelist applied to automatic calculation of sales price" +msgstr "Tarifa aplicada al cálculo automático del precio de venta" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_res_company__product_pricelist_automatic +msgid "Pricelist applied to the automatic selling price" +msgstr "Tarifa aplicada al PVP automáticamente" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_product +msgid "Product" +msgstr "Producto" + +#. module: product_update_price_last_purchase +#: model:ir.actions.report,name:product_update_price_last_purchase.report_product_product_barcode +#: model:ir.actions.report,name:product_update_price_last_purchase.report_product_template_barcode +#: model:ir.actions.report,name:product_update_price_last_purchase.report_productbarcode_laosa +#: model:ir.actions.report,name:product_update_price_last_purchase.report_simple_barcode_laosa +msgid "Product Barcode (PDF)" +msgstr "Código de barras del producto (PDF)" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_packaging +msgid "Product Packaging" +msgstr "Empaquetado del producto" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_template +msgid "Product Template" +msgstr "Plantilla de producto" + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_tags +msgid "Products that have changed their sales price and no label has been printed." +msgstr "Productos que han cambiado su PVP y no se ha impreso su etiqueta." + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_updated +msgid "Products that have recently changed their cost price and have not updated their selling price." +msgstr "Productos que han cambiado recientemente su precio de coste y no han actualizado su PVP." + +#. module: product_update_price_last_purchase +#: selection:product.pricelist.item,base:0 +msgid "Public Price" +msgstr "Precio público" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_res_company__product_pricelist_automatic +#: model:ir.model.fields,help:product_update_price_last_purchase.field_res_config_settings__product_pricelist_automatic +msgid "Rate that applies to all products that update the selling price automatically." +msgstr "Tarifa que se aplica a todos los productos que actualizan el precio de venta automáticamente." + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_ir_actions_report +msgid "Report Action" +msgstr "Reportar la acción" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__list_price +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__list_price +msgid "Sale price with VAT" +msgstr "PVP con impuestos" + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.product_view_inherit_list_price_auto +msgid "Sale price." +msgstr "PVP" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_stock_move +msgid "Stock Move" +msgstr "Movimiento de stock" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__list_price_updated +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__list_price_updated +msgid "The last cost price has been updated and you need to update the selling price in the database, shelves and scales." +msgstr "Se ha actualizado el último precio de coste y hay que actualizar el PVP en la base de datos, lineales y las balanzas." + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__last_purchase_price +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__last_purchase_price +msgid "The last price at which the product was purchased. It is used as the base price field for calculating the product sale price." +msgstr "El último precio al que se compró el producto. Se utiliza como campo de precio base para calcular el precio de venta del producto." + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__to_print +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__to_print +msgid "The sale price has been updated on this product and needs to be updated on the shelf." +msgstr "El PVP ha sido actualizado en este producto y necesita ser actualizado en el lineal." + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_packaging__qty +msgid "The total number of products you can have per pallet or box." +msgstr "El numero total de productos que puede tener por palé o caja." + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_tags +msgid "To print" +msgstr "Para imprimir" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__to_print +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__to_print +msgid "To print label" +msgstr "Pendiente de imprimir etiqueta" + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_updated +msgid "To update sales price" +msgstr "Pendiente de actualizar PVP" + +#. module: product_update_price_last_purchase +#: selection:product.template,last_purchase_price_compute_type:0 +msgid "Triple discount" +msgstr "Triple decuento" + +#. module: product_update_price_last_purchase +#: model:ir.actions.server,name:product_update_price_last_purchase.action_product_calculate_theoritical_price +msgid "Update Sales Price" +msgstr "Actualizar PVP" + +#. module: product_update_price_last_purchase +#: selection:product.template,last_purchase_price_compute_type:0 +msgid "Without discounts" +msgstr "Sin descuentos" + diff --git a/product_update_price_last_purchase/i18n/product_update_price_last_purchase.pot b/product_update_price_last_purchase/i18n/product_update_price_last_purchase.pot new file mode 100644 index 0000000..8a3151f --- /dev/null +++ b/product_update_price_last_purchase/i18n/product_update_price_last_purchase.pot @@ -0,0 +1,166 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_update_price_last_purchase +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-12-30 16:10+0000\n" +"PO-Revision-Date: 2024-12-30 16:10+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__last_purchase_price_received_compute_type +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__last_purchase_price_received_compute_type +msgid "" +"\n" +" Choose whether discounts should influence the calculation of the last purchase price.\n" +" Select Never update for manual configuration of cost and sale prices.\n" +"\n" +" * Without discounts: does not take into account discounts when updating\n" +" the last purchase price.\n" +"\n" +" * First discount: take into account only first discount when updating\n" +" the last purchase price.\n" +"\n" +" * Double discount: take into account two first discounts when updating\n" +" the last purchase price.\n" +"\n" +" * Triple discount: take into account all discounts when updating\n" +" the last purchase price.\n" +" Needs \"Purchase Triple Discount\" OCA module.\n" +"\n" +" * Manual update: Select this for manual configuration of cost and sale price.\n" +" The sales price will not be calculated automatically.\n" +" " +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_packaging__qty +msgid "Contained Quantity" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__margin_state__correct +msgid "Correct Margin" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__last_purchase_price_received_compute_type__with_two_discounts +msgid "Double discount" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__last_purchase_price_received_compute_type__with_discount +msgid "First discount" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__last_purchase_price_received +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__last_purchase_price_received +msgid "Last purchase price" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__last_purchase_price_received_compute_type +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__last_purchase_price_received_compute_type +msgid "Last purchase price calculation type" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__last_purchase_price_received_compute_type__manual_update +msgid "Manual update" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_template +msgid "Product" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_packaging +msgid "Product Packaging" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_product_product +msgid "Product Variant" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model,name:product_update_price_last_purchase.model_stock_move +msgid "Stock Move" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__last_purchase_price_received +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__last_purchase_price_received +msgid "" +"The last price at which the product was purchased. It is used as the base " +"price field for calculating the product sale price." +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_product__to_print_label +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_template__to_print_label +msgid "" +"The sale price has been updated on this product\n" +" and needs to be updated on the shelf." +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,help:product_update_price_last_purchase.field_product_packaging__qty +msgid "The total number of products you can have per pallet or box." +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__margin_state +msgid "Theoretical Price State" +msgstr "" + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_updated +msgid "To print" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_product__to_print_label +#: model:ir.model.fields,field_description:product_update_price_last_purchase.field_product_template__to_print_label +msgid "To print label" +msgstr "" + +#. module: product_update_price_last_purchase +#: model_terms:ir.ui.view,arch_db:product_update_price_last_purchase.view_product_search_form_inherit_updated +msgid "To update sales price" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__margin_state__too_cheap +msgid "Too Cheap" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__margin_state__too_expensive +msgid "Too Expensive" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__last_purchase_price_received_compute_type__with_three_discounts +msgid "Triple discount" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.actions.server,name:product_update_price_last_purchase.action_product_calculate_theoritical_price +msgid "Update Sales Price" +msgstr "" + +#. module: product_update_price_last_purchase +#: model:ir.model.fields.selection,name:product_update_price_last_purchase.selection__product_template__last_purchase_price_received_compute_type__without_discounts +msgid "Without discounts" +msgstr "" diff --git a/product_update_price_last_purchase/models/__init__.py b/product_update_price_last_purchase/models/__init__.py new file mode 100644 index 0000000..fb351a4 --- /dev/null +++ b/product_update_price_last_purchase/models/__init__.py @@ -0,0 +1,3 @@ +from . import product_template +from . import product_product +from . import stock_move diff --git a/product_update_price_last_purchase/models/product_product.py b/product_update_price_last_purchase/models/product_product.py new file mode 100644 index 0000000..dbdacbc --- /dev/null +++ b/product_update_price_last_purchase/models/product_product.py @@ -0,0 +1,57 @@ +# Copyright (C) 2020: Criptomart (https://criptomart.net) +# @author Santi Noreña () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import logging + +from odoo import api, fields, models + +_logger = logging.getLogger(__name__) + + +class ProductProduct(models.Model): + _inherit = "product.product" + + @api.depends( + "standard_price", + "last_purchase_price_received", + "lst_price", + "margin_classification_id", + "margin_classification_id.markup", + "margin_classification_id.price_round", + "margin_classification_id.price_surcharge", + "product_tmpl_id.taxes_id", + "product_tmpl_id.list_price", + ) + def _compute_theoretical_multi(self): + res = super()._compute_theoretical_multi() + for product in self: + if product.last_purchase_price_received != 0: + ( + product.margin_state, + product.theoretical_price, + product.theoretical_difference, + ) = self._get_margin_info( + product.margin_classification_id, + product.taxes_id, + product.name, + product.last_purchase_price_received, + product.lst_price, + ) + return res + + def use_theoretical_price(self): + for product in self: + if product.last_purchase_price_received_compute_type != "manual_update": + product.lst_price = product.theoretical_price + product.to_print_label = True + + +class ProductPackaging(models.Model): + _inherit = "product.packaging" + + qty = fields.Float( + "Contained Quantity", + help="The total number of products you can have per pallet or box.", + digits="Product Unit of Measure", + ) diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py new file mode 100644 index 0000000..cad50fa --- /dev/null +++ b/product_update_price_last_purchase/models/product_template.py @@ -0,0 +1,76 @@ +# Copyright (C) 2020: Criptomart (https://criptomart.net) +# @author Santi Noreña () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class ProductTemplate(models.Model): + _inherit = "product.template" + + margin_state = fields.Selection(store=True) + to_print_label = fields.Boolean( + string="To print label", + help="""The sale price has been updated on this product + and needs to be updated on the shelf.""", + default=False, + ) + + last_purchase_price_received = fields.Float( + string="Last purchase price", + help="The last price at which the product was purchased. " + "It is used as the base price field for calculating the product sale price.", + readonly=True, + digits="Product Price", + ) + + last_purchase_price_received_compute_type = fields.Selection( + [ + ("without_discounts", "Without discounts"), + ("with_discount", "First discount"), + ("with_two_discounts", "Double discount"), + ("with_three_discounts", "Triple discount"), + ("manual_update", "Manual update"), + ], + string="Last purchase price calculation type", + help=""" + Choose whether discounts should influence the calculation of the last purchase price. + Select Never update for manual configuration of cost and sale prices.\n + * Without discounts: does not take into account discounts when updating + the last purchase price.\n + * First discount: take into account only first discount when updating + the last purchase price.\n + * Double discount: take into account two first discounts when updating + the last purchase price.\n + * Triple discount: take into account all discounts when updating + the last purchase price. + Needs "Purchase Triple Discount" OCA module.\n + * Manual update: Select this for manual configuration of cost and sale price. + The sales price will not be calculated automatically. + """, + default="without_discounts", + required=True, + ) + + @api.onchange( + "last_purchase_price_received", + "standard_price", + "taxes_id", + "margin_classification_id", + "list_price", + ) + def _onchange_standard_price(self): + res = super()._onchange_standard_price() + if self.last_purchase_price_received != 0: + ( + self.margin_state, + self.theoretical_price, + self.theoretical_difference, + ) = self.env["product.product"]._get_margin_info( + self.margin_classification_id, + self.taxes_id, + self.name, + self.last_purchase_price_received, + self.list_price, + ) + return res diff --git a/product_update_price_last_purchase/models/stock_move.py b/product_update_price_last_purchase/models/stock_move.py new file mode 100644 index 0000000..e30e522 --- /dev/null +++ b/product_update_price_last_purchase/models/stock_move.py @@ -0,0 +1,71 @@ +# Copyright 2016-2019 Akretion (http://www.akretion.com/) +# Copyright 2020 Criptomart +# @author: Alexis de Lattre +# @author Santi Noreña () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import logging + +from odoo import models +from odoo.tools import float_compare, float_is_zero, float_round + +_logger = logging.getLogger(__name__) + + +class StockMove(models.Model): + _inherit = "stock.move" + + def product_price_update_before_done(self): + res = super(StockMove, self).product_price_update_before_done() + for move in self.filtered(lambda move: move.location_id.usage == "supplier"): + if ( + move.product_id.last_purchase_price_received_compute_type + == "with_three_discounts" + ): + price_updated = float_round( + move.purchase_line_id.price_subtotal + / move.purchase_line_id.product_qty, + precision_digits=2, + ) + elif ( + move.product_id.last_purchase_price_received_compute_type + == "with_discount" + ): + price_updated = float_round( + move.purchase_line_id.price_unit + * (1 - move.purchase_line_id.discount / 100), + precision_digits=2, + ) + elif ( + move.product_id.last_purchase_price_received_compute_type + == "with_two_discounts" + ): + price_updated = float_round( + move.purchase_line_id.price_unit + * (1 - move.purchase_line_id.discount / 100) + * (1 - move.purchase_line_id.discount2 / 100), + precision_digits=2, + ) + + else: + price_updated = move.purchase_line_id.price_unit + + if float_compare( + move.product_id.last_purchase_price_received, + price_updated, + precision_digits=2, + ) and not float_is_zero(move.quantity_done, precision_digits=3): + _logger.info( + "Update last_purchase_price_received: %s for product %s Previous price: %s" + % ( + price_updated, + move.product_id.default_code, + move.product_id.last_purchase_price_received, + ) + ) + # Write last purchase price as SUPERUSER_ID + # warehouse manager may not have the right to write on products + move.product_id.with_company(move.company_id.id).sudo().write( + {"last_purchase_price_received": price_updated} + ) + return res diff --git a/product_update_price_last_purchase/readme/DESCRIPTION.md b/product_update_price_last_purchase/readme/DESCRIPTION.md new file mode 100644 index 0000000..d10e429 --- /dev/null +++ b/product_update_price_last_purchase/readme/DESCRIPTION.md @@ -0,0 +1,2 @@ +Update price from last purchase price, using product classification +margin diff --git a/product_update_price_last_purchase/static/description/index.html b/product_update_price_last_purchase/static/description/index.html new file mode 100644 index 0000000..bb81519 --- /dev/null +++ b/product_update_price_last_purchase/static/description/index.html @@ -0,0 +1,409 @@ + + + + + +Product Update Price From Last Purchase + + + +
+

Product Update Price From Last Purchase

+ + +

Beta License: AGPL-3 Criptomart/addons_cm

+

Update price from last purchase price, using product classification +margin

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Criptomart
    • +
+
+
+

Maintainers

+

This module is part of the Criptomart/addons_cm project on GitHub.

+

You are welcome to contribute.

+
+
+
+ + diff --git a/product_update_price_last_purchase/views/actions.xml b/product_update_price_last_purchase/views/actions.xml new file mode 100644 index 0000000..04c6e36 --- /dev/null +++ b/product_update_price_last_purchase/views/actions.xml @@ -0,0 +1,36 @@ + + + + + + + Update Sales Price + + + code + + records.use_theoretical_price() + + + + + diff --git a/product_update_price_last_purchase/views/product_view.xml b/product_update_price_last_purchase/views/product_view.xml new file mode 100644 index 0000000..e534cbf --- /dev/null +++ b/product_update_price_last_purchase/views/product_view.xml @@ -0,0 +1,66 @@ + + + + + + + product.list.price.automatic.form + product.template + form + + + + + + + + + + + product.template.product.tree + product.template + + + + + + + + + + + + view.product.search.form.inherit.updated + product.template + + + + + + + + + + + + From 661d1452de0bfb8ae28343980197d21bc7eabc41 Mon Sep 17 00:00:00 2001 From: luis Date: Mon, 30 Dec 2024 17:14:45 +0100 Subject: [PATCH 025/100] remove readonly on standard_price --- product_update_price_last_purchase/views/product_view.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/product_update_price_last_purchase/views/product_view.xml b/product_update_price_last_purchase/views/product_view.xml index e534cbf..5dbea50 100644 --- a/product_update_price_last_purchase/views/product_view.xml +++ b/product_update_price_last_purchase/views/product_view.xml @@ -16,12 +16,6 @@ - - - From 59c8d127a90930f38da948fbe47ae67c4fc6e755 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 31 Dec 2024 11:59:00 +0100 Subject: [PATCH 026/100] move to_print_label field to report_label_supermarket module in arbore repo --- .../models/product_product.py | 1 - .../models/product_template.py | 12 ++++++------ .../views/product_view.xml | 8 -------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/product_update_price_last_purchase/models/product_product.py b/product_update_price_last_purchase/models/product_product.py index dbdacbc..e7cb35f 100644 --- a/product_update_price_last_purchase/models/product_product.py +++ b/product_update_price_last_purchase/models/product_product.py @@ -44,7 +44,6 @@ class ProductProduct(models.Model): for product in self: if product.last_purchase_price_received_compute_type != "manual_update": product.lst_price = product.theoretical_price - product.to_print_label = True class ProductPackaging(models.Model): diff --git a/product_update_price_last_purchase/models/product_template.py b/product_update_price_last_purchase/models/product_template.py index cad50fa..12354c9 100644 --- a/product_update_price_last_purchase/models/product_template.py +++ b/product_update_price_last_purchase/models/product_template.py @@ -9,12 +9,12 @@ class ProductTemplate(models.Model): _inherit = "product.template" margin_state = fields.Selection(store=True) - to_print_label = fields.Boolean( - string="To print label", - help="""The sale price has been updated on this product - and needs to be updated on the shelf.""", - default=False, - ) + # to_print_label = fields.Boolean( + # string="To print label", + # help="""The sale price has been updated on this product + # and needs to be updated on the shelf.""", + # default=False, + # ) last_purchase_price_received = fields.Float( string="Last purchase price", diff --git a/product_update_price_last_purchase/views/product_view.xml b/product_update_price_last_purchase/views/product_view.xml index 5dbea50..6a5d192 100644 --- a/product_update_price_last_purchase/views/product_view.xml +++ b/product_update_price_last_purchase/views/product_view.xml @@ -11,10 +11,7 @@ @@ -46,11 +43,6 @@ ('margin_state','in', ['too_cheap', 'too_expensive']) ]" /> - From 0db766645ceac1b553b04eaa13c1b3caf877f498 Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 31 Dec 2024 12:00:26 +0100 Subject: [PATCH 027/100] add product_print_category_supermarket --- .../__init__.py | 1 + .../__manifest__.py | 30 ++++++++ .../data/product_print_category.xml | 18 +++++ .../models/__init__.py | 3 + .../models/product_template.py | 27 +++++++ .../models/product_template_tag.py | 7 ++ .../models/res_config.py | 12 +++ .../static/css/pricetag_60x30mm.scss | 74 +++++++++++++++++++ .../views/product_template.xml | 37 ++++++++++ .../views/product_template_tag.xml | 27 +++++++ .../views/report_pricetag_normal.xml | 43 +++++++++++ .../views/res_config.xml | 24 ++++++ 12 files changed, 303 insertions(+) create mode 100644 product_print_category_supermarket/__init__.py create mode 100644 product_print_category_supermarket/__manifest__.py create mode 100644 product_print_category_supermarket/data/product_print_category.xml create mode 100644 product_print_category_supermarket/models/__init__.py create mode 100644 product_print_category_supermarket/models/product_template.py create mode 100644 product_print_category_supermarket/models/product_template_tag.py create mode 100644 product_print_category_supermarket/models/res_config.py create mode 100644 product_print_category_supermarket/static/css/pricetag_60x30mm.scss create mode 100644 product_print_category_supermarket/views/product_template.xml create mode 100644 product_print_category_supermarket/views/product_template_tag.xml create mode 100644 product_print_category_supermarket/views/report_pricetag_normal.xml create mode 100644 product_print_category_supermarket/views/res_config.xml diff --git a/product_print_category_supermarket/__init__.py b/product_print_category_supermarket/__init__.py new file mode 100644 index 0000000..0650744 --- /dev/null +++ b/product_print_category_supermarket/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/product_print_category_supermarket/__manifest__.py b/product_print_category_supermarket/__manifest__.py new file mode 100644 index 0000000..f9e4b57 --- /dev/null +++ b/product_print_category_supermarket/__manifest__.py @@ -0,0 +1,30 @@ +# Copyright 2022 Criptomart +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Product Labels for supermarkets", + "description": """ + Extends product_print_category adding labels for Supermarkets""", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "Criptomart", + "website": "https://criptomart.net", + "depends": [ + "product_print_category", + "product_origin", + "product_template_tags", + ], + "data": [ + "views/report_pricetag_normal.xml", + "views/product_template_tag.xml", + "views/product_template.xml", + "views/res_config.xml", + "data/product_print_category.xml", + ], + "assets": { + "web.report_assets_common": [ + "/product_print_category_supermarket/static/css/pricetag_60x30mm.scss", + ] + }, + "demo": [], +} diff --git a/product_print_category_supermarket/data/product_print_category.xml b/product_print_category_supermarket/data/product_print_category.xml new file mode 100644 index 0000000..f837962 --- /dev/null +++ b/product_print_category_supermarket/data/product_print_category.xml @@ -0,0 +1,18 @@ + + + + + Normal pricetag - 60x30mm + + + + + diff --git a/product_print_category_supermarket/models/__init__.py b/product_print_category_supermarket/models/__init__.py new file mode 100644 index 0000000..4ac41a2 --- /dev/null +++ b/product_print_category_supermarket/models/__init__.py @@ -0,0 +1,3 @@ +from . import product_template +from . import product_template_tag +from . import res_config diff --git a/product_print_category_supermarket/models/product_template.py b/product_print_category_supermarket/models/product_template.py new file mode 100644 index 0000000..fe667f1 --- /dev/null +++ b/product_print_category_supermarket/models/product_template.py @@ -0,0 +1,27 @@ +from odoo import api, fields, models + + +class ProductTemplate(models.Model): + _inherit = "product.template" + + origin = fields.Char() + code_balance = fields.Integer("Balance Code") + ingredients = fields.Text() + expiration_date = fields.Date("Expiration Date") + + @api.model + def get_price_member(self): + param_value = ( + self.env["ir.config_parameter"] + .sudo() + .get_param("report_label_supermarket.label_pricelist") + ) + pricelist = self.env["product.pricelist"].browse(int(param_value)) + price = pricelist._get_product_price(self, 1) + return price + + @api.model + def get_price_public(self): + pricelist = self.env.ref("product.list0") + price = pricelist._get_product_price(self, 1) + return price diff --git a/product_print_category_supermarket/models/product_template_tag.py b/product_print_category_supermarket/models/product_template_tag.py new file mode 100644 index 0000000..29fa833 --- /dev/null +++ b/product_print_category_supermarket/models/product_template_tag.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class ProductTemplateTag(models.Model): + _inherit = "product.template.tag" + + image = fields.Image("Logo") diff --git a/product_print_category_supermarket/models/res_config.py b/product_print_category_supermarket/models/res_config.py new file mode 100644 index 0000000..a5d8220 --- /dev/null +++ b/product_print_category_supermarket/models/res_config.py @@ -0,0 +1,12 @@ +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + label_pricelist = fields.Many2one( + required=False, + comodel_name="product.pricelist", + string="Pricelist for members", + config_parameter="report_label_supermarket.label_pricelist", + ) diff --git a/product_print_category_supermarket/static/css/pricetag_60x30mm.scss b/product_print_category_supermarket/static/css/pricetag_60x30mm.scss new file mode 100644 index 0000000..27ab688 --- /dev/null +++ b/product_print_category_supermarket/static/css/pricetag_60x30mm.scss @@ -0,0 +1,74 @@ +.pricetag_container{ + height: 3.7cm; + width: 7.1cm; + border: 2px solid black; + text-align: left; + margin: 10; + padding: 0; + position: relative; + display: inline-table; + overflow: hidden; +} + +.product_name { + font-size: 1em; + font-weight: bold; + position: absolute; + margin-top: 1mm; + margin-left: 1mm; + text-align: left; +} + +.product_code { + font-size: 0.8em; + position: absolute; + margin-top: 1.2cm; + margin-left: 5.3cm; + text-align: left; +} + +.product_state { + font-size: 0.8em; + position: absolute; + margin-top: 1.7cm; + right: 0.3cm; + text-align: right; +} + +.product_labels { + vertical-align:bottom; + position: absolute; + margin-top: 2cm; + margin-left: 0.1cm; + width: 35%; + + img { + height: 1cm; + width: 1cm; + float: left; + padding: 0.5mm + } +} + +.product_member_price { + font-size: 1.1em; + position: absolute; + width: 58%; + text-align: right; + margin-top: 2.2cm; + margin-left: 2.8cm; + padding-right: 0.2cm; + background-color: green; + color: white; +} + +.product_public_price { + font-size: 1em; + position: absolute; + width: 58%; + margin-top: 2.9cm; + margin-left: 2.8cm; + text-align: right; + padding-right: 0.2cm; + +} diff --git a/product_print_category_supermarket/views/product_template.xml b/product_print_category_supermarket/views/product_template.xml new file mode 100644 index 0000000..5929cd7 --- /dev/null +++ b/product_print_category_supermarket/views/product_template.xml @@ -0,0 +1,37 @@ + + + + product.template.origin.form (in report_label_supermarket) + product.template + + + + + + + + + + + + + view.product.search.form.inherit.updated + product.template + + + + + + + + + diff --git a/product_print_category_supermarket/views/product_template_tag.xml b/product_print_category_supermarket/views/product_template_tag.xml new file mode 100644 index 0000000..15fcab7 --- /dev/null +++ b/product_print_category_supermarket/views/product_template_tag.xml @@ -0,0 +1,27 @@ + + + + product.template.tag.image.form (in report_label_supermarket) + product.template.tag + + + + + + + + + + + Product Tags + + + + + + diff --git a/product_print_category_supermarket/views/report_pricetag_normal.xml b/product_print_category_supermarket/views/report_pricetag_normal.xml new file mode 100644 index 0000000..ac15d03 --- /dev/null +++ b/product_print_category_supermarket/views/report_pricetag_normal.xml @@ -0,0 +1,43 @@ + + + + + + diff --git a/product_print_category_supermarket/views/res_config.xml b/product_print_category_supermarket/views/res_config.xml new file mode 100644 index 0000000..bd0e752 --- /dev/null +++ b/product_print_category_supermarket/views/res_config.xml @@ -0,0 +1,24 @@ + + + + + product.print.supermarket.res.config.settings.form + res.config.settings + + + + +
+
+
+
+ + + + + From 7bc0f90a65ebc32f326f6f5b6885b1ec94d99df1 Mon Sep 17 00:00:00 2001 From: luis Date: Thu, 2 Jan 2025 16:21:34 +0100 Subject: [PATCH 028/100] product_print_category_supermarket take prices from 2 configurable pricelist: public and members. include taxes in calculations --- .../models/product_template.py | 13 +++++++++--- .../models/res_config.py | 7 +++++++ .../views/report_pricetag_normal.xml | 20 ++++++++++++++----- .../views/res_config.xml | 4 ++++ .../models/product_template.py | 6 ------ 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/product_print_category_supermarket/models/product_template.py b/product_print_category_supermarket/models/product_template.py index fe667f1..6539b1c 100644 --- a/product_print_category_supermarket/models/product_template.py +++ b/product_print_category_supermarket/models/product_template.py @@ -18,10 +18,17 @@ class ProductTemplate(models.Model): ) pricelist = self.env["product.pricelist"].browse(int(param_value)) price = pricelist._get_product_price(self, 1) - return price + taxes = self.taxes_id.compute_all(price, quantity=1, product=self) + return taxes["total_included"] @api.model def get_price_public(self): - pricelist = self.env.ref("product.list0") + param_value = ( + self.env["ir.config_parameter"] + .sudo() + .get_param("report_label_supermarket.label_public_pricelist") + ) + pricelist = self.env["product.pricelist"].browse(int(param_value)) price = pricelist._get_product_price(self, 1) - return price + taxes = self.taxes_id.compute_all(price, quantity=1, product=self) + return taxes["total_included"] diff --git a/product_print_category_supermarket/models/res_config.py b/product_print_category_supermarket/models/res_config.py index a5d8220..df5aa4d 100644 --- a/product_print_category_supermarket/models/res_config.py +++ b/product_print_category_supermarket/models/res_config.py @@ -10,3 +10,10 @@ class ResConfigSettings(models.TransientModel): string="Pricelist for members", config_parameter="report_label_supermarket.label_pricelist", ) + + label_public_pricelist = fields.Many2one( + required=False, + comodel_name="product.pricelist", + string="Pricelist for public", + config_parameter="report_label_supermarket.label_public_pricelist", + ) diff --git a/product_print_category_supermarket/views/report_pricetag_normal.xml b/product_print_category_supermarket/views/report_pricetag_normal.xml index ac15d03..7e8b672 100644 --- a/product_print_category_supermarket/views/report_pricetag_normal.xml +++ b/product_print_category_supermarket/views/report_pricetag_normal.xml @@ -26,13 +26,23 @@
- - - Socia € + + PVS + €
- - No socia € + + PVP + + €
diff --git a/product_print_category_supermarket/views/res_config.xml b/product_print_category_supermarket/views/res_config.xml index bd0e752..947743b 100644 --- a/product_print_category_supermarket/views/res_config.xml +++ b/product_print_category_supermarket/views/res_config.xml @@ -16,6 +16,10 @@