diff --git a/product_multi_uom_pos/README.rst b/product_multi_uom_pos/README.rst new file mode 100644 index 000000000..4bac301b5 --- /dev/null +++ b/product_multi_uom_pos/README.rst @@ -0,0 +1,41 @@ +======================== +POS Product Multiple UOM +======================== + +Added option to update the uom of products in pos. + +Installation +============ + +Just select it from available modules to install it, there is no need to extra installations. + +Usage +===== + +After installation, go to Inventory -> Settings + and enable the multiple uom option under the 'Products' section. + +Known issues / Roadmap +====================== + +* ... + +Bug Tracker +=========== + +Contact odoo@cybrosys.com + +Contributors +------------ + +* Version 10: Linto CT +* Version 10: Shereef PT +* Version 12: Mehjabin Farsana +* Version 13: Mehjabin Farsana + +Maintainer +---------- + +This module is maintained by Cybrosys Technologies. + +For support and more information, please visit https://www.cybrosys.com. diff --git a/product_multi_uom_pos/__init__.py b/product_multi_uom_pos/__init__.py new file mode 100644 index 000000000..4ad5a4d6d --- /dev/null +++ b/product_multi_uom_pos/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2018-TODAY Cybrosys Technologies(). +# Author: LINTO C T() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (LGPL v3) along with this program. +# If not, see . +# +############################################################################## + +from . import models diff --git a/product_multi_uom_pos/__manifest__.py b/product_multi_uom_pos/__manifest__.py new file mode 100644 index 000000000..9d6806cf0 --- /dev/null +++ b/product_multi_uom_pos/__manifest__.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- + +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2018-TODAY Cybrosys Technologies(). +# Author: LINTO C T() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (LGPL v3) along with this program. +# If not, see . +# +############################################################################## +{ + 'name': 'POS Product Multiple UOM', + 'version': '13.0.1.0.0', + 'category': 'Point of Sale', + 'summary': 'Multiple UOM for Products', + 'author': 'Cybrosys Techno Solutions', + 'company': 'Cybrosys Techno Solutions', + 'maintainer': 'Cybrosys Techno Solutions', + 'website': 'https://www.cybrosys.com', + 'depends': ['point_of_sale', 'stock'], + 'data': [ + 'views/pos_template.xml', + 'views/pos_view_extended.xml', + ], + 'demo': [], + 'qweb': ['static/src/xml/pos.xml'], + 'images': ['static/description/banner.png', + 'static/description/icon.png'], + 'license': 'LGPL-3', + 'installable': True, + 'application': False, + 'auto_install': False, +} diff --git a/product_multi_uom_pos/doc/RELEASE_NOTES.md b/product_multi_uom_pos/doc/RELEASE_NOTES.md new file mode 100644 index 000000000..d975661b7 --- /dev/null +++ b/product_multi_uom_pos/doc/RELEASE_NOTES.md @@ -0,0 +1,10 @@ +## Module + +#### 15.02.2020 +#### Version 13.0.1.0.0 +#### Migration +Migration Of POS Product Multiple UOM + + + + diff --git a/product_multi_uom_pos/models/__init__.py b/product_multi_uom_pos/models/__init__.py new file mode 100644 index 000000000..822abbf55 --- /dev/null +++ b/product_multi_uom_pos/models/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2018-TODAY Cybrosys Technologies(). +# Author: LINTO C T() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (LGPL v3) along with this program. +# If not, see . +# +############################################################################## + +from . import pos_orderline diff --git a/product_multi_uom_pos/models/pos_orderline.py b/product_multi_uom_pos/models/pos_orderline.py new file mode 100644 index 000000000..108d3e0f3 --- /dev/null +++ b/product_multi_uom_pos/models/pos_orderline.py @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- + +############################################################################## +# +# Cybrosys Technologies Pvt. Ltd. +# +# Copyright (C) 2018-TODAY Cybrosys Technologies(). +# Author: LINTO C T() +# you can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details. +# +# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE +# GENERAL PUBLIC LICENSE (LGPL v3) along with this program. +# If not, see . +# +############################################################################## + +from odoo import _ +from odoo.tools import float_is_zero +from odoo import models, fields, api + + +class PosOrderLinesExtended(models.Model): + _inherit = 'pos.order.line' + + uom_id = fields.Many2one('uom.uom', string="UOM") + + @api.model + def create(self, values): + """updating uom to orderlines""" + try: + if values.get('uom_id'): + values['uom_id'] = values['uom_id'][0] + except Exception: + values['uom_id'] = None + pass + res = super(PosOrderLinesExtended, self).create(values) + return res + + +class PosOrderExtended(models.Model): + _inherit = 'pos.order' + + # overwriting this function because, we need to set the uom id based on the unit + # in the orderline instead of product uom, at the time of creating the stock moves + def create_picking(self): + """Create a picking for each order and validate it.""" + Picking = self.env['stock.picking'] + Move = self.env['stock.move'] + StockWarehouse = self.env['stock.warehouse'] + for order in self: + if not order.lines.filtered(lambda l: l.product_id.type in ['product', 'consu']): + continue + address = order.partner_id.address_get(['delivery']) or {} + picking_type = order.picking_type_id + return_pick_type = order.picking_type_id.return_picking_type_id or order.picking_type_id + order_picking = Picking + return_picking = Picking + moves = Move + source_loc = picking_type.default_location_src_id + location_id = order.location_id.id + if order.partner_id: + destination_id = order.partner_id.property_stock_customer.id + else: + if (not picking_type) or (not picking_type.default_location_dest_id): + customerloc, supplierloc = StockWarehouse._get_partner_locations() + destination_id = customerloc.id + else: + destination_id = picking_type.default_location_dest_id.id + + if picking_type: + message = _("This transfer has been created from the point of sale session: %s") % (order.id, order.name) + picking_vals = { + 'origin': order.name, + 'partner_id': address.get('delivery', False), + 'date_done': order.date_order, + 'picking_type_id': picking_type.id, + 'company_id': order.company_id.id, + 'move_type': 'direct', + 'note': order.note or "", + 'location_id': source_loc.id, + 'location_dest_id': destination_id, + } + pos_qty = any([x.qty > 0 for x in order.lines if x.product_id.type in ['product', 'consu']]) + if pos_qty: + order_picking = Picking.create(picking_vals.copy()) + order_picking.message_post(body=message) + neg_qty = any([x.qty < 0 for x in order.lines if x.product_id.type in ['product', 'consu']]) + if neg_qty: + return_vals = picking_vals.copy() + return_vals.update({ + 'location_id': source_loc.id, + 'location_dest_id': return_pick_type != picking_type and return_pick_type.default_location_dest_id.id or source_loc.id, + 'picking_type_id': return_pick_type.id + }) + return_picking = Picking.create(return_vals) + return_picking.message_post(body=message) + + for line in order.lines.filtered(lambda l: l.product_id.type in ['product', 'consu'] and not float_is_zero(l.qty, precision_rounding=l.product_id.uom_id.rounding)): + moves |= Move.create({ + 'name': line.name, + 'product_uom': line.uom_id.id if line.uom_id.id else line.product_id.uom_id.id, + 'picking_id': order_picking.id if line.qty >= 0 else return_picking.id, + 'picking_type_id': picking_type.id if line.qty >= 0 else return_pick_type.id, + 'product_id': line.product_id.id, + 'product_uom_qty': abs(line.qty), + 'state': 'draft', + 'location_id': source_loc.id if line.qty >= 0 else destination_id, + 'location_dest_id': destination_id if line.qty >= 0 else return_pick_type != picking_type and return_pick_type.default_location_dest_id.id or source_loc.id, + }) + # prefer associating the regular order picking, not the return + order.write({'picking_id': order_picking.id or return_picking.id}) + + if return_picking: + order._force_picking_done(return_picking) + if order_picking: + order._force_picking_done(order_picking) + + # when the pos.config has no picking_type_id set only the moves will be created + if moves and not return_picking and not order_picking: + tracked_moves = moves.filtered(lambda move: move.product_id.tracking != 'none') + untracked_moves = moves - tracked_moves + tracked_moves.action_confirm() + untracked_moves.action_assign() + moves.filtered(lambda m: m.state in ['confirmed', 'waiting']).force_assign() + moves.filtered(lambda m: m.product_id.tracking == 'none').action_done() + + return True diff --git a/product_multi_uom_pos/static/description/banner.png b/product_multi_uom_pos/static/description/banner.png new file mode 100644 index 000000000..4b2b1a7ed Binary files /dev/null and b/product_multi_uom_pos/static/description/banner.png differ diff --git a/product_multi_uom_pos/static/description/icon.png b/product_multi_uom_pos/static/description/icon.png new file mode 100644 index 000000000..5f25db64d Binary files /dev/null and b/product_multi_uom_pos/static/description/icon.png differ diff --git a/product_multi_uom_pos/static/description/images/available_uoms.png b/product_multi_uom_pos/static/description/images/available_uoms.png new file mode 100644 index 000000000..617560b2e Binary files /dev/null and b/product_multi_uom_pos/static/description/images/available_uoms.png differ diff --git a/product_multi_uom_pos/static/description/images/banner_discount_limit.png b/product_multi_uom_pos/static/description/images/banner_discount_limit.png new file mode 100644 index 000000000..d627a9134 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/banner_discount_limit.png differ diff --git a/product_multi_uom_pos/static/description/images/banner_orderline_images.png b/product_multi_uom_pos/static/description/images/banner_orderline_images.png new file mode 100644 index 000000000..3ba237b48 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/banner_orderline_images.png differ diff --git a/product_multi_uom_pos/static/description/images/banner_product_creation.png b/product_multi_uom_pos/static/description/images/banner_product_creation.png new file mode 100644 index 000000000..9f62d36ce Binary files /dev/null and b/product_multi_uom_pos/static/description/images/banner_product_creation.png differ diff --git a/product_multi_uom_pos/static/description/images/banner_product_return.png b/product_multi_uom_pos/static/description/images/banner_product_return.png new file mode 100644 index 000000000..026b47e1e Binary files /dev/null and b/product_multi_uom_pos/static/description/images/banner_product_return.png differ diff --git a/product_multi_uom_pos/static/description/images/banner_traceability.jpg b/product_multi_uom_pos/static/description/images/banner_traceability.jpg new file mode 100644 index 000000000..31659f185 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/banner_traceability.jpg differ diff --git a/product_multi_uom_pos/static/description/images/banner_vouchers_pos.png b/product_multi_uom_pos/static/description/images/banner_vouchers_pos.png new file mode 100644 index 000000000..cf274c0bb Binary files /dev/null and b/product_multi_uom_pos/static/description/images/banner_vouchers_pos.png differ diff --git a/product_multi_uom_pos/static/description/images/checked.png b/product_multi_uom_pos/static/description/images/checked.png new file mode 100644 index 000000000..578cedb80 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/checked.png differ diff --git a/product_multi_uom_pos/static/description/images/cybrosys.png b/product_multi_uom_pos/static/description/images/cybrosys.png new file mode 100644 index 000000000..bb309114c Binary files /dev/null and b/product_multi_uom_pos/static/description/images/cybrosys.png differ diff --git a/product_multi_uom_pos/static/description/images/modify_uom.png b/product_multi_uom_pos/static/description/images/modify_uom.png new file mode 100644 index 000000000..603964e6c Binary files /dev/null and b/product_multi_uom_pos/static/description/images/modify_uom.png differ diff --git a/product_multi_uom_pos/static/description/images/orderline.png b/product_multi_uom_pos/static/description/images/orderline.png new file mode 100644 index 000000000..f68f672d4 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/orderline.png differ diff --git a/product_multi_uom_pos/static/description/images/product_uom.png b/product_multi_uom_pos/static/description/images/product_uom.png new file mode 100644 index 000000000..0b633509b Binary files /dev/null and b/product_multi_uom_pos/static/description/images/product_uom.png differ diff --git a/product_multi_uom_pos/static/description/images/task_timer_youtube.png b/product_multi_uom_pos/static/description/images/task_timer_youtube.png new file mode 100644 index 000000000..fb6579727 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/task_timer_youtube.png differ diff --git a/product_multi_uom_pos/static/description/images/uom_updated.png b/product_multi_uom_pos/static/description/images/uom_updated.png new file mode 100644 index 000000000..3f438b853 Binary files /dev/null and b/product_multi_uom_pos/static/description/images/uom_updated.png differ diff --git a/product_multi_uom_pos/static/description/index.html b/product_multi_uom_pos/static/description/index.html new file mode 100644 index 000000000..1a41c20b3 --- /dev/null +++ b/product_multi_uom_pos/static/description/index.html @@ -0,0 +1,304 @@ +
cybrosys-logo
+
+
+
+

POS Product Multiple UOM

+

Update Product Unit Of Measure

+
+

Key Highlights

+
    +
  • checkMultiple UOM for products in POS.
    • +
  • checkSelect Unit of measure popup.
    • +
  • checkUpdated UOM to order lines.
    • +
+
+
+
+
+
+
+
+ +
+
+ +

Overview

+
+

+ By default, Odoo does not provide the option to update the unit of measure of the products we selected in the Point of Sale. The Products can only be sold in its default unit. This module provides an option to update the UOM of the products in the Point of Sale. The stock will also be updated in the new UOM. +

+
+
+ +

POS Product Multiple UOM

+
+
    +
  • + checkMultiple UOM for products in POS. +
    • +
  • + checkSelect Unit of measure popup. +
    • +
  • + checkUpdated uom to orderlines. +
    • +
+
+ +
+
+

Screenshots

+
+
+
+
+
+
+
+

checkModify Unit of Measure Button in POS.

+
+
+
+ +
+
+

check This button will open a wizard which will show all the UOMs associated with the selected product.

+
+
+
+ +
+
+

check UOMs available for this product can be selected and updated.

+
+
+
+ +
+
+

check Updated Unit of Measure in POS Orderlines.

+
+
+
+
+ +
+
+
+
+
+
+ + +
+
    +
+
+
+
+
+
+
+

Suggested Products

+
+ +
+
+

Our Service

+
+
+ +
+ +

Odoo Customization

+
+
+ +

Odoo Implementation

+
+
+ +

Odoo Integration

+
+
+ +

Odoo Support

+
+
+ +

Hire Odoo Developers

+ +
+ +
+
+
+
+

Our Industries

+
+ +
+
+
+ +
+
+

Trading

+

Easily procure and sell your products.

+
+
+
+
+ +
+
+

Manufacturing

+

Plan, track and schedule your operations.

+
+
+
+
+ +
+
+

Restaurant

+

Run your bar or restaurant methodical.

+
+
+
+
+ +
+
+

POS

+

Easy configuring and convivial selling.

+
+
+
+
+ +
+
+

E-commerce & Website

+

Mobile friendly, awe-inspiring product pages.

+
+
+
+
+ +
+
+

Hotel Management

+

An all-inclusive hotel management application.

+
+
+
+
+ +
+
+

Education

+

A Collaborative platform for educational management.

+
+
+
+
+ +
+
+

Service Management

+

Keep track of services and invoice accordingly.

+
+
+
+
+
+ +
+
+
+

Need Any Help?

+
+

If you have anything to share with us based on your use of this module, please let us know. We are ready to offer our support.

+
+

Email us

+

odoo@cybrosys.com / info@cybrosys.com

+
+
+

Contact Us

+ www.cybrosys.com +
+
+
+
+
+
+
+
+
+ +
+ + + + + + + +
+
+
+ \ No newline at end of file diff --git a/product_multi_uom_pos/static/src/css/style.css b/product_multi_uom_pos/static/src/css/style.css new file mode 100644 index 000000000..4debf796f --- /dev/null +++ b/product_multi_uom_pos/static/src/css/style.css @@ -0,0 +1,22 @@ +.button-multi-uom{ + width: 100%; + height: 32px; + font-size: 16px; + text-align: center; + border-radius: 5px; +} +.multi-uom-span { + width: 50%; + border: 1px solid; + /* vertical-align: middle; */ + align-self: center; + padding: 5px 10px; + background-color: #6EC89B; + color: #fff; + LINE-HEIGHT: 2.5; + transition: all 150ms linear; +} + +.popup-product-creation{ + height: 50% !important; +} \ No newline at end of file diff --git a/product_multi_uom_pos/static/src/js/multi_uom.js b/product_multi_uom_pos/static/src/js/multi_uom.js new file mode 100644 index 000000000..ab8c4cf47 --- /dev/null +++ b/product_multi_uom_pos/static/src/js/multi_uom.js @@ -0,0 +1,267 @@ +odoo.define('product_multi_uom_pos.multi_uom',function(require) { +"use strict"; + +var gui = require('point_of_sale.gui'); +var PosBaseWidget = require('point_of_sale.BaseWidget'); +var core = require('web.core'); +var models = require('point_of_sale.models'); +var OrderlineSuper = models.Orderline; +var pos_screens = require('point_of_sale.screens'); +var field_utils = require('web.field_utils'); + +var utils = require('web.utils'); + +var round_pr = utils.round_precision; + +var MultiUomWidget = PosBaseWidget.extend({ + template: 'MultiUomWidget', + init: function(parent, args) { + this._super(parent, args); + this.options = {}; + this.uom_list = []; + }, + events: { + 'click .button.cancel': 'click_cancel', + 'click .button.confirm': 'click_confirm', + }, + /*function returns all the uom s in the specified category*/ + get_units_by_category: function(uom_list, categ_id){ + var uom_by_categ = [] + for (var uom in uom_list){ + if(uom_list[uom].category_id[0] == categ_id[0]){ + uom_by_categ.push(uom_list[uom]); + } + } + return uom_by_categ; + }, + /*Find the base price(price of the product for reference unit)*/ + find_reference_unit_price: function(product, product_uom){ + if(product_uom.uom_type == 'reference'){ + return product.lst_price; + } + else if(product_uom.uom_type == 'smaller'){ + return (product.lst_price * product_uom.factor); + } + else if(product_uom.uom_type == 'bigger'){ + return (product.lst_price / product_uom.factor_inv); + } + }, + /*finds the latest price for the product based on the new uom selected*/ + get_latest_price: function(uom, product){ + var uom_by_category = this.get_units_by_category(this.pos.units_by_id, uom.category_id); + var product_uom = this.pos.units_by_id[product.uom_id[0]]; + var ref_price = this.find_reference_unit_price(product, product_uom); + var ref_price = product.lst_price; + var ref_unit = null; + for (var i in uom_by_category){ + if(uom_by_category[i].uom_type == 'reference'){ + ref_unit = uom_by_category[i]; + break; + } + } + if(ref_unit){ + if(uom.uom_type == 'bigger'){ + console.log("bigggg"); + console.log("ref_price * uom.factor_inv",ref_price * uom.factor_inv); + + return (ref_price * uom.factor_inv); + } + else if(uom.uom_type == 'smaller'){ + console.log("smalll"); + console.log("small",(ref_price / uom.factor_inv)); + + return (ref_price / uom.factor); + } + else if(uom.uom_type == 'reference'){ + console.log("refernce"); + console.log("ref_price",ref_price); + return ref_price; + } + } + return product.lst_price; + }, + /*Rendering the wizard*/ + show: function(options){ + options = options || {}; + var current_uom = this.pos.units_by_id[options.uom_list[0]]; + var uom_list = this.pos.units_by_id; + var uom_by_category = this.get_units_by_category(uom_list, current_uom.category_id); + this.uom_list = uom_by_category; + this.current_uom = options.uom_list[0]; + this.renderElement(); + }, + close: function(){ + if (this.pos.barcode_reader) { + this.pos.barcode_reader.restore_callbacks(); + } + }, + click_confirm: function(){ + var self = this; + var uom = parseInt(this.$('.uom').val()); + var order = self.pos.get_order(); + var orderline = order.get_selected_orderline(); + var selected_uom = this.pos.units_by_id[uom]; + orderline.uom_id = []; + orderline.uom_id[0] = uom; + orderline.uom_id[1] = selected_uom.display_name; + + /*Updating the orderlines*/ + order.remove_orderline(orderline); + order.add_orderline(orderline); + var latest_price = this.get_latest_price(selected_uom, orderline.product); + order.get_selected_orderline().set_unit_price(latest_price); + orderline.lst_price = latest_price; + + this.gui.close_popup(); + return; + + }, + click_cancel: function(){ + this.gui.close_popup(); + }, +}); +gui.define_popup({name:'multi_uom_screen', widget: MultiUomWidget}); + + + +pos_screens.OrderWidget.include({ + set_value: function(val) { + this._super(); + var order = this.pos.get_order(); + var orderline = order.get_selected_orderline(); + var uom = orderline.uom_id[0]; + var lst_uom = this.pos.units_by_id[uom]; + if (order.get_selected_orderline()) { + + + var orderline = order.get_selected_orderline(); + var latestprice = orderline.lst_price; + var current_pricelist = this.pos.default_pricelist; + orderline.set_unit_price(latestprice); + var mode = this.numpad_state.get('mode'); + if( mode === 'quantity'){ + var selected_orderline = order.get_selected_orderline(); + selected_orderline.set_unit_price(latestprice); + order.get_selected_orderline().set_quantity(val); + }else if( mode === 'discount'){ + order.get_selected_orderline().set_discount(val); + }else if( mode === 'price'){ + var selected_orderline = order.get_selected_orderline(); + selected_orderline.price_manually_set = true; + selected_orderline.set_unit_price(val); + } + if (this.pos.config.iface_customer_facing_display) { + this.pos.send_current_order_to_customer_facing_display(); + } + } + }, + }); + + + + +models.Orderline = models.Orderline.extend({ + /*Adding uom_id to orderline*/ + initialize: function(attr,options){ + OrderlineSuper.prototype.initialize.call(this, attr, options); + this.uom_id = this ? this.product.uom_id: []; + }, + export_as_JSON: function() { + var result = OrderlineSuper.prototype.export_as_JSON.call(this); + console.log("result",result); + result.uom_id = this.uom_id; + return result; + }, + /*this function now will return the uom_id of the orderline , + instead of the default uom_id of the product*/ + get_unit: function(){ + var res = OrderlineSuper.prototype.get_unit.call(this); + + + var unit_id = this.uom_id; + + if(!unit_id){ + return res; + } + unit_id = unit_id[0]; + if(!this.pos){ + return undefined; + } + return this.pos.units_by_id[unit_id]; + }, + + set_quantity: function(quantity, keep_price) { + OrderlineSuper.prototype.set_quantity.call(this, quantity, keep_price); + this.order.assert_editable(); + if(quantity === 'remove'){ + this.order.remove_orderline(this); + return; + }else{ + var quant = parseFloat(quantity) || 0; + var unit = this.get_unit(); + if(unit){ + if (unit.rounding) { + var decimals = this.pos.dp['Product Unit of Measure']; + var rounding = Math.max(unit.rounding, Math.pow(10, -decimals)); + this.quantity = round_pr(quant, rounding); + this.quantityStr = field_utils.format.float(this.quantity, {digits: [69, decimals]}); + } else { + this.quantity = round_pr(quant, 1); + this.quantityStr = this.quantity.toFixed(0); + } + }else{ + this.quantity = quant; + this.quantityStr = '' + this.quantity; + } + } + // just like in sale.order changing the quantity will recompute the unit price + if(! keep_price && ! this.price_manually_set){ + var self = this; + var order = self.pos.get_order(); + var orderline = order.get_selected_orderline(); + if (orderline){ + var uom = orderline.uom_id[0]; + var lst_uom = this.pos.units_by_id[uom]; + var ref_qty = orderline.quantity; + var ref_price = orderline.product.lst_price; + if (lst_uom.uom_type == 'bigger') { + this.set_unit_price(ref_price * lst_uom.factor_inv); + this.order.fix_tax_included_price(this); + } + else if (lst_uom.uom_type == 'smaller') { + this.set_unit_price(ref_price / lst_uom.factor); + this.order.fix_tax_included_price(this); + } + else { + this.set_unit_price(ref_price); + this.order.fix_tax_included_price(this); + } + + } + else{ + this.set_unit_price(this.product.get_price(this.order.pricelist, this.get_quantity())); + this.order.fix_tax_included_price(this); + } + + } + this.trigger('change', this); + }, + +}); + +pos_screens.ActionpadWidget.include({ + /*opening the wizard on button click*/ + renderElement: function() { + this._super(); + var self = this; + this.$('.multi-uom-span').click(function(){ + var orderline = self.pos.get_order().get_selected_orderline(); + var options = { + 'uom_list': orderline.product.uom_id + }; + self.gui.show_popup('multi_uom_screen', options); + }); + } +}); + +}); \ No newline at end of file diff --git a/product_multi_uom_pos/static/src/xml/pos.xml b/product_multi_uom_pos/static/src/xml/pos.xml new file mode 100644 index 000000000..82c64b12f --- /dev/null +++ b/product_multi_uom_pos/static/src/xml/pos.xml @@ -0,0 +1,39 @@ + + + + +
+ + Modify Unit of Measure + +
+ + + + +
+
+

Select Unit of Measure

+
+ +
+
+
+ Ok +
+
+ Cancel +
+
+
+
+ + + \ No newline at end of file diff --git a/product_multi_uom_pos/views/pos_template.xml b/product_multi_uom_pos/views/pos_template.xml new file mode 100644 index 000000000..55ffc975d --- /dev/null +++ b/product_multi_uom_pos/views/pos_template.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/product_multi_uom_pos/views/pos_view_extended.xml b/product_multi_uom_pos/views/pos_view_extended.xml new file mode 100644 index 000000000..8e7f90284 --- /dev/null +++ b/product_multi_uom_pos/views/pos_view_extended.xml @@ -0,0 +1,16 @@ + + + + + + UOM for Order-line + pos.order + + + + + + + + + \ No newline at end of file