diff --git a/sale_promotion/__manifest__.py b/sale_promotion/__manifest__.py index 65dd56b26..dd971d00d 100644 --- a/sale_promotion/__manifest__.py +++ b/sale_promotion/__manifest__.py @@ -4,13 +4,13 @@ # Cybrosys Technologies Pvt. Ltd. # Copyright (C) 2018-TODAY Cybrosys Technologies(). # Author: Anusha P P() -# you can modify it under the terms of the GNU LESSER -# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# you can modify it under the terms of the GNU AFFERO +# GENERAL PUBLIC LICENSE (AGPL 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. +# GNU AFFERO GENERAL PUBLIC LICENSE (AGPL 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. @@ -20,7 +20,7 @@ { 'name': "Sale Promotion", - 'version': '12.0.1.0.0', + 'version': '12.0.1.0.1', 'summary': """Create Promotion Offers For Sales""", 'description': """This Module Allows to Set Promotion Offers On Products And Product Categories.""", 'author': "Cybrosys Techno Solutions", diff --git a/sale_promotion/doc/RELEASE_NOTES.md b/sale_promotion/doc/RELEASE_NOTES.md index c28935327..a68dcdc09 100755 --- a/sale_promotion/doc/RELEASE_NOTES.md +++ b/sale_promotion/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 12.0.1.0.0 ##### ADD - Initial commit + +#### 19.08.2019 +#### Version 12.0.1.0.1 +##### FIX +- Bug Fixed diff --git a/sale_promotion/models/sale_order.py b/sale_promotion/models/sale_order.py index 1b0866507..361c3cd87 100644 --- a/sale_promotion/models/sale_order.py +++ b/sale_promotion/models/sale_order.py @@ -18,6 +18,7 @@ ############################################################################# from dateutil import parser +from datetime import datetime from odoo import models, fields, api, _ from odoo.exceptions import UserError @@ -76,8 +77,8 @@ class SalePromotion(models.Model): product_rule_ids = [] for obj in self.sale_promotion_id: for promo_lines in obj.item_ids: - if not promo_lines.date_start or promo_lines.date_start <= date_order: - if not promo_lines.date_end or promo_lines.date_end >= date_order: + if not promo_lines.date_start or str(promo_lines.date_start) <= datetime.strftime(date_order,'%Y-%m-%d'): + if not promo_lines.date_end or str(promo_lines.date_end) >= datetime.strftime(date_order,'%Y-%m-%d'): if promo_lines.applied_on == 'product_category': categ_val = {'rule': promo_lines, 'category': promo_lines.categ_id.id, diff --git a/sale_promotion/static/description/index.html b/sale_promotion/static/description/index.html index ace4927db..37e4c3ffb 100644 --- a/sale_promotion/static/description/index.html +++ b/sale_promotion/static/description/index.html @@ -67,6 +67,14 @@
+

+ + You must tick the check box to get the product in the sales promotion window. + Also it helps to identify the promotional products. +

+
+ +

Select Offer In Sale Order

diff --git a/sale_promotion/static/description/sale_promotion_5.png b/sale_promotion/static/description/sale_promotion_5.png new file mode 100644 index 000000000..906db57ce Binary files /dev/null and b/sale_promotion/static/description/sale_promotion_5.png differ