diff --git a/app/logo.png b/app/logo.png index 7793ee7..1afee71 100644 Binary files a/app/logo.png and b/app/logo.png differ diff --git a/app/mainwindow.py b/app/mainwindow.py index a7cdbc9..553082d 100644 --- a/app/mainwindow.py +++ b/app/mainwindow.py @@ -118,9 +118,9 @@ class MainWindow(FrontWindow): self.do_invoice = DoInvoice(self, self._context) self.do_invoice.sigDoInvoice.connect(self.__do_invoice_thread) - self.set_cache_company() if self.cache_local: + self.set_cache_company() self.set_cache_products() def set_domains(self): @@ -831,6 +831,7 @@ class MainWindow(FrontWindow): def button_plus_pressed(self): error = False + print(self._state) if self._input_text == '' and self._amount_text == '0': return if self._state in ('paid', 'disabled'): @@ -1053,7 +1054,7 @@ class MainWindow(FrontWindow): self.ModSale.reconcile_invoice({ 'sale_id': self.sale_to_post['id'] }) - self.set_state('finished') + # self.set_state('finished') def _done_sale(self, is_credit=False): self._sale['is_credit'] = is_credit @@ -1467,7 +1468,7 @@ class MainWindow(FrontWindow): return True def action_cancel(self): - if self._state == 'finished': + if self._state == 'disabled': return if self.type_pos_user == 'cashier': self.dialog_cancel_invoice.exec_() @@ -2478,7 +2479,6 @@ class MainWindow(FrontWindow): key not in (Qt.Key_Enter, Qt.Key_End): # Clear ui context when keys function are pressed self._clear_context() - if key in (Qt.Key_Return, Qt.Key_Plus): self.button_plus_pressed() elif key in self.show_keys: diff --git a/app/share/delivery_men.svg b/app/share/delivery_men.svg index 32fade2..759cafc 100644 Binary files a/app/share/delivery_men.svg and b/app/share/delivery_men.svg differ