Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert my previous commit, sorry

Browse Source
This commit is contained in:
Alexis de Lattre
2017-11-23 12:17:43 +01:00
parent b40e4eca05
commit 2b0c64b69e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pos_second_ean13/patch-point_of_sale-second_ean13.diff
View File

@@ -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'],