thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[FIX] Multi barcode pos bug fix

pull/232/head
AjmalCybro 3 years ago
parent
1486631a81
commit
ff2f2c629c
3 changed files with 26 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      multi_barcodes_pos/models/product_product.py
  2. 4
      multi_barcodes_pos/static/src/js/pos_scan.js
  3. 32
      multi_barcodes_pos/views/product_views.xml

12
multi_barcodes_pos/models/product_product.py
View File

@ -40,8 +40,8 @@ class ProductProduct(models.Model):
def write(self, vals): def write(self, vals):
res = super(ProductProduct, self).write(vals) res = super(ProductProduct, self).write(vals)
self.product_multi_barcodes.update({ res.product_multi_barcodes.update({
'template_multi': self.product_tmpl_id.id 'template_multi': res.product_tmpl_id.id
}) })
return res return res
@ -53,7 +53,7 @@ class ProductProduct(models.Model):
domain = ['|', '|', ('name', operator, name), ('default_code', operator, name), domain = ['|', '|', ('name', operator, name), ('default_code', operator, name),
'|', ('barcode', operator, name), ('product_multi_barcodes', operator, name)] '|', ('barcode', operator, name), ('product_multi_barcodes', operator, name)]
product_id = self._search(expression.AND([domain, args]), limit=limit, access_rights_uid=name_get_uid) product_id = self._search(expression.AND([domain, args]), limit=limit, access_rights_uid=name_get_uid)
return self.browse(product_id).name_get() return product_id
class ProductTemplate(models.Model): class ProductTemplate(models.Model):
@ -71,9 +71,9 @@ class ProductTemplate(models.Model):
def write(self, vals): def write(self, vals):
res = super(ProductTemplate, self).write(vals) res = super(ProductTemplate, self).write(vals)
if self.template_multi_barcodes: if res.template_multi_barcodes:
self.template_multi_barcodes.update({ res.template_multi_barcodes.update({
'product_multi': self.product_variant_id.id 'product_multi': res.product_variant_id.id
}) })
return res return res

4
multi_barcodes_pos/static/src/js/pos_scan.js
View File

@ -10,7 +10,9 @@ DB.include({
this._super.apply(this, arguments); this._super.apply(this, arguments);
}, },
add_products: function(products){ add_products: function(products){
var stored_categories = this.product_by_category_id; var stored_categories = this.product_by_category_id;
if(!products instanceof Array){ if(!products instanceof Array){
products = [products]; products = [products];
@ -43,7 +45,9 @@ DB.include({
this.product_by_id[product.id] = product; this.product_by_id[product.id] = product;
if(product.barcode){ if(product.barcode){
this.product_by_barcode[product.barcode] = product; this.product_by_barcode[product.barcode] = product;
} }
console.log('12345', this.product_by_barcode[product.barcode])
for(var t=0;t < product.product_multi_barcodes.length;t++){ for(var t=0;t < product.product_multi_barcodes.length;t++){
var self = this; var self = this;
rpc.query({ rpc.query({

32
multi_barcodes_pos/views/product_views.xml
View File

@ -1,20 +1,20 @@
<odoo> <odoo>
<record model="ir.ui.view" id="product_template_form_view_supplier_ean13"> <!-- <record model="ir.ui.view" id="product_template_form_view_supplier_ean13">-->
<field name="name">product.template.ean13</field> <!-- <field name="name">product.template.ean13</field>-->
<field name="model">product.template</field> <!-- <field name="model">product.template</field>-->
<field name="inherit_id" ref="product.product_template_only_form_view"/> <!-- <field name="inherit_id" ref="product.product_template_only_form_view"/>-->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml">-->
<xpath expr="//page[@name='general_information']" position="after"> <!-- <xpath expr="//page[@name='general_information']" position="after">-->
<page string="Barcodes" attrs="{'invisible':[('product_variant_count', '>', 1)]}"> <!-- <page string="Barcodes" attrs="{'invisible':[('product_variant_count', '>', 1)]}">-->
<field name="template_multi_barcodes"> <!-- <field name="template_multi_barcodes">-->
<tree editable="bottom"> <!-- <tree editable="bottom">-->
<field name="multi_barcode"/> <!-- <field name="multi_barcode"/>-->
</tree> <!-- </tree>-->
</field> <!-- </field>-->
</page> <!-- </page>-->
</xpath> <!-- </xpath>-->
</field> <!-- </field>-->
</record> <!-- </record>-->
<record id="product_product_view_form_inherit_supplier_ean13" model="ir.ui.view"> <record id="product_product_view_form_inherit_supplier_ean13" model="ir.ui.view">
<field name="name">product.product.view.form.inherit.supplier.ean13</field> <field name="name">product.product.view.form.inherit.supplier.ean13</field>
<field name="model">product.product</field> <field name="model">product.product</field>

Write Preview
Loading…
Cancel
Save