Commit Graph
79 Commits
Author SHA1 Message Date
Sagar Ahirrao 96fed80454 [IMP] sale_coupon: Allow to print and send coupons by email
Purpose
=======

A feature was not done when doing the coupon task because of the lack of time : Coupon should be printed from the system and same can be sent to customer via email(attractive email template).

Specification
=============

Ass the possibility to:

- Print coupon
- Send coupon by email with the printed report in attachment
- Generated coupon by sending to the customers the coupon in attachments
2017-12-01 13:04:30 +01:00
Christophe Simonis 8e3b2184f2 [MERGE] forward port branch 11.0 up to 119a73b2e90 2017-12-01 12:55:54 +01:00
Christophe Simonis 745bf6777e [MERGE] forward port branch saas-16 up to 88084f24d2f 2017-12-01 12:55:27 +01:00
Christophe Simonis caeb2265b7 [MERGE] forward port branch saas-15 up to bdf4ab4c807 2017-11-30 15:28:23 +01:00
Christophe Simonis 5ff5445401 [MERGE] forward port branch saas-14 up to 4dfae4c9500 2017-11-30 14:33:28 +01:00
Romain Derie b236ca3f15 [FIX] sale_coupon: incorrect free product qty
Note: The following bugs were also impacting the e-commerce.
This commit fixes some bugs related to promotion program offering free product:
  - Create a promotion program that offers an ipad if you buy 3 of them, so the
    fourth is free (reduced in total)

1. Buying 4, getting a free one, removing one, free one remains
  - Create a quotation with 3 ipad, save and update promotions, you don't have
     a free one, which is 'correct'
  - Edit, change the qty to 4 ipad, save, update promotions, you have a free
    ipad (reduced from total), still correct
  - Edit, change the qty back to 3 ipad, update ptomotions, you still have a
    free ipad even if you only bought 3 of them (the way it is designed, the
    free ipad should only appears when you order your fourth).

2. Exponential bug: buy a lot of ipad, get a lot of free ipad then set the qty
to a lower amount, you will have a lot more free ipad than you should.
It can even lead to a negative amount (more free ipad than you paid ipad, but
in that case you won't be able to confirm the sale).
  - Create a quotation with 100 ipad, you get 31 free ipad (which is incorrect,
    see bug 3)
  - Edit and change the qty back to 10 ipad and save
  - Update promotions, you will have 10 ipad to pay and 10 free ipad resulting
    in a null total.

3. Buy X ipad, get Y+Z free instead of Y (lets illustrate with 10)
  - Create a quotation with 10 ipad, you get 3 free ipad instead of 2
  - Indeed, your first 4 ipad should give you a free one
  - Your next 4 ipad should give you a second one (you got 8)
  - The last 2 (to reach 10) are not enough to give you a third free ipad

This is because free products are reward lines in the SO (is_reward_line) but
not linked to an applied_coupon_ids

Now, these reward lines will be considered as such and the coupon computing
will return correct results

This closes #1643
2017-11-29 16:23:56 +01:00
Christophe Simonis d6b08ca785 [MERGE] forward port branch 11.0 up to eaae14af2d2 2017-11-16 17:57:03 +01:00
Christophe Simonis 7ccd861698 [MERGE] forward port branch saas-16 up to b81f9d89876 2017-11-16 12:41:31 +01:00
Christophe Simonis 1b1dd22d1b [MERGE] forward port branch saas-15 up to e9575185a57 2017-11-15 17:56:16 +01:00
Christophe Simonis 7dc7dcee7a [MERGE] forward port branch saas-14 up to 198dac55ca2 2017-11-15 15:38:57 +01:00
Romain Derie 16531f6548 [FIX] (website_)sale_coupon: Display clearer promo code error on cart
Before this commit:
Coupon error on cart would always show "Invalid or Expired coupon code"
instead of a more accurate error (eg: already applied, can't use 2 code..).
Plus it would still show the error on page refresh because of the error being
stored in URL param.

Now:
It will show the exact error and since the error is not stored in URL, it won't
be still displayed on page refresh.

This closes #1601
2017-11-15 12:34:57 +01:00
Mitali Patel 0de0c9b682 [IMP] base: Make 'name' attribute required for 'filter' tag
Purpose
=======

The attribute name isn't required on the <filter> tag. If not set, it can't be selected with a xpath and it can't be overwritten.

A lot of PR are coming from the community just to add a name on a filter because:
- It can't be selected with a xpath.
- It can't be used with `default_search_foo` on an action context.

Specification
=============

Make the atttribute name required
2017-10-19 11:01:12 +02:00
Nicolas Lempereur 8aef2eb92d [FIX] sale_coupon: error only one of begin/end set
If a promotion program has a start date without a end date, or a end
date without a start date, there was an error of comparing string to
boolean

opw-775236
2017-10-04 19:12:40 +02:00
Yannick Tivisse 29a5de310e [FIX] sale_coupon: Remove old and buggy compute field (not stored)
Purpose
=======

Click on Generate Coupon gives traceback

Steps to reproduce issue :
>> install coupon.
>> total number of customers are more than 40.
>> debugger mode off.
>> now click on generate the coupon.

Specification
=============

Before the new char domain widget, we were forced to couple the domain Char field with a many2many computed field to display the partners.

Now it's not useful, and this is leading to a traceback if the records count is greater than 40.
2017-09-21 16:11:32 +02:00
Yannick Tivisse ce8b35ee1d [FIX] sale_coupon: Set a valid default value 2017-09-19 14:27:26 +02:00
Yannick Tivisse 1ebfbf3e86 [IMP] res_config: Update file names, xmlids, class names according to guidelines
Now that we only have one model (res.config.settings). Uniformize everything according to the guidelines.
2017-09-01 13:39:18 +02:00
Deep Patel 573dbfc17d [IMP] web,account,...: Regroup settings, add a nav and search bar
Purpose
=======

Settings are often way too long and hard to scan and sometimes you don't know where to find the settings you're looking for.
By adding a left navigation, you can already have an overview of the settings, and switch easily between them.

Specification
=============

- Add a search bar on all the apps that have settings which can search results from all the installed apps.
  (If i'm on sales settings,and I search anything then it shows results from sales settings and also shows
  all the other matching results from all the other apps such as, Inventory...etc) with app name.
- Able to activate feature from the current page results (no matter if the searched result is from another apps).
- Highlight searched word in results
- Delete the sheet, have a full white background
- Add left navigation bar on setting
- Left navigation bar fixed
- List displayed based on installed apps
- On right panel, by default display current app setting and change accordingly
- [Mobile] Left navigation bar displayed on top
- Add Breadcrumb on top of the page: have the name "Settings" + Save / discard CTA + Search
- Add General Settings on the nav bar
- remove "save this page..." notif in all settings
- Delete all recommanded apps section + all checkbox that install app should disappear:
        payroll: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrSkMzWVpuZ0ZoaFE/view?usp=drivesdk
        Events: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrYXlHMHd2NTM2blE/view?usp=drivesdk
        Manufacturing: Delete Repair - Quality Control - Maintenance - Product Lifecycle Management [LAP][ok]
        Timesheets: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrdFg5XzNydkd2TlU/view?usp=drivesdk
        project: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrraWo3NE04TktwcTQ/view?usp=drivesdk
        inventory: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrQkRaVUR5ekFQYTQ/view?usp=drivesdk
        recruitment: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrbDdqLWQweF80UkE/view?usp=drivesdk
        purchase: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrRlAyUDBnb0trQWs/view?usp=drivesdk
        email marketing: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrOUZONjhvX2k3Y2s/view?usp=drivesdk
        expenses: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrR0JpN1ZpQmtxU3M/view?usp=drivesdk
        attendances: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrralpjZ1VJclNpMWs/view?usp=drivesdk
- About duplicate settings:
        Docsaway: Delete from Sales + delete Default Print Provider
        Attributs & Variants: Delete from Purchases - Manufacturing
        Multi-currencies: delete from Sales
        Unit Of Measures: Delete from Purchase & Expenses
- Add a scroll bar on the left bar when there's too many apps
- Keep the navbar visible even when you search
- Move General Settings to the bottom of the list
- Update on Settings:
    - Accounting:
        - rename automatic rates
        - Anglo Saxon Account: Should be in technical feature
        - Place Accounting Reports section before Taxes section
    - CRM:
        - Phone Validation: Enforce international format becomes
        - Local Numbers: (2 radio buttons proposals) Add international prefix / No prefix
    - Fleet: typo " ... a new car if ..." + text is too long <br>
    - project: fix tooltip for colab pads
2017-09-01 13:39:18 +02:00
Christophe Simonis fd2b69b91e [MERGE] forward port branch saas-17 up to d5d92993c81 2017-08-24 15:20:44 +02:00
Olivier Dony 13ca39dd6d [FIX] P3: remove pycompat.{keys,items,values} helpers
Now that we're closer to switching to P3 for good, these helpers have
outlived their usefulness, and mostly add noise.

All remaining dict.iter*() or dict.view*() must be converted to the
normal keys(), values() or items() calls.

Whenever the result is likely to be used for more than the scope of a
loop, or when the dict needs to be modified during iteration, the calls
must be wrapped in a ``list()``, to protect the new P3 semantics.
Those cases are very exceptional.

Also removed some dead code or improved the API to remove unnecessary
conversions.
2017-08-18 18:48:17 +02:00
Xavier Morel 12492433e3 [FIX] P3: random token generation
.encode('hex') is not valid in Python 3, and it turns out the generation method was way overkill/messy.
2017-08-18 11:27:14 +02:00
Haresh Shyara cc5bb1450b [REF] crm,sale: Split the applications into 2 separate apps
Purpose
=======

You install CRM but you don't see CRM icon (except in English, as long as sales is not installed) -> confusing
The dashboard with salesteam is not obvious & not useful for simple users: what are those channel boxes about? why don't I see all my activities?, etc.

Specifications
==============

Split CRM & Sales + land in business views straight away

Default Entry Views
~~~~~~~~~~~~~~~~~~~

- New default view for CRM: Pipeline kanban
- New default view for Sales: Quotation list

Dashboards
~~~~~~~~~~

- Move sales teams dashboard to Reporting: Sales Channels.
- Remove the upper part of the sales team dashboard

Menuitems Structure
~~~~~~~~~~~~~~~~~~~

- CRM menu

Pipeline:
        - Leads (optional)
        - Pipeline (default menu, default filter "My Pipeline")
        - Next Activities -> to remove (now there is an icon in top bar for next activities)
        - Quotations (If sale_management installed)
Customers
Phone Calls (if voip, if not yet removed because there is a BE task to use next activities instead)
Leads Management:
        - Scoring Rules
        - Leads Assignation
        - Team Assignation
Reporting:
        - Leads
        - Scoring page views
        - Opp. Assignement
        - Patnerships
        - Pipeline
        - Activities
        - Phonecalls
        - Sales Channels
Configuration:
        - Settings
        - Sales Channels
        - Activity Types
        - Leads & Opportunities:
                - Lead Tags
                - Lost Reasons
        - Resellers
                - Partner Level
                - Partner Activations
- Sales menu:

Orders:
        - Quotations
        - Orders
        - Customers
Invoicing:
        - Orders to Invoice
        - Orders to Upsell
Catalog:
        - Products
        - Promotion Programs
        - Coupon Programs
Reporting:
        - Sales
        - Sales Channels
        - All channels sales orders
Configuration:
        - Settings
        - Sales Channels
        - Sales Orders:
                - Quotation templates
                - Payment acquirers
                - Delivery Methods

Settings
~~~~~~~~

- Split settings form
- Remove recommended apps section
- Remove Timesheets section
- Remove Inventory Management and move shipping connectors to Shipping section
- Remove Integrations section
        - Move Docsaway option to "Quotations & Orders", right after proforma
        - Autocomplete and asterix: move to CRM section
- Restructure and rename sections this way:
        - Product Catalog
        - Pricing
        - Quotations & Orders
        - Shipping
        - Invoicing
        - eBay (if installed)
- Remove all the "Save this page and come back here" when checking a box that installs a new module

- restructure a bit the CRM settings, with 3 sections:

Pipeline
        - Leads
Contacts
        - Phone Validation
        - Customer Autocomplete
Integrations
        - Google Calendar / Synchronize your calendar with Google Calendar (copy from general settings but don't show message "Save this page and come back here...".
        - Asterisk (VOIP)
2017-08-08 16:58:50 +02:00
Christophe Simonis eaefc5b7ba [MERGE] forward port branch saas-16 up to 15e36ad39dc 2017-07-20 16:29:40 +02:00
Pratima Gupta 6d342b79d0 [FIX] sale_coupon: Add default value to char domain field
Otherwise the required field is not validated at wizard validation
2017-07-17 12:54:57 +02:00
Christophe Simonis 4e39d9e1e7 [MERGE] forward port branch saas-16 up to 953ab630bfc 2017-07-07 13:20:31 +02:00
Christophe Simonis 4e897d727a [MERGE] forward port branch saas-15 up to f77ffa3fe5f 2017-07-05 11:40:53 +02:00
Christophe Simonis e9b3d1c623 [MERGE] forward port branch saas-14 up to 403b27428a4 2017-07-05 11:39:44 +02:00
Nicolas Martinelli bb5d999596 [FIX] sale_coupon: default invoicing policy
The default invoicing policy should always be by ordered quantity.
Otherwise, if the user changes the default invoicing policy to
"delivered quantity", coupon won't be applied to the invoice.

opw-749632
2017-06-30 14:17:44 +02:00
Christophe Simonis 786889511b [MERGE] forward port branch saas-16 up to 32396ec64e4 2017-06-27 14:23:37 +02:00
Christophe Simonis 4889fdb135 [MERGE] forward port branch saas-15 up to 6492adc3c4c 2017-06-27 13:45:01 +02:00
Christophe Simonis 4a1cf10843 [MERGE] forward port branch saas-14 up to 23d93a69581 2017-06-27 12:11:13 +02:00
Christophe Simonis a5bf3016bb [FIX] sale_coupon: remove useless @depends
Theses fields are now deprecated.
2017-06-21 17:32:22 +02:00
Yannick Tivisse 8f6ec58757 [FIX] sale_coupon: Don't update automatic rewards on the fly
Purpose
=======

Currently we are updating the coupon rewards on the fly when creating/modifying/deleting a sales order line.

To avoid multiple searches on res_partners and product to know whether the customer/product is valid on the sale coupon program, we store the applicable customers and products on the program according to the domain defined on it.

This brings 2 issues:
- The customers/products stored on the program are not updated (Was the original spec)
- The checks are numerous and maybe overkill for the given results

Specification
=============

- Don't recompute the reward lines on SO modifications. Add a button to compute the line by hand and make an automatic compute on the SO validation or on the page shop/payment.

- When recomputing the reward lines, make a search on the res_partners and products instead. Now that the action is not triggered so often we can afford to make a search.

- Don't use the fields rule_partners_domain and rule_products_domain. This should be removed in master.

- The field is_public_included is useless now. And we decided to make the coupon available for all the partners if they fit the domain on the program.
2017-06-21 15:55:27 +02:00
Yannick Tivisse 3ed9b783dc [FIX] sale_coupon: Prevent users to modify the reward line product
Purpose
=======

People doesn't understand that the reward line product is the product that will be used in the discount line, not the product the be rewarded

If they set another product before the program is created, the product they set will be renamed, which is wrong.

Specification
=============

- Don't display the field before it's set
- Make the field readonly on the program form view
2017-06-21 15:54:15 +02:00
Yannick Tivisse c32fb6e358 [FIX] sale_coupon: Display an explicit warning message if reward isn't encoded on SO 2017-06-21 15:54:15 +02:00
Yannick Tivisse 9eb48f8275 [FIX] sale_coupon: Display an explicit warning message if partner can't have the reward 2017-06-21 15:54:06 +02:00
Yannick Tivisse a8d084025d [FIX] sale_coupon: Allow coupon usage for non customers
Purpose
=======

On a sale coupon program, the allowed partners are the customers by default.

That way, users like the Administrator aren't allowed to use coupon on a fresh database

Specification
=============

Allow all the partners by default and the user restrict the partners as he wishes.

Before this commit:
Coupon Program: Only customers have access to rewards
Promotional Program: Only customers have access to reward and this can be retricted with a domain

After this commit:
Coupon Program: All partners have access to rewards
Promotional Program: All partners have access to reward and this can be retricted with a domain
2017-06-21 15:53:15 +02:00
Christophe Simonis c5b299aadd [MERGE] forward port branch saas-16 up to bba7db31386 2017-06-13 01:32:11 +02:00
Christophe Simonis 3832ad5582 [MERGE] forward port branch saas-15 up to 6d260dcf661 2017-06-12 19:53:45 +02:00
Christophe Simonis ae3a42963f [MERGE] forward port branch saas-14 up to b709816a511 2017-06-12 19:20:54 +02:00
Denis Ledoux be8d0cf716 [FIX] sale_coupon: unlink an empty set of order lines
This is possible that `unlink` is called without any record in self.
In the given case, this is because of
`self.env['sale.order.line'].search([('order_id', 'in', self.ids), ('is_delivery', '=', True)]).unlink()`
in the `undelivery_set` method of the module delivery.

`Unlink` on an empty set is supported, and it should therefore be the case here as well.
This is not because `self.order_id.no_code_promo_program_ids` expects a singleton
for the `self.order_id` part, and this is actually an empty set as `self` is an empty set.

Besides, it makes sense to loop on the lines passed to `self`,
as you could pass several lines, not all having the same
`product_id`, for the above line
`related_program = self.env['sale.coupon.program'].search([('discount_line_product_id', '=', self.product_id.id)])`

opw-746084
2017-06-07 17:25:12 +02:00
Yannick Tivisse 3856b7aa55 [FIX] sale_coupon: Correct xml_ids for 2 menuitems
The xml_ids of 2 parent menuitems have changed in community repo.
2017-05-19 12:34:19 +02:00
Kishan Gajjar 6aea627dce [IMP] various: Add kanban views for all menuitems used in mobile
Purpose
=======

Improve readability on mobile

Specification
=============

Activate Kanban view on those so it could be displayed by default on mobile instead of view list

List of impacted modules:

- crm_voip: kanban for phonecalls

- website_crm_score: kanban for scoring rules

- pos_loyalty: kanban for loyalty programs

- account_deferred_revenue : kanban for deferred revenues(reuse assets)

- account_deferred_revenue : kanban for deferred revenues(reuse asset types)

- quality: kanban for quality control points

- helpdesk: kanban for all tickets

- quality: kanban for quality alert stages

- mrp_plm : kanban for ECO stages

- print: kanban for print provider

- print: kanban for print orders

- sale_coupon: kanban for coupon program

- sale_coupon: kanban for promotion program(reuse Coupon Program)

- website_crm_score: kanban for Teams Assignation(Reuse the sale channels)

- quality: kanban for quality teams(reuse Quality Dashboard).

- mrp_plm : kanban for ECO Types(reuse PLM Dashboard)

- account_reports_followup: kanban for Follow up level
2017-05-11 11:41:53 +02:00
dbh 416a8c4905 [ADD] sale_management: Separate sales menu items from sale app
Purpose
=======

Don't display sales app icon in Odoo homepage when installing ecommerce (only website should be visible)
it's confusing to have sales icon  -> where do I manage my sales? In sales or in website? -> in website

Specfication
============

We need one new modules to add Sales menus to the homepage. Currently they come with "sale". So when installing "website_sale", we get them (because sale and account are dependencies of website_sale). We don't want that anymore. Along with that you need to replace modules in Apps menu:
sales menu items must be in the new sale_management module, no longer in sale

- create new app "sale_management"
- Currently 3 app icons when installing ecommerce (Sales, Invoicing, Website) -> too many icons, where to start? -> GOAL: Only 2 icons > Website, Invoicing
- new module to display Sales Icon (like account_accountant): "sale_management"
- move menu items to sale_management
- sale, sale_management: move app description, rewrite the manifest file
- sale, sale_management: move tour from sale > sale_management
- Changes in some dependency module "sale" > "sale_management" modules: event_sale, mrp_repair, pos_sale, report_intrastat, sale_crm, sale_expense, sale_stock, sale_timesheet, website_quote

Menu items to move 'sale' --> 'sale_management'
===============================================

Sales
	Quotations
        Sales Orders
Invoicing
	Orders to invoice
        Orders to Upsell
Catalog
	Products
        Product Variants
        Pricelists
Reporting
	sales
Configuration
	Settings
        Products -Attributes, Attribute Values, Internal Categories
2017-05-10 13:32:24 +02:00
xmo-odoo 1960ad2694 [FIX] list -> iterable builtins
Cf commit fffaf735f5

Closes #989
2017-05-10 09:41:05 +02:00
xmo-odoo c3ad67cef2 [FIX] implicitly relative imports 2017-04-28 09:07:28 +02:00
Fabrice Henrion 0c6cf23dc0 [FIX] sale_coupon: typo
Closes #860
2017-04-11 17:55:16 +02:00
Christophe Simonis 510f257067 [MERGE] forward port branch saas-14 up to 0cb17b4c531 2017-03-28 18:33:37 +02:00
Nicolas Martinelli 803c148769 [FIX] sale_coupon: incorrect view
This part of the view was supposed to be removed, only purpose was
debugging.

opw-725178
2017-03-22 13:07:09 +01:00
Christophe Simonis 3e4fb652dd [FIX] sale_coupon: really use a meaningful icon
Followup of b0d07503365c67a4ad02318c362864eeb7e02f16 and #851
2017-03-21 15:35:44 +01:00
Fabrice Henrion fcddfbac0e [IMP] sale_coupon: use meaningful icon
XING is a brand

Closes #851
2017-03-16 13:45:42 +01:00