minor fix

This commit is contained in:
wilsongomez 2022-04-21 09:15:52 -05:00
parent 5bc1f58d23
commit 842e8d37be
3 changed files with 26 additions and 5 deletions

View File

@ -165,6 +165,8 @@ class FieldDate(QCalendarWidget):
self.value_changed = False
self.key = key
self.selectionChanged.connect(self.on_change)
if value.get('default'):
self.form.setState(self.key, value.get('default'))
def get_value(self):
return self.selectedDate().toPyDate()
@ -482,6 +484,7 @@ class GridForm(QGridLayout):
cols = 0
def setState(self, key, value):
print('ingresa a setstate', key, value)
self.store[key] = value
def getStore(self):

View File

@ -1,4 +1,5 @@
from decimal import Decimal
from datetime import datetime
from .commons.dialogs import HelpDialog, QuickDialog
from PyQt5.QtCore import Qt, QSize
from PyQt5.QtWidgets import (
@ -40,6 +41,7 @@ WIZARDS = {
('date', {
'name': 'FECHA',
'type': 'date',
'default': datetime.now().strftime("%Y-%m-%d"),
}),
('turn', {
'name': 'TURNO',
@ -127,7 +129,7 @@ class DialogReports(QuickDialog):
self.setWindowTitle('REPORTES')
self.add_widget(vbox)
def open_wizard(self, report, add_fields=None, open_print=False):
def open_wizard(self, report, add_fields=None, open_print=True):
vbox = QVBoxLayout()
wiz_report = WIZARDS[report]
fields = wiz_report['fields']
@ -144,11 +146,11 @@ class DialogReports(QuickDialog):
values[cf] = self.parent.ctx[cf]
values.update(store)
report_name = wiz_report['name']
if result == 1:
if open_print:
return values
if not open_print:
return values, report_name
else:
report_name = wiz_report['name']
self.open_report(report_name, values)
def open_report(self, report_name, data):

View File

@ -1962,7 +1962,23 @@ class AppWindow(FrontWindow):
return self.allow_categories
def action_square_box_report(self):
self.dialog_reports.open_wizard('square_box_report')
try:
values, report_name = self.dialog_reports.open_wizard('square_box_report', open_print=False)
except:
values = {}
if not values.get('turn'):
return
statements = self.Statement.find([
('turn', '=', values['turn']),
('state', '=', 'draft'),
('date', '=', values['date']),
('company', '=', values['company']),
('sale_device.shop', '=', values['shop'])
])
if statements:
return
self.dialog_reports.open_report(report_name, values)
def action_terminal_journal_report(self):
pass