mirror of
https://bitbucket.org/presik/presik_pos.git
synced 2023-12-14 06:03:00 +01:00
Final fix
This commit is contained in:
parent
5740970604
commit
58a0980c1a
2 changed files with 13 additions and 7 deletions
|
@ -1024,12 +1024,12 @@ class EditLine(QWidget):
|
|||
|
||||
class AdditionProduct(QuickDialog):
|
||||
def __init__(self, parent):
|
||||
super(AdditionProduct, self).__init__(parent, 'selection')
|
||||
super(AdditionProduct, self).__init__(parent, 'action')
|
||||
self.setWindowTitle(self.tr('SELECT ADDITIONAL'))
|
||||
self._parent = parent
|
||||
|
||||
def set_products(self, products):
|
||||
vbox_ = create_vbox(self._parent, products, 'on_selected_item')
|
||||
vbox_ = create_vbox(self._parent, products, 'on_selected_item_mix')
|
||||
self.add_widget(vbox_)
|
||||
|
||||
|
||||
|
|
|
@ -1630,10 +1630,14 @@ class MainWindow(FrontWindow):
|
|||
self.dialog_product_stock.update_values(res)
|
||||
self.dialog_product_stock.show()
|
||||
|
||||
def on_selected_item(self, record):
|
||||
def on_selected_item_mix(self, record):
|
||||
price_list = self._current_line['unit_price']
|
||||
self.on_selected_item(record, price_list)
|
||||
|
||||
def on_selected_item(self, record, price_list=None):
|
||||
if record:
|
||||
self.clear_right_panel()
|
||||
self.add_product(record=record)
|
||||
self.add_product(record=record, price_list=price_list)
|
||||
|
||||
def on_selected_salesman(self, salesman_id):
|
||||
if salesman_id:
|
||||
|
@ -1897,7 +1901,7 @@ class MainWindow(FrontWindow):
|
|||
return False
|
||||
return True
|
||||
|
||||
def add_product(self, record=None, code=None):
|
||||
def add_product(self, record=None, code=None, price_list=None):
|
||||
if self._state == 'disabled':
|
||||
self.message_bar.set('must_load_or_create_sale')
|
||||
return
|
||||
|
@ -1920,8 +1924,10 @@ class MainWindow(FrontWindow):
|
|||
data = {
|
||||
'sale_id': self._sale['id'],
|
||||
'product_id': product_id,
|
||||
'qty': 1
|
||||
'qty': 1,
|
||||
}
|
||||
if price_list:
|
||||
data['price_list'] = price_list
|
||||
res = self.Sale.faster_add_product(data)
|
||||
self._sale_line = res
|
||||
self._current_line_id = res['id']
|
||||
|
@ -1965,7 +1971,7 @@ class MainWindow(FrontWindow):
|
|||
def sale_line_selected(self, line):
|
||||
if self._state in ('cash', 'payment'):
|
||||
return
|
||||
print('xxxxxxxxxxx', line)
|
||||
|
||||
self._current_line = line
|
||||
self._current_line_id = line['id']
|
||||
product_id = None
|
||||
|
|
Loading…
Reference in a new issue