diff --git a/hide_menu_user/__manifest__.py b/hide_menu_user/__manifest__.py index 05f1d9f78..67ab224ba 100644 --- a/hide_menu_user/__manifest__.py +++ b/hide_menu_user/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Hide Any Menu User Wise', - 'version': '14.0.1.0.0', + 'version': '14.0.1.0.1', 'summary': 'Hide Any Menu Item User Wise', 'description': 'Hide Any Menu Item User Wise, Hide Menu Items, Hide Menu', 'author': 'Cybrosys Techno Solutions', diff --git a/hide_menu_user/models/res_user.py b/hide_menu_user/models/res_user.py index f70fb4f46..a0347e276 100644 --- a/hide_menu_user/models/res_user.py +++ b/hide_menu_user/models/res_user.py @@ -22,16 +22,16 @@ from odoo import models, fields, api - class HideMenuUser(models.Model): _inherit = 'res.users' - @api.model - def create(self, vals): + @api.model_create_multi + def create(self, vals_list): """ Else the menu will be still hidden even after removing from the list """ - self.clear_caches() + for vals in vals_list: + self.clear_caches() return super(HideMenuUser, self).create(vals) def write(self, vals): @@ -43,6 +43,7 @@ class HideMenuUser(models.Model): menu.write({ 'restrict_user_ids': [(4, self.id)] }) + print(res,'resssssssssss') self.clear_caches() return res @@ -61,7 +62,6 @@ class HideMenuUser(models.Model): 'hidden to this user ') is_admin = fields.Boolean(compute=_get_is_admin) - class RestrictMenu(models.Model): _inherit = 'ir.ui.menu' diff --git a/pos_product_creation/controllers/main.py b/pos_product_creation/controllers/main.py index 075ebdf27..5b6492440 100644 --- a/pos_product_creation/controllers/main.py +++ b/pos_product_creation/controllers/main.py @@ -27,7 +27,8 @@ from odoo.http import request class PosProductCreation(http.Controller): @http.route('/create_product', type="json", auth="none") - def create_product(self, category, name, price, product_reference, unit_measure, product_categories, **kwargs): + def create_product(self, category, name, price, product_reference, + unit_measure, product_categories, barcode, **kwargs): product_category = '' if category == 'Consumable': product_category = 'consu' @@ -46,4 +47,5 @@ class PosProductCreation(http.Controller): 'uom_po_id': int(unit_measure), 'categ_id': int(product_categories), 'available_in_pos': True, + 'barcode': barcode, }) diff --git a/pos_product_creation/static/src/js/product_create_button.js b/pos_product_creation/static/src/js/product_create_button.js index 0f418270a..835596423 100644 --- a/pos_product_creation/static/src/js/product_create_button.js +++ b/pos_product_creation/static/src/js/product_create_button.js @@ -30,11 +30,7 @@ odoo.define('owl_tutorials.product_create_button', function(require) { var product_price = payload[3]; var unit_measure = payload[4]; var product_categories = payload[5]; - console.log(product_category, 'product_category') - console.log(product_name, 'product_name') - console.log(product_reference, 'product_reference') - console.log(product_price, 'product_price') - console.log(unit_measure, 'unit_measure') + var barcode = payload[6]; if (!product_name){ return this.showPopup('ErrorPopup', { title: _('A Unit Of Measure Is Required'), @@ -52,6 +48,7 @@ odoo.define('owl_tutorials.product_create_button', function(require) { 'product_reference': product_reference, 'unit_measure': unit_measure, 'product_categories': product_categories, + 'barcode': barcode, }).then(function(response) {}); } } diff --git a/pos_product_creation/static/src/js/product_create_popup.js b/pos_product_creation/static/src/js/product_create_popup.js index 2aa35a4d7..42e9e0131 100644 --- a/pos_product_creation/static/src/js/product_create_popup.js +++ b/pos_product_creation/static/src/js/product_create_popup.js @@ -11,7 +11,6 @@ odoo.define('pos_product_creation.product_create_popup', function(require) { class ProductCreatePopup extends AbstractAwaitablePopup { constructor() { super(...arguments); - console.log(this.env.pos, '<<<<<<<<<<<<<<<') this.state = useState({ typeValue: this.props.startingValue, productValue: this.props.startingValue, @@ -27,12 +26,14 @@ odoo.define('pos_product_creation.product_create_popup', function(require) { var price = this.state.priceValue; var unit = this.state.unitValue; var product_category = this.state.categoryValue; + var barcode = this.state.barcodeValue; selected_vals.push(category); selected_vals.push(product); selected_vals.push(product_reference); selected_vals.push(price); selected_vals.push(unit); selected_vals.push(product_category); + selected_vals.push(barcode); return selected_vals } } diff --git a/pos_product_creation/static/src/xml/product_create_popup.xml b/pos_product_creation/static/src/xml/product_create_popup.xml index 85d4c49f1..031f2f1bb 100644 --- a/pos_product_creation/static/src/xml/product_create_popup.xml +++ b/pos_product_creation/static/src/xml/product_create_popup.xml @@ -75,6 +75,15 @@ +
+
+
+ Barcode +
+
+ +
+