diff --git a/app/commons/ui_login.py b/app/commons/ui_login.py index cfadbf2..8915c0d 100644 --- a/app/commons/ui_login.py +++ b/app/commons/ui_login.py @@ -41,7 +41,7 @@ class Ui_Login(object): self.vLayoutLogin.setContentsMargins(-1, 20, -1, 30) self.label_database = QLabel(self.gridGroupBoxMain) self.label_database.setObjectName(u"label_database") - self.label_database.setText(u"Base de Datos") + self.label_database.setText(u"Empresa") self.label_database.setMinimumSize(QSize(0, 0)) font = QFont() font.setFamilies([u"Sans Serif"]) @@ -117,7 +117,7 @@ class Ui_Login(object): self.label_error = QLabel(self.gridGroupBoxMain) self.label_error.setObjectName(u"label_error") self.label_error.setFont(font) - self.label_error.setStyleSheet(u"color: red") + self.label_error.setStyleSheet(u"color: red; font: 10pt;") self.label_error.setAlignment(Qt.AlignBottom | Qt.AlignLeading | Qt.AlignLeft) self.vLayoutLogin.addWidget(self.label_error) diff --git a/app/models.py b/app/models.py index d824cd8..e410726 100644 --- a/app/models.py +++ b/app/models.py @@ -31,7 +31,7 @@ MODELS = { 'payment_term.rec_name', 'payments', 'tip_amount', 'total_amount', 'residual_amount', 'paid_amount', 'untaxed_amount', 'tax_amount', 'delivery_charge', 'price_list', 'invoice_number', - 'shipment_address', 'channel', 'kind', 'shop', 'order_status', + 'shipment_address', 'kind', 'shop', 'order_status', 'delivery_party', 'reference', 'comment', 'payment_method', 'delivery_state', 'table_assigned', 'invoice_type', 'net_amount', 'delivery_amount', 'commission', 'agent.rec_name', diff --git a/app/reporting.py b/app/reporting.py index 929212a..36e8010 100755 --- a/app/reporting.py +++ b/app/reporting.py @@ -523,17 +523,18 @@ class Receipt(object): self.print_split('Subtotal Base:', money(untaxed_amount)) self.print_split('Impuesto:', money(sale['tax_amount'])) self.print_split('', '----------------') - self._printer.set(bold=True, height=2) + delivery_amount = sale.get('delivery_amount', 0) + tip_amount = sale.get('tip_amount', 0) + if not tip_amount and not delivery_amount: + self._printer.set(custom_size=True, height=2, bold=True) self.print_split('Total:', money(total_amount)) self._printer.set(bold=False, height=1) net_amount = sale['total_amount'] if not short: self.print_enter() - delivery_amount = sale.get('delivery_amount', 0) if delivery_amount and delivery_amount > 0: net_amount = net_amount + delivery_amount - tip_amount = sale.get('tip_amount', 0) if tip_amount and tip_amount > 0: net_amount = net_amount + tip_amount @@ -543,7 +544,10 @@ class Receipt(object): self.print_split('Domicilio:', money(delivery_amount)) if tip_amount or delivery_amount: + self.print_horinzontal_line() + self._printer.set(custom_size=True, height=2, bold=True) self.print_split('Valor Neto:', money(net_amount)) + self._printer.set(bold=False, height=1) self.print_enter() if sale['cash_received']: self.print_split('Recibido:', money(sale['cash_received'])) diff --git a/app/version.py b/app/version.py index 7856d12..e2cbdc5 100644 --- a/app/version.py +++ b/app/version.py @@ -1 +1 @@ -__version__ = "6.1.0" +__version__ = "6.0.9"