[MERGE] forward port branch saas-11 up to 1f73105ddd

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);
     },

addons/stock/tests/test_stock_flow.py

@@ -1576,7 +1576,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")

requirements.txt

@@ -16,7 +16,7 @@ passlib==1.6.5
 Pillow==3.4.1
 psutil==4.3.1
 psycogreen==1.0
-psycopg2==2.6.2
+psycopg2==2.7.1
 pydot==1.2.3
 pyparsing==2.1.10
 pyPdf==1.13