diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-07-02 10:06:29 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-07-02 10:06:29 +0700 |
| commit | a10024fec206f68791c87a5a4e56e4c6bce28f5c (patch) | |
| tree | 627d0ca2443eecbcb44b1b4eeda98f94c9ea3496 /indoteknik_api/models | |
| parent | 51c19eca13239fe20ae592f8e9ee0d23f8904c5f (diff) | |
| parent | f9c5b3dffcd71bfa9dea74c946d7b4277db66bd6 (diff) | |
Merge branch 'production' into feature/add_voucher_pastihemat_productsolr
Diffstat (limited to 'indoteknik_api/models')
| -rw-r--r-- | indoteknik_api/models/res_users.py | 1 | ||||
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py index 2124cd2e..d5dff876 100644 --- a/indoteknik_api/models/res_users.py +++ b/indoteknik_api/models/res_users.py @@ -19,6 +19,7 @@ class ResUsers(models.Model): 'id': res_user.id, 'parent_id': res_user.parent_id.id or None, 'parent_name': res_user.parent_id.name or None, + 'site': partner.site_id.name or None, 'partner_id': partner.id, 'name': res_user.name, 'email': res_user.login, diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index c98834bf..88dc331f 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -15,8 +15,9 @@ class SaleOrder(models.Model): 'token': self.env['rest.api'].md5_salt(sale_order.id, 'sale.order'), 'id': sale_order.id, 'name': sale_order.name, + 'site_partner': sale_order.partner_id.site_id.name, 'sales': sale_order.user_id.name, - 'amount_untaxed': sale_order.amount_untaxed, + 'amount_untaxed': sale_order.amount_untaxed, 'amount_tax': sale_order.amount_tax, 'amount_total': sale_order.grand_total, 'purchase_order_name': sale_order.partner_purchase_order_name or sale_order.client_order_ref, @@ -66,6 +67,7 @@ class SaleOrder(models.Model): 'products': [], 'delivery_amount': sale_order.delivery_amt or 0, 'address': { + 'site_partner': sale_order.partner_id.site_id.name, 'customer': res_users.api_address_response(sale_order.partner_id), 'invoice': res_users.api_address_response(sale_order.partner_invoice_id), 'shipping': res_users.api_address_response(sale_order.partner_shipping_id) |