Merge branch 'release' into line_no_sales_order

1 files changed, 6 insertions, 19 deletions

diff --git a/indoteknik_api/controllers/api_v1/invoice.py b/indoteknik_api/controllers/api_v1/invoice.py
index 5a6e8316..59cacfc4 100644
--- a/indoteknik_api/controllers/api_v1/invoice.py
+++ b/indoteknik_api/controllers/api_v1/invoice.py
@@ -34,7 +34,11 @@ class Invoice(controller.Controller):
         ]
         if params['value']['name']:
             name = params['value']['name'].replace(' ', '%')
-            domain.append(('name', 'ilike', '%'+ name +'%'))
+            domain += [
+                '|',
+                ('name', 'ilike', '%'+ name +'%'),
+                ('ref', 'ilike', '%'+ name +'%')
+            ]
         invoices = request.env['account.move'].search(domain, offset=offset, limit=limit)
         data = {
             'invoice_total': request.env['account.move'].search_count(domain),
@@ -67,23 +71,6 @@ class Invoice(controller.Controller):
         data = {}
         account_move = request.env['account.move'].search(domain)
         if account_move:
-            res_users = request.env['res.users']
-            data = {
-                'id': account_move.id,
-                'name': account_move.name,
-                'purchase_order_name': account_move.ref or '',
-                'payment_term': account_move.invoice_payment_term_id.name or '',
-                'sales': account_move.invoice_user_id.name,
-                'amount_total': account_move.amount_total,
-                'amount_residual': account_move.amount_residual,
-                'invoice_date': account_move.invoice_date.strftime('%d/%m/%Y') or '',
-                'invoice_date_due': account_move.invoice_date_due.strftime('%d/%m/%Y') or '',
-                'customer': res_users.api_address_response(account_move.partner_id),
-                'products': [],
-            }
-            for line in account_move.invoice_line_ids:
-                product = request.env['product.product'].api_single_response(line.product_id)
-                product['quantity'] = line.quantity
-                data['products'].append(product)
+            data = request.env['account.move'].api_v1_single_response(account_move, context='with_detail')
         
         return self.response(data)