minor fix
This commit is contained in:
parent
d789aa5d5e
commit
0227a705df
|
@ -146,7 +146,7 @@ class DialogReports(QuickDialog):
|
|||
values[cf] = self.parent.ctx[cf]
|
||||
|
||||
values.update(store)
|
||||
report_name = wiz_report['name']
|
||||
report_name = wiz_report.get('name')
|
||||
if result == 1:
|
||||
if not open_print:
|
||||
return values, report_name
|
||||
|
|
33
app/main.py
33
app/main.py
|
@ -1536,7 +1536,6 @@ class AppWindow(FrontWindow):
|
|||
if price < 0:
|
||||
price = 0
|
||||
res = self.set_unit_price(price)
|
||||
|
||||
else:
|
||||
lines = []
|
||||
if line_id:
|
||||
|
@ -1546,26 +1545,6 @@ class AppWindow(FrontWindow):
|
|||
lines = [ln['id'] for ln in self.model_sale_lines._data]
|
||||
if lines:
|
||||
res = self.set_discount(discount, lines)
|
||||
# if res:
|
||||
# if line:
|
||||
# sale_line, = self.SaleLine.find([
|
||||
# ('id', '=', line_id)
|
||||
# ])
|
||||
# newnote = line['note'] + '\n' if line.get('note') else ''
|
||||
# new_note = newnote + rec['name']
|
||||
# sale_line['note'] = new_note
|
||||
# self.model_sale_lines.update_record(sale_line)
|
||||
# else:
|
||||
# comment = self._sale['comment'] + \
|
||||
# '\n' if self._sale.get('comment') else ''
|
||||
# comment = comment + rec['name']
|
||||
# sale_lines = self.SaleLine.find([
|
||||
# ('id', 'in', lines)
|
||||
# ])
|
||||
# for line in sale_lines:
|
||||
# self.model_sale_lines.update_record(line)
|
||||
# self.store.update({'comment': comment})
|
||||
# self._sale.update({'comment': comment})
|
||||
|
||||
if not res:
|
||||
self.message_bar.set('discount_not_valid')
|
||||
|
@ -1607,8 +1586,8 @@ class AppWindow(FrontWindow):
|
|||
'type': 'selection',
|
||||
'values': _parties.items(),
|
||||
})
|
||||
args = self.dialog_reports.open_wizard(
|
||||
'delivery_report', add_fields, True
|
||||
args, report_name = self.dialog_reports.open_wizard(
|
||||
'delivery_report', add_fields, open_print=False
|
||||
)
|
||||
domain = [
|
||||
('sale_date', '=', args['date']),
|
||||
|
@ -2893,7 +2872,6 @@ class AppWindow(FrontWindow):
|
|||
'value': value,
|
||||
'discount': discount,
|
||||
})
|
||||
print(value, discount, 'set_unit_price')
|
||||
if rec:
|
||||
self.model_sale_lines.update_record(rec)
|
||||
self.set_amounts()
|
||||
|
@ -2902,12 +2880,10 @@ class AppWindow(FrontWindow):
|
|||
|
||||
def add_payment(self, amount):
|
||||
voucher_number = None
|
||||
print('ingresa a este add_payment', self.journal)
|
||||
if not self.journal:
|
||||
journal = self.default_journal
|
||||
else:
|
||||
journal = self.journal
|
||||
print('ingresa a este add_payment', self.journal)
|
||||
|
||||
if journal.get('require_voucher'):
|
||||
res = self.dialog_voucher.exec_()
|
||||
|
@ -3130,7 +3106,7 @@ class AppWindow(FrontWindow):
|
|||
if not data:
|
||||
return
|
||||
_record = None
|
||||
|
||||
print(line, 'this line')
|
||||
update_base_price = self.dialog_product_edit.checkbox_base.isChecked()
|
||||
if update_base_price:
|
||||
data['update_base_price'] = update_base_price
|
||||
|
@ -3155,12 +3131,9 @@ class AppWindow(FrontWindow):
|
|||
if k in ['description', 'note']:
|
||||
to_write[k] = v
|
||||
elif k == 'unit_price' and float(v) != current_unit_price:
|
||||
print('uno')
|
||||
if float(v) > base_price:
|
||||
print('ingresa a set uni')
|
||||
self.set_unit_price(v, discount=False)
|
||||
else:
|
||||
print('discount')
|
||||
self._sign = '/'
|
||||
value = current_unit_price - float(v)
|
||||
self.set_discount(value, type_='fixed')
|
||||
|
|
Loading…
Reference in New Issue