diff --git a/app/main.py b/app/main.py index 709e0a5..f0ab35a 100644 --- a/app/main.py +++ b/app/main.py @@ -1836,7 +1836,7 @@ class AppWindow(FrontWindow): 'delivery_amount': sale['delivery_amount'] if sale.get('delivery_amount') else 0, 'salesman': sale['salesman']['rec_name'] if sale.get('salesman') else '', 'comment': sale['comment'], - 'payment_term': sale['payment_term']['rec_name'] if sale.get('payment_term') else '', + 'payment_term': sale['payment_term']['name'] if sale.get('payment_term') else '', 'delivery_charge': sale.get('delivery_charge'), 'total_amount': sale['total_amount'], 'shop': self.shop['name'], diff --git a/app/models.py b/app/models.py index e0da3a4..7fdd8a7 100644 --- a/app/models.py +++ b/app/models.py @@ -28,7 +28,7 @@ MODELS_RESTAURANT = { 'fields': [ 'number', 'party.name', 'lines', 'sale_date', 'state', 'total_amount_cache', 'salesman.rec_name', - 'payment_term.rec_name', 'payments', 'tip_amount', + 'payment_term.name', 'payments', 'tip_amount', 'total_amount', 'residual_amount', 'paid_amount', 'untaxed_amount', 'tax_amount', 'delivery_charge', 'price_list', 'invoice_number', 'shipment_address', 'kind', 'shop', 'order_status', @@ -255,7 +255,7 @@ MODELS_RETAIL = { 'fields': [ 'number', 'party.name', 'lines', 'sale_date', 'state', 'total_amount_cache', 'salesman.rec_name', - 'payment_term.rec_name', 'payments', 'tip_amount', + 'payment_term.name', 'payments', 'tip_amount', 'total_amount', 'residual_amount', 'paid_amount', 'untaxed_amount', 'tax_amount', 'delivery_charge', 'price_list', 'invoice_number', 'shipment_address', 'kind', 'shop', 'turn', diff --git a/app/share/transfer_to_folio.svg b/app/share/transfer.svg similarity index 100% rename from app/share/transfer_to_folio.svg rename to app/share/transfer.svg