From 2a787f592c669ed95b5777636d24b64ee0010fc6 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Thu, 3 Aug 2023 17:06:57 +0700 Subject: replace menu product attribute --- indoteknik_custom/views/product_attribute_value.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/views/product_attribute_value.xml b/indoteknik_custom/views/product_attribute_value.xml index 7c33ba7b..1e84c21a 100644 --- a/indoteknik_custom/views/product_attribute_value.xml +++ b/indoteknik_custom/views/product_attribute_value.xml @@ -50,6 +50,7 @@ id="menu_product_attribute_value" name="Attribute Values" action="product_attribute_value_action_custom" - parent="sale.prod_config_main" sequence="6" groups="uom.group_uom" + parent="sale.product_menu_catalog" + sequence="8"/> /> -- cgit v1.2.3 From 444f292f31a06bbec51dffa44b4359ac9e3d5afb Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 4 Aug 2023 09:26:00 +0700 Subject: Fix checkout sale order bug voucher --- indoteknik_api/controllers/api_v1/sale_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index cc7fd48f..28011d27 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -362,9 +362,9 @@ class SaleOrder(controller.Controller): line.amount_voucher_disc = voucher_disc_line voucher_disc_item = voucher_disc_line / line.product_uom_qty - voucher_disc_subtotal = line.price_subtotal - voucher_disc_item + voucher_disc_unit = line.price_unit - voucher_disc_item - line.discount = (line.price_unit - voucher_disc_subtotal) / line.price_unit * 100 + line.discount += (line.price_unit - voucher_disc_unit) / line.price_unit * 100 cart_ids = [x['cart_id'] for x in products] user_cart.browse(cart_ids).unlink() -- cgit v1.2.3 From d306603f418fe4d616226b8755e52f9dcdfdbbc9 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 4 Aug 2023 10:26:45 +0700 Subject: Add default sale order source from API --- indoteknik_api/controllers/api_v1/sale_order.py | 1 + 1 file changed, 1 insertion(+) diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index 28011d27..1ad1ff51 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -276,6 +276,7 @@ class SaleOrder(controller.Controller): 'team_id': 2, 'company_id': 1, 'currency_id': 12, + 'source_id': 59, 'state': 'draft', 'picking_policy': 'direct', 'partner_id': params['value']['partner_id'], -- cgit v1.2.3 From 6f15f70b87a03d972db5f3280c13cfa4821ecce9 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 4 Aug 2023 10:48:24 +0700 Subject: fix crm lead admin & undefined --- indoteknik_custom/models/crm_lead.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/indoteknik_custom/models/crm_lead.py b/indoteknik_custom/models/crm_lead.py index 0cea878a..e37985c7 100755 --- a/indoteknik_custom/models/crm_lead.py +++ b/indoteknik_custom/models/crm_lead.py @@ -81,11 +81,13 @@ class CrmLead(models.Model): if not lead.partner_id: continue - if not lead.user_id or lead.user_id.id == 2 or lead.user_id.id == 25: - if lead.partner_id.parent_id.user_id: - salesperson_id = lead.partner_id.parent_id.user_id.id - elif lead.partner_id.user_id: - salesperson_id = lead.partner_id.user_id.id + if not lead.user_id or lead.user_id.id in [2, 25]: + partner = lead.partner_id.parent_id or lead.partner_id + if partner.user_id and partner.user_id.id not in [2, 25]: + salesperson_id = partner.user_id.id else: salesperson_id = 20 - lead.user_id = salesperson_id + + lead.user_id = salesperson_id + + -- cgit v1.2.3 From dd0ee7ad460b0cfdbd863e9befc5408b88f81e1e Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 4 Aug 2023 10:56:31 +0700 Subject: Update flash sale tag on sync solr --- indoteknik_api/models/product_product.py | 3 +++ indoteknik_custom/models/apache_solr.py | 1 + 2 files changed, 4 insertions(+) diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py index fb485bae..ff7c6498 100644 --- a/indoteknik_api/models/product_product.py +++ b/indoteknik_api/models/product_product.py @@ -250,6 +250,7 @@ class ProductProduct(models.Model): active_flash_sale = self.env['product.pricelist'].get_active_flash_sale() flashsale_id = 0 flashsale_name = '' + flashsale_tag = '' # loop pricelist items base_price = discount = price_flashsale = 0 for pricelist in active_flash_sale: @@ -261,6 +262,7 @@ class ProductProduct(models.Model): for item in pricelist_items: flashsale_id = pricelist.id flashsale_name = pricelist.name + flashsale_tag = pricelist.flashsale_tag base_price = self._get_website_price_exclude_tax() if item.price_discount > 0: discount = item.price_discount @@ -272,6 +274,7 @@ class ProductProduct(models.Model): data = { 'flashsale_id': flashsale_id, 'flashsale_name': flashsale_name, + 'flashsale_tag': flashsale_tag, 'flashsale_base_price': base_price, 'flashsale_discount': discount, 'flashsale_price': price_flashsale diff --git a/indoteknik_custom/models/apache_solr.py b/indoteknik_custom/models/apache_solr.py index 6211dfc4..086fb6d0 100644 --- a/indoteknik_custom/models/apache_solr.py +++ b/indoteknik_custom/models/apache_solr.py @@ -150,6 +150,7 @@ class ApacheSolr(models.Model): 'search_rank_i': template.search_rank, 'search_rank_weekly_i': template.search_rank_weekly, 'flashsale_id_i': flashsale_data['flashsale_id'] or 0, + 'flashsale_tag_s': flashsale_data['flashsale_tag'] or '', 'flashsale_name_s': flashsale_data['flashsale_name'] or '', 'flashsale_base_price_f': flashsale_data['flashsale_base_price'] or 0, 'flashsale_discount_f': flashsale_data['flashsale_discount'] or 0, -- cgit v1.2.3 From 1ef822f76b33fdd7db786735c6fd7f770b26f3ee Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 4 Aug 2023 12:58:37 +0700 Subject: fix crm leads salesperson --- indoteknik_custom/models/crm_lead.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/crm_lead.py b/indoteknik_custom/models/crm_lead.py index e37985c7..4efe23c5 100755 --- a/indoteknik_custom/models/crm_lead.py +++ b/indoteknik_custom/models/crm_lead.py @@ -80,7 +80,8 @@ class CrmLead(models.Model): lead.tag_ids = input_tags if not lead.partner_id: - continue + salesperson_id = 20 + if not lead.user_id or lead.user_id.id in [2, 25]: partner = lead.partner_id.parent_id or lead.partner_id if partner.user_id and partner.user_id.id not in [2, 25]: -- cgit v1.2.3