Presik
/
presik_pos
mirror of https://bitbucket.org/presik/presik_pos.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fix

This commit is contained in:
Wilson Gomez 2023-01-06 16:21:40 -05:00
parent 4cad1aaa84
commit 341e317b54
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/commons/ui_login.py
View File

@ -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)

2
app/models.py
View File

@ -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',

10
app/reporting.py
View File

@ -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']))

2
app/version.py
View File

@ -1 +1 @@
__version__ = "6.1.0"
__version__ = "6.0.9"