From 4745099706649aff2ca8296be7566657be47873e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 28 Mar 2014 14:44:01 +0100 Subject: [PATCH 1/7] [FIX] hw_escops, point_of_sale: backporting fixes from the pos-restaurant branch bzr revid: fva@openerp.com-20140328134401-ao85rr8b29nqg626 --- addons/hw_escpos/controllers/main.py | 1 + addons/hw_escpos/escpos/constants.py | 2 ++ addons/hw_escpos/escpos/escpos.py | 9 +++++++-- addons/point_of_sale/static/src/xml/pos.xml | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 9e5656ef986..b6c302aa9e9 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -288,6 +288,7 @@ class EscposDriver(Thread): +' '+ str(receipt['date']['hour']).zfill(2) +':'+ str(receipt['date']['minute']).zfill(2) ) + driver = EscposDriver() driver.push_task('printstatus') diff --git a/addons/hw_escpos/escpos/constants.py b/addons/hw_escpos/escpos/constants.py index 6f0be0bb135..7b9d92c61e1 100644 --- a/addons/hw_escpos/escpos/constants.py +++ b/addons/hw_escpos/escpos/constants.py @@ -33,6 +33,8 @@ TXT_FONT_B = '\x1b\x4d\x01' # Font type B TXT_ALIGN_LT = '\x1b\x61\x00' # Left justification TXT_ALIGN_CT = '\x1b\x61\x01' # Centering TXT_ALIGN_RT = '\x1b\x61\x02' # Right justification +TXT_COLOR_BLACK = '\x1b\x72\x00' # Default Color +TXT_COLOR_RED = '\x1b\x72\x01' # Alternative Color ( Usually Red ) # Text Encoding diff --git a/addons/hw_escpos/escpos/escpos.py b/addons/hw_escpos/escpos/escpos.py index 84b52f99d8c..8b6a94c04ba 100644 --- a/addons/hw_escpos/escpos/escpos.py +++ b/addons/hw_escpos/escpos/escpos.py @@ -60,6 +60,7 @@ class StyleStack: 'tabwidth': 2, 'bullet': ' - ', 'line-ratio':0.5, + 'color': 'black', 'value-decimals': 2, 'value-symbol': '', @@ -107,7 +108,11 @@ class StyleStack: 'double-height': TXT_2HEIGHT, 'double-width': TXT_2WIDTH, 'double': TXT_DOUBLE, - } + }, + 'color': { + 'black': TXT_COLOR_BLACK, + 'red': TXT_COLOR_RED, + }, } self.push(self.defaults) @@ -595,7 +600,7 @@ class Escpos: width=stylestack.get('value-width'), decimals_separator=stylestack.get('value-decimals-separator'), thousands_separator=stylestack.get('value-thousands-separator'), - autoint=(stylestack.get('autoint') == 'on'), + autoint=(stylestack.get('value-autoint') == 'on'), symbol=stylestack.get('value-symbol'), position=stylestack.get('value-symbol-position') )) diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index baea81becb7..02c6374578b 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -400,7 +400,7 @@ -------- - Subtotal receipt.subtotal + Subtotal @@ -411,7 +411,7 @@ - ------- + --------
        TOTAL
From 396b2508dca5b4f951706845f802511c89f83067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Fri, 28 Mar 2014 15:43:35 +0100 Subject: [PATCH 2/7] [FIX] hw_posbox_upgrade: posbox restart was not working bzr revid: fva@openerp.com-20140328144335-zs5kdh7kxvliumyq --- addons/hw_posbox_upgrade/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py index b741a7a9102..21245a57f0a 100644 --- a/addons/hw_posbox_upgrade/controllers/main.py +++ b/addons/hw_posbox_upgrade/controllers/main.py @@ -32,7 +32,7 @@ upgrade_template = """ $('#upgrade').html('Upgrade Successful
Click to Restart the PosBox'); $('#upgrade').off('click'); $('#upgrade').click(function(){ - $.ajax({ url:'hw_proxy/perform_restart' }) + $.ajax({ url:'/hw_proxy/perform_restart' }) $('#upgrade').text('Restarting'); $('#upgrade').off('click'); setTimeout(function(){ From f1131d547b22bb5144e0b4d1df145508da83b264 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 29 Mar 2014 13:56:35 +0100 Subject: [PATCH 3/7] [IMP] flat design, even for darken bzr revid: fp@tinyerp.com-20140329125635-3ext2zt4y9n2cpua --- addons/website/static/src/css/website.css | 9 --------- addons/website/static/src/css/website.sass | 1 - addons/website/views/website_templates.xml | 16 ++++++++-------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index e734525ee08..354796a053e 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -414,9 +414,6 @@ div.carousel .carousel-indicators .active { .oe_dark { background: #eff8f8; background: rgba(200, 200, 200, 0.14); - -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - -moz-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; - box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; } .oe_black { @@ -530,9 +527,3 @@ span[data-oe-type="monetary"] { width: 400px; margin: 40px auto; } - -.oe_website_overflow_ellipsis{ - white-space:nowrap; - overflow:hidden; - text-overflow:ellipsis; -} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 3bdda2cb720..77da53c2958 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -342,7 +342,6 @@ div.carousel .oe_dark background: #eff8f8 background: rgba(200, 200, 200, 0.14) - +box-shadow(0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset) .oe_black background-color: rgba(0, 0, 0, 0.9) diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 3df96cb65f2..67a7d613261 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -595,16 +595,16 @@
-