[MERGE] Forward-port 7.0 up to 605b94e64c
This commit is contained in:
commit
9a0124591b
|
@ -20,6 +20,7 @@
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import psycopg2
|
||||||
import time
|
import time
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
@ -673,6 +674,9 @@ class pos_order(osv.osv):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.signal_workflow(cr, uid, [order_id], 'paid')
|
self.signal_workflow(cr, uid, [order_id], 'paid')
|
||||||
|
except psycopg2.OperationalError:
|
||||||
|
# do not hide transactional errors, the order(s) won't be saved!
|
||||||
|
raise
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
_logger.error('Could not fully process the POS Order: %s', tools.ustr(e))
|
_logger.error('Could not fully process the POS Order: %s', tools.ustr(e))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue