diff options
| author | stephanchrst <stephanchrst@gmail.com> | 2023-05-09 15:18:55 +0700 |
|---|---|---|
| committer | stephanchrst <stephanchrst@gmail.com> | 2023-05-09 15:18:55 +0700 |
| commit | e754783d3ea683765f8ff31df84c633bf5f85751 (patch) | |
| tree | 89881d44cff27abeed26c61aa4da000a18d8ee55 | |
| parent | f2a939164b06672a74380f7095336683175b52c2 (diff) | |
| parent | b013b5fbc396a38c2a2a411ba142ab132aae4227 (diff) | |
Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py index 21ee9396..a03c9159 100644 --- a/indoteknik_api/models/sale_order.py +++ b/indoteknik_api/models/sale_order.py @@ -17,6 +17,7 @@ class SaleOrder(models.Model): 'purchase_order_file': True if sale_order.partner_purchase_order_file else False, 'invoice_count': sale_order.invoice_count, 'status': 'draft', + 'date_order': self.env['rest.api'].datetime_to_str(sale_order.date_order, '%d/%m/%Y %H:%M:%S'), } if sale_order.state == 'cancel': data['status'] = 'cancel' @@ -42,12 +43,11 @@ class SaleOrder(models.Model): if sale_order.state == 'done': data['status'] = 'done' + res_users = self.env['res.users'] if context: if context == 'with_detail': - res_users = self.env['res.users'] data_with_detail = { 'payment_term': sale_order.payment_term_id.name or '', - 'date_order': self.env['rest.api'].datetime_to_str(sale_order.date_order, '%d/%m/%Y %H:%M:%S'), 'products': [], 'address': { 'customer': res_users.api_address_response(sale_order.partner_id), @@ -70,6 +70,13 @@ class SaleOrder(models.Model): if invoice.state == 'posted': data_with_detail['invoices'].append(self.env['account.move'].api_v1_single_response(invoice)) data.update(data_with_detail) + else: + data_with_detail = { + 'address': { + 'customer': res_users.api_address_response(sale_order.partner_id), + } + } + data.update(data_with_detail) return data |