diff options
| author | Mqdd <ahmadmiqdad27@gmail.com> | 2026-03-06 18:45:41 +0700 |
|---|---|---|
| committer | Mqdd <ahmadmiqdad27@gmail.com> | 2026-03-06 18:45:41 +0700 |
| commit | a4e8a9929579b36157a639a1f2ebe74677eae4e0 (patch) | |
| tree | 80068c1adfc987e1cc970e2ac7ab2878fc91213c /fixco_custom/models | |
| parent | 469ffc15ee2b614b729ad95ca1af3e499906f814 (diff) | |
<Miqdad> done
Diffstat (limited to 'fixco_custom/models')
| -rwxr-xr-x | fixco_custom/models/detail_order.py | 4 | ||||
| -rwxr-xr-x | fixco_custom/models/sale.py | 6 |
2 files changed, 5 insertions, 5 deletions
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', |
