From 2b0c64b69ef4387fb925c2b7fd6fe0620b0854f5 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 23 Nov 2017 12:17:43 +0100 Subject: [PATCH] Revert my previous commit, sorry --- .../patch-point_of_sale-second_ean13.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pos_second_ean13/patch-point_of_sale-second_ean13.diff b/pos_second_ean13/patch-point_of_sale-second_ean13.diff index 425e15f..f400eb1 100644 --- a/pos_second_ean13/patch-point_of_sale-second_ean13.diff +++ b/pos_second_ean13/patch-point_of_sale-second_ean13.diff @@ -1,5 +1,5 @@ diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js -index e8ec348..b8ae62f 100644 +index c2b3fad..abb64c3 100644 --- a/addons/point_of_sale/static/src/js/db.js +++ b/addons/point_of_sale/static/src/js/db.js @@ -155,6 +155,9 @@ var PosDB = core.Class.extend({ @@ -23,15 +23,15 @@ index e8ec348..b8ae62f 100644 }, _partner_search_string: function(partner){ diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js -index 15b866a..717c30b 100644 +index 84f033b..f4abc8d 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js -@@ -347,7 +347,7 @@ exports.PosModel = Backbone.Model.extend({ +@@ -307,7 +307,7 @@ exports.PosModel = Backbone.Model.extend({ + }, + },{ model: 'product.product', - // todo remove list_price in master, it is unused - fields: ['display_name', 'list_price', 'lst_price', 'standard_price', 'categ_id', 'pos_categ_id', 'taxes_id', -- 'barcode', 'default_code', 'to_weight', 'uom_id', 'description_sale', 'description', -+ 'barcode', 'second_barcode', 'default_code', 'to_weight', 'uom_id', 'description_sale', 'description', +- fields: ['display_name', 'list_price','price','pos_categ_id', 'taxes_id', 'barcode', 'default_code', ++ fields: ['display_name', 'list_price','price','pos_categ_id', 'taxes_id', 'barcode', 'second_barcode', 'default_code', + 'to_weight', 'uom_id', 'description_sale', 'description', 'product_tmpl_id','tracking'], - order: _.map(['sequence','default_code','name'], function (name) { return {name: name}; }), - domain: [['sale_ok','=',true],['available_in_pos','=',true]], + order: ['sequence','default_code','name'],