diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-05-15 16:22:21 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-05-15 16:22:21 +0700 |
| commit | f4f150ec2492b048886e1965a0a650864295c76c (patch) | |
| tree | 37386674983c542d6730e993e09337505dfc415e /indoteknik_api | |
| parent | 6364f3d0bec6e75e3056caa928bbe11d39cc145f (diff) | |
grand total field, compute grand total, sale order print for website, fix sale order download pdf api
Diffstat (limited to 'indoteknik_api')
| -rw-r--r-- | indoteknik_api/controllers/api_v1/sale_order.py | 10 | ||||
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py index ec39b32a..8fe1bb52 100644 --- a/indoteknik_api/controllers/api_v1/sale_order.py +++ b/indoteknik_api/controllers/api_v1/sale_order.py @@ -187,7 +187,7 @@ class SaleOrder(controller.Controller): return self.response('Unauthorized') sale_order = request.env['sale.order'].sudo().search_read([('id', '=', id)], ['name']) - pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'sale.report_saleorder')])._render_qweb_pdf([id]) + pdf, type = request.env['ir.actions.report'].sudo().search([('report_name', '=', 'indoteknik_custom.report_saleorder_website')])._render_qweb_pdf([id]) if pdf and len(sale_order) > 0: return rest_api.response_attachment({ 'content': pdf, @@ -235,7 +235,9 @@ class SaleOrder(controller.Controller): 'po_number': [], 'po_file': [], 'type': [], - 'delivery_amount': ['number', 'default:0'] + 'delivery_amount': ['number', 'default:0'], + 'carrier_id': [], + 'delivery_service_type': [] }) if not params['valid']: @@ -260,7 +262,9 @@ class SaleOrder(controller.Controller): 'partner_purchase_order_file': params['value']['po_file'], 'delivery_amt': params['value']['delivery_amount'], 'shipping_cost_covered': 'customer', - 'shipping_paid_by': 'customer' + 'shipping_paid_by': 'customer', + 'carrier_id': params['value']['carrier_id'], + 'delivery_service_type': params['value']['delivery_service_type'], } if params['value']['type'] == 'sale_order': parameters['approval_status'] = 'pengajuan1' diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index cadf9f77..9661a0ba 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -12,7 +12,7 @@ class SaleOrder(models.Model): 'sales': sale_order.user_id.name, 'amount_untaxed': sale_order.amount_untaxed, 'amount_tax': sale_order.amount_tax, - 'amount_total': sale_order.amount_total, + 'amount_total': sale_order.grand_total, 'purchase_order_name': sale_order.partner_purchase_order_name or sale_order.client_order_ref, 'purchase_order_file': True if sale_order.partner_purchase_order_file else False, 'invoice_count': sale_order.invoice_count, @@ -49,6 +49,7 @@ class SaleOrder(models.Model): data_with_detail = { 'payment_term': sale_order.payment_term_id.name or '', 'products': [], + 'delivery_amount': sale_order.delivery_amt or 0, 'address': { 'customer': res_users.api_address_response(sale_order.partner_id), 'invoice': res_users.api_address_response(sale_order.partner_invoice_id), |