diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-10-01 09:07:55 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-10-01 09:07:55 +0700 |
| commit | f8ba3deeab30a5eee7ccfcbe9cf8a7e664d0bde7 (patch) | |
| tree | 00bd61d4abac0c87f5405db6595aa4709f7f416a /indoteknik_custom/models/sale_order_line.py | |
| parent | cb81068b8b695eaf8de5c0ba6b0951bae436626e (diff) | |
| parent | b9f1f1a02e53b1b874d8cfe5a97f8400bc4f4cbc (diff) | |
Merge branch 'production' into iman/switch-account
# Conflicts:
# indoteknik_api/controllers/api_v1/partner.py
Diffstat (limited to 'indoteknik_custom/models/sale_order_line.py')
| -rw-r--r-- | indoteknik_custom/models/sale_order_line.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py index 0ea6a2cc..d1dcd0af 100644 --- a/indoteknik_custom/models/sale_order_line.py +++ b/indoteknik_custom/models/sale_order_line.py @@ -245,7 +245,6 @@ class SaleOrderLine(models.Model): # query, limit=1, order='count_trx_po desc, count_trx_po_vendor desc') price, taxes, vendor_id = self._get_purchase_price(line.product_id) line.vendor_id = vendor_id - line.weight = line.product_id.weight line.tax_id = line.order_id.sales_tax_id # price, taxes = line._get_valid_purchase_price(purchase_price) line.purchase_price = price @@ -259,6 +258,7 @@ class SaleOrderLine(models.Model): ('(' + attribute_values_str + ')' if attribute_values_str else '') + ' ' + \ (line.product_id.short_spesification if line.product_id.short_spesification else '') line.name = line_name + line.weight = line.product_id.weight def compute_delivery_amt_line(self): for line in self: |