diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js index 1f804a40fea..0a356661cf6 100644 --- a/addons/barcodes/static/src/js/barcode_parser.js +++ b/addons/barcodes/static/src/js/barcode_parser.js @@ -102,7 +102,7 @@ var BarcodeParser = Class.extend({ ean = ean.substr(0,13); for(var n = 0, count = (13 - ean.length); n < count; n++){ - ean = ean + '0'; + ean = '0' + ean; } return ean.substr(0,12) + this.ean_checksum(ean); }, diff --git a/addons/stock/tests/test_stock_flow.py b/addons/stock/tests/test_stock_flow.py index 2f980b8214d..237329be363 100644 --- a/addons/stock/tests/test_stock_flow.py +++ b/addons/stock/tests/test_stock_flow.py @@ -1534,7 +1534,6 @@ class TestStockFlow(TestStockCommon): 'picking_id': picking_out.id, 'location_id': self.stock_location, 'location_dest_id': self.customer_location}) - # validate this delivery order, it should be in the waiting state picking_out.action_assign() self.assertEquals(picking_out.state, "confirmed") diff --git a/requirements.txt b/requirements.txt index 15d7d110289..7fd99eba68c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ ofxparse==0.14 passlib==1.6.2 psutil==2.2.0 psycogreen==1.0 -psycopg2==2.5.4 +psycopg2==2.7.1 pyPdf==1.13 pydot==1.0.2 pyparsing==2.0.3