From 977e1dfe66c4c3b35a61d7fdfb88d522e814029c Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 11 Jul 2018 11:37:40 +0200 Subject: [PATCH] [IMP] product,...: Improve demo data * Update demo data sheet for barcode * Modify product "Book: Office Renovation for Dummies: - Name: "eBook: Office Renovation for Dummies" - Image: - Internal category: All/Services/Saleable * Tips internal reference * Product 10.0 % Discount = - Name : "10.0% discount on total amount" (no space between 0 and %) - Internal reference : 10PERCENTDISC * Free product - large cabinet - Should be a stockable - in category All/Saleable/Office Furniture - Name : Free Gift - Pencil Holder - Picture * Desk Customizable : - Change its website sequence (should be displayed first in the shop) * https://github.com/odoo/odoo/pull/25263 * Need to clean attributes and attribute values and attribute categories : - Attributes, keep : Brand, Color, Dimensions, Legs, Weight - Attribute Category : Rename Storage into "Material" * Events - Suppress Functional Webinar and Technical Training * PoS Categories : - Suppress - Create PoS Category : Desks (put desks in it) - Create PoS Category : Chairs (put chairs in it) - Create PoS Category : Miscellaneous (and put all other products in it) * Products available in PoS - Remove : Air Flight, Car Travel Expense, Bpost domestic bpack 24h pro, Bpost World Express Pro, Customer Care, DHL USA Delivery, DHL USA -> International, Deposit, Expenses, Fdex International, Fedexs US, Hotel Accomodation, Restaurant Expenses, * Product: https://drive.google.com/a/odoo.com/file/d/1KjxcB88aDfe8qAzIpFlkBmMj5ekA9eIf/view?usp=drivesdk Timesheet : description to update https://docs.google.com/spreadsheets/d/1nB8l8pFcRXRFnudgDJVyZZp3McaHNovlyvY0jE1ZZ54/edit?usp=sharing * Project : less projects, more tasks Remove "Internal - GAP Analysis", "Internal Projects" Rename Support into After-Sales Services Task to rename: Data import + Doc ==> Office planning Move the task Internal Training from "Support" to "Office Design" * AGR Project : add the following tasks and link it to the right SO line Decoration : SO Line ==> Senior Architect Planning : SO Line ==> Senior Architect Furniture SO Line ==> Senior Architect Furniture Delivery : not linked to an SO line * Marketing Automation Partnership offer ==> to rename into "Commercial prospection" Steps to rename: Offer free trial ==> Offer free catalog After 7 days (if not yet partners) ==> After 7 days (if not yet customers) Message for sale person ==> keep the same * Mass mailings: http://nimb.ws/zrKsZ9 http://nimb.ws/CbNpwd * Events: Suppress Functional Webinar and Technical Training Tracks to update : https://docs.google.com/spreadsheets/d/1sKkJrltXY3Gz7ue3mVysZxaWGybKpx5fIhgUBnhbNDs/edit?usp=sharing * Helpdesk Rename team into Customer Care Create 2 tickets in default team Urgent : Kitchen collapsing (assigned to admin) : link to the task SO053: [SERV_585189] Customer Care (Prepaid Hours) No pririoty : Where can I download a catalog ? (not assigned). Ticket type = question --- data/sale_coupon_demo.xml | 26 ++++++++++++++++++++++++++ models/sale_coupon_reward.py | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/data/sale_coupon_demo.xml b/data/sale_coupon_demo.xml index 9a874fa3886..384e1c9ba66 100644 --- a/data/sale_coupon_demo.xml +++ b/data/sale_coupon_demo.xml @@ -1,6 +1,18 @@ + + 10.0% discount on total amount + service + + + + + order + 10PERCENTDISC + + + Code for 10% on orders code_needed @@ -9,6 +21,19 @@ percentage 10.0 promotion_program + + + + + Free Product - Large Cabinet + service + + + + + order + FREELARGECABINET + @@ -20,6 +45,7 @@ 3 [["name","ilike","large cabinet"]] + diff --git a/models/sale_coupon_reward.py b/models/sale_coupon_reward.py index 704a2b5af8b..4ac5b5b82c6 100644 --- a/models/sale_coupon_reward.py +++ b/models/sale_coupon_reward.py @@ -65,11 +65,11 @@ class SaleCouponReward(models.Model): if reward.discount_type == 'percentage': reward_percentage = str(reward.discount_percentage) if reward.discount_apply_on == 'on_order': - reward_string = _("%s %% discount on total amount" % (reward_percentage)) + reward_string = _("%s%% discount on total amount" % (reward_percentage)) elif reward.discount_apply_on == 'specific_product': - reward_string = _("%s %% discount on %s" % (reward_percentage, reward.discount_specific_product_id.name)) + reward_string = _("%s%% discount on %s" % (reward_percentage, reward.discount_specific_product_id.name)) elif reward.discount_apply_on == 'cheapest_product': - reward_string = _("%s %% discount on cheapest product" % (reward_percentage)) + reward_string = _("%s%% discount on cheapest product" % (reward_percentage)) elif reward.discount_type == 'fixed_amount': program = self.env['sale.coupon.program'].search([('reward_id', '=', reward.id)]) reward_string = _("%s %s discount on total amount" % (str(reward.discount_fixed_amount), program.currency_id.name))