Merge trunk

bzr revid: ddm@openerp.com-20140203151754-o5ijkuzxnjtqhekp
This commit is contained in:
ddm@openerp.com 2014-02-03 16:17:54 +01:00
commit 2e214db155
1 changed files with 2 additions and 2 deletions

View File

@ -65,7 +65,7 @@ class EscposDriver(Thread):
self.push_task('status')
return self.status
def open_cashbox(printer):
def open_cashbox(self,printer):
printer.cashdraw(2)
printer.cashdraw(5)
@ -103,7 +103,7 @@ class EscposDriver(Thread):
self.print_receipt_body(printer,data)
printer.cut()
elif task == 'cashbox':
if timestamp >= time.time() * 12:
if timestamp >= time.time() - 12:
self.open_cashbox(printer)
elif task == 'status':
pass