From a4e8a9929579b36157a639a1f2ebe74677eae4e0 Mon Sep 17 00:00:00 2001
From: Mqdd <ahmadmiqdad27@gmail.com>
Date: Fri, 6 Mar 2026 18:45:41 +0700
Subject: <Miqdad> done

---
 fixco_custom/models/detail_order.py | 4 ++--
 fixco_custom/models/sale.py         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'fixco_custom')

diff --git a/fixco_custom/models/detail_order.py b/fixco_custom/models/detail_order.py
index a01e7a1..02864df 100755
--- a/fixco_custom/models/detail_order.py
+++ b/fixco_custom/models/detail_order.py
@@ -247,8 +247,8 @@ class DetailOrder(models.Model):
         }
         if partner == 281:
             data['marketplace_discount'] = total_discounts
-            data['marketplace_tax'] = total_tax
-            data['delivery_amount'] = total_shipping_fee
+            # data['marketplace_tax'] = total_tax
+            # data['delivery_amount'] = total_shipping_fee
         
         return data
 
diff --git a/fixco_custom/models/sale.py b/fixco_custom/models/sale.py
index ab03acd..11f2900 100755
--- a/fixco_custom/models/sale.py
+++ b/fixco_custom/models/sale.py
@@ -51,10 +51,10 @@ class SaleOrder(models.Model):
             if order.partner_id.id == 281:
                 subtotal = sum(line.price_subtotal for line in order.order_line)
                 tax = order.marketplace_tax
-                delivery = order.delivery_amount or 0
-                discount = order.marketplace_discount or 0
+                # delivery = order.delivery_amount or 0
+                # discount = order.marketplace_discount or 0
 
-                order.amount_total = subtotal + tax + delivery + discount
+                order.amount_total = subtotal + tax
 
     @api.depends(
         'order_line.price_unit',
-- 
cgit v1.2.3


From 276faba0be00d0f35423d030cd7b9d5ed0b0ff66 Mon Sep 17 00:00:00 2001
From: Mqdd <ahmadmiqdad27@gmail.com>
Date: Fri, 6 Mar 2026 23:27:35 +0700
Subject: <MIqdad> can search soo number in stock picking transfer name

---
 fixco_custom/views/stock_picking.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'fixco_custom')

diff --git a/fixco_custom/views/stock_picking.xml b/fixco_custom/views/stock_picking.xml
index 2e19946..c13c5d9 100755
--- a/fixco_custom/views/stock_picking.xml
+++ b/fixco_custom/views/stock_picking.xml
@@ -153,20 +153,21 @@
 
             <xpath expr="(//search/field[@name='name'])[1]" position="attributes">
                 <attribute name="filter_domain">
-                    ['|','|','|',
+                    ['|','|','|','|',
                         ('name', 'ilike', self),
                         ('origin', 'ilike', self),
                         ('invoice_mp', 'ilike', self),
+                        ('number_soo', 'ilike', self),
                         ('order_reference', 'ilike', self)
                     ]
                 </attribute>
             </xpath>
-            <xpath expr="//search" position="inside">
+            <!-- <xpath expr="//search" position="inside">
                 <field name="number_soo"
                     string="Number SOO"
                     filter_domain="[('number_soo','ilike',self)]"
                     />
-            </xpath>
+            </xpath> -->
 
         </field>
     </record>
-- 
cgit v1.2.3