diff options
| author | Mqdd <ahmadmiqdad27@gmail.com> | 2026-03-07 13:45:28 +0700 |
|---|---|---|
| committer | Mqdd <ahmadmiqdad27@gmail.com> | 2026-03-07 13:45:28 +0700 |
| commit | eb39bec92f2e2fef2be5bf64a7c165ecd9787601 (patch) | |
| tree | b970653de4fe4052f278a397ff1bfe9bf3214fb6 /fixco_custom | |
| parent | c4090ef57b2288ed219cfb5b9abb5997b4f85bbc (diff) | |
| parent | 276faba0be00d0f35423d030cd7b9d5ed0b0ff66 (diff) | |
<Miqdad> merge
Diffstat (limited to 'fixco_custom')
| -rwxr-xr-x | fixco_custom/models/detail_order.py | 4 | ||||
| -rwxr-xr-x | fixco_custom/models/sale.py | 6 | ||||
| -rwxr-xr-x | fixco_custom/views/stock_picking.xml | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/fixco_custom/models/detail_order.py b/fixco_custom/models/detail_order.py index 8df3687..7d78122 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', 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> |