diff --git a/vouchers_pos/__init__.py b/vouchers_pos/__init__.py index c7b5ac7e1..b97cbbc20 100644 --- a/vouchers_pos/__init__.py +++ b/vouchers_pos/__init__.py @@ -1,3 +1,23 @@ # -*- coding: utf-8 -*- +################################################################################### +# +# Cybrosys Technologies Pvt. Ltd. +# Copyright (C) 2017-TODAY Cybrosys Technologies(). +# Author:LINTO CT() + +# This program is free software: you can modify +# it under the terms of the GNU Affero General Public License (AGPL) as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +################################################################################### import models diff --git a/vouchers_pos/__manifest__.py b/vouchers_pos/__manifest__.py index 4dae8fe89..c90bb6f50 100644 --- a/vouchers_pos/__manifest__.py +++ b/vouchers_pos/__manifest__.py @@ -1,30 +1,29 @@ # -*- coding: utf-8 -*- -############################################################################## +################################################################################### # # Cybrosys Technologies Pvt. Ltd. # Copyright (C) 2017-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. -# -# It is forbidden to publish, distribute, sublicense, or sell copies -# of the Software or modified copies of the Software. +# Author:LINTO CT() + +# This program is free software: you can modify +# it under the terms of the GNU Affero General Public License (AGPL) as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # 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. +# GNU Affero General Public License 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 . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # -############################################################################## +################################################################################### { 'name': 'Coupons & Vouchers in Point of Sale', - 'version': '10.0.1.0', + 'version': '10.0.1.1', 'category': 'Point of Sale', - 'summary': 'Manage POS Vouchers & Coupon Codes', + 'summary': 'Manage Point of Sale Vouchers & Coupon Codes', 'author': 'Cybrosys Techno Solutions', 'website': "https://www.cybrosys.com", 'company': 'Cybrosys Techno Solutions', diff --git a/vouchers_pos/__manifest__.py~ b/vouchers_pos/__manifest__.py~ deleted file mode 100644 index 2d25d95b1..000000000 --- a/vouchers_pos/__manifest__.py~ +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Cybrosys Technologies Pvt. Ltd. -# Copyright (C) 2017-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. -# -# It is forbidden to publish, distribute, sublicense, or sell copies -# of the Software or modified copies of the Software. -# -# 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': 'Coupons & Vouchers in Point of Sale', - 'version': '10.0.1.0', - 'category': 'Point of Sale', - 'summary': 'Manage Point of Sale Vouchers & Coupon Codes', - 'author': 'Cybrosys Techno Solutions', - 'website': "https://www.cybrosys.com", - 'company': 'Cybrosys Techno Solutions', - 'depends': ['point_of_sale'], - 'data': [ - 'data/product_data.xml', - 'views/gift_voucher.xml', - 'views/applied_coupons.xml', - 'views/pos_template.xml', - 'security/ir.model.access.csv', - ], - 'qweb': [ - 'static/src/xml/*.xml'], - 'images': ['static/description/banner.jpg'], - 'license': 'AGPL-3', - 'installable': True, - 'application': False, - 'auto_install': False, -} diff --git a/vouchers_pos/doc/changelog.rst b/vouchers_pos/doc/changelog.rst new file mode 100644 index 000000000..7da36dbe6 --- /dev/null +++ b/vouchers_pos/doc/changelog.rst @@ -0,0 +1,7 @@ +Changelog +========= +* Linto CT + +`10.0.1.1` +---------- +- Discount issue fixed for total amount. diff --git a/vouchers_pos/models/__init__.py b/vouchers_pos/models/__init__.py index 913f90ebd..807702ecd 100644 --- a/vouchers_pos/models/__init__.py +++ b/vouchers_pos/models/__init__.py @@ -1,24 +1,23 @@ # -*- coding: utf-8 -*- -############################################################################## +################################################################################### # # Cybrosys Technologies Pvt. Ltd. # Copyright (C) 2017-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. -# -# It is forbidden to publish, distribute, sublicense, or sell copies -# of the Software or modified copies of the Software. +# Author:LINTO CT() + +# This program is free software: you can modify +# it under the terms of the GNU Affero General Public License (AGPL) as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # 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. +# GNU Affero General Public License 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 . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # -############################################################################## +################################################################################### import gift_voucher diff --git a/vouchers_pos/models/gift_voucher.py b/vouchers_pos/models/gift_voucher.py index cd5871d06..3b3eb6c0c 100644 --- a/vouchers_pos/models/gift_voucher.py +++ b/vouchers_pos/models/gift_voucher.py @@ -1,25 +1,24 @@ # -*- coding: utf-8 -*- -############################################################################## +################################################################################### # # Cybrosys Technologies Pvt. Ltd. # Copyright (C) 2017-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. -# -# It is forbidden to publish, distribute, sublicense, or sell copies -# of the Software or modified copies of the Software. +# Author:LINTO CT() + +# This program is free software: you can modify +# it under the terms of the GNU Affero General Public License (AGPL) as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # # 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. +# GNU Affero General Public License 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 . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # -############################################################################## +################################################################################### import string import random from odoo import models, fields, api, _ diff --git a/vouchers_pos/static/src/js/coupons.js b/vouchers_pos/static/src/js/coupons.js index 6964137f1..5067c031c 100644 --- a/vouchers_pos/static/src/js/coupons.js +++ b/vouchers_pos/static/src/js/coupons.js @@ -382,7 +382,7 @@ odoo.define("vouchers_pos.coupons", function (require) { get_total_without_tax: function() { var res = OrderSuper.prototype.get_total_without_tax.call(this); var final_res = round_pr(this.orderlines.reduce((function(sum, orderLine) { - return sum + (orderLine.get_unit_price() * orderLine.get_quantity()); + return sum + (orderLine.get_unit_price() * orderLine.get_quantity() * (1.0 - (orderLine.get_discount() / 100.0))); }), 0), this.pos.currency.rounding); return final_res; },