Commit Graph
43 Commits
Author SHA1 Message Date
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
Christophe Simonis 8e039974f7 [MERGE] forward port branch saas-14 up to 2a56f2187dd 2017-03-01 16:54:58 +01:00
Yannick Tivisse 3c6b48c7b6 [FIX] sale_coupon_delivery: Do not unlink reward line if 'free_shipping'
The methods delivery_set and delivery_unset are called everywhere (mostly on the ecommerce). The reasons for that is that we do not want several shipping lines on the same order. A better way to achieve this would have been to create the line if it doesn't exist or write on it to modify the 'price_unit' instead.

The side effect of that behavior is:
- A delivery line is set on the order.
- We apply a coupon to get a free shipping
- We go on the payment page. The method _cart_update is called, which calls delivery_set, so delivery_unset. The shipping line is unlinked to create again a new shipping line with the price updated. As the shipping line is removed, a recomputation of the reward lines is made. The program isn't applicable anymore as there's no shipping line on the order. The reward is thus removed.

That way, it's impossible to have a free shipping reward on the ecommerce and achieve the full checkout process.

What's done in this commit:

If a free shipping is applicable by code or if a free shipping can be automatically applied. It will be done with a price of 0.0 if there's no shipping line or the price_unit on the shipping line if set. If the shipping line is removed (every 2 seconds on a checkout process), the reward line is not unlinked and the price is set to 0.0.

That way, it's now possible to make a full flow.

NB: If a line is unlinked on an order, we unlink the reward line if it's the last one set on the order. This is to avoid free shipping line coming back on a new order in the ecommerce even if not applicable.
2017-02-24 11:01:23 +01:00
Yannick Tivisse 7390b3246d [FIX] sale_coupon: Set taxes on reward line if free product 2017-02-24 11:01:23 +01:00
Christophe Simonis 566d60f686 [MERGE] forward port branch saas-14 up to cf1e7902f32 2017-02-09 16:11:24 +01:00
Sagar Ahirrao 1ed9194827 [IMP] sales: rearrange menuitems and specify some groups on them
Purpose
=======

It's hard to find all the menu items dedicated to products & pricing:
- create a product
- set up a discount
- change the pricing
such recurring actions are related to each other but you need to go to different menus: e.g. to edit pricelists you have to go to settings while editing your pricing is a business operation.

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

make one menu item like in ecommerce: CATALOG

Also clean reporting and configurion menus a bit...

Details
=======

Sales menu rearrangement :

Dashboard
Sales
Invoicing
    Orders to Invoice
    Orders to Upsell
Leads Management
Catalog (takes straight to products if no access to variant, pricelist or coupons)
    Products (move from Sales)
    Product Variants (move from Sales)
    Pricelists (move from Config)
    Promotion Programs (move from Config)
    Coupon Programs (move from Config)
Reporting (reorder items, from leads to sales)
    Leads
    Scoring Page Views
    Opp. Assignment Analysis
    Partnerships
    Pipeline
    Activities
    Phonecalls
    Sales
Configuration
    Settings
    Sales Channels (move up)
    Leads & Opportunities
    Sales
        Quotation Templates
        Report Layout Categories
        Payment Methods (if online quotation installed)
        Delivery Methods (move from Config > Delivery)
    Products
        Attributes
        Attribute Values
        Internal Categories (rename from Product Categories)
        Units of Measure
        Unit of Measure Categories
    Pricelists (remove)
    Delivery (remove)
2017-02-07 15:37:09 +01:00
Yannick Tivisse 74ebc34fea [FIX] sale_coupon: Trigger correctly the reward recomputation methods
Use Case
========

In the coupon module, a call to a write, a create or an unlink on a sales order line may trigger a write, a create or an unlink on another line. Example: I have a promotional offer "If you buy for more than 100 euros, you got a 10 percent discount on the sales order. On my sales order, I buy 2 imac at 999 euros. At that moment my total amount is over 1000 euros and I got another line, the discount. I write on the sales order line that I only buy one imac, a unlink is trigger on the reward line to remove it from the sales order.

Current Solution
================

At the beginning, I was overwriting the write, the create and the unlink methods on the sales order line to perform the correct actions according to the promotional offers that were still applicable, not applicable anymore of newly applicable. This solution was followed by side effects on the computed fields. For example, a write on the SO line that was triggering an unlink on another line was triggering a computed field that depended on the sales order line. In that case, the environment I received on the compute method was the environment before the line unlink. As the compute method was looping on the sales order line, it was taking values on a line that wasn't existing anymore and that way it was triggering an 'This record doesn't exist or has been deleted' error.

After a discussion with @rco-odoo, we realized that the only way to achieve this was to override the write method on a sales order to avoid quadratic computation loop when creating/editing/deleting sale order lines. As coupon are recorded as sale.order.line, it may effectively blow up.

We also overrode the create method on a sales order line to make an ORM command on the sales order instead of a simple create on the sales order. See: https://github.com/odoo/enterprise/blob/saas-14/sale_coupon/models/sale_order.py#L253

For the write and the unlink, this is a little more complicated because a write may trigger a write and an unlink may trigger an unlink, resulting in an infinite loop.

New Solution
============

Having a method _recompute_coupon_lines on sale.order. This method do nothing if there is a key coupon_recompute in the context.

```python
@multi
def _recompute_coupon_lines(self):
   if self.env.context.get('coupon_recompute'):
       return
   self = self.with_context(coupon_recompute=True)   # avoid loop
   [...do actual stuff...]
```

The create/write/unlink method on sale.order.line call super before calling the method _recompute_coupon_lines

```python
@multi
def write(self, values):
    result = super(SaleOrderLine, self).write(values)
    self.mapped('order_id')._recompute_coupon_lines()
    return result
```

In order (pun intended) to accelerate mass creation/edition of lines, the method create/write/unlink of sale.order should call recompute themself

```python
@mutli
def write(self, values):
    result = super(SaleOrder, self.with_context(coupon_recompute=True)).write(values)
    self._recompute_coupon_lines()
    return result
```
2017-02-02 10:47:51 +01:00
Yannick Tivisse 2af2f4f558 [FIX] sale_coupon: Allow the public users to use the coupon mechanism 2017-01-31 10:31:37 +01:00
Yannick Tivisse 76e691f0fe [FIX] sale_coupon: Apply immediate programs on order line creation 2017-01-30 15:45:38 +01:00
Yannick Tivisse a00ebcedcc [FIX] sale_coupon: Assign a generated coupon to the order customer 2017-01-30 14:38:03 +01:00
Yannick Tivisse 6dd52a01a2 [FIX] sale_coupon: Do not validate generated coupons on SO cancellation 2017-01-30 14:37:32 +01:00
Yannick Tivisse 9a9b2ba89a [FIX] sale_coupon: Fix 'Expected singleton' traceback 2017-01-30 14:37:32 +01:00
Yannick Tivisse 7d277ff950 [FIX] sale_coupon: Remove promo code on automatically applied programs 2017-01-30 14:37:32 +01:00
Yannick Tivisse 98e7f5f710 [FIX] sale_coupon: Compute correclty the reward product qty if several lines
Use case
========

If apply base on a product, it takes only the first line of this product !
Eg: 1 free if 3 buy,
- add 2 line of 2 will not work,
- add 1 line of 1 (eg: discounted, descr, ...) and one ligne with 10... will be ignored
2017-01-30 14:37:31 +01:00
Yannick Tivisse 4cd8b06d7e [FIX] sale_coupon: Display the reward product on program
In case we want to improve the product description
2017-01-30 14:37:31 +01:00
Yannick Tivisse 05f3babfb7 [FIX] sale_coupon: Resolve terminology issue to close a program 2017-01-30 14:37:31 +01:00
Yannick Tivisse 5947283e90 [FIX] sale_coupon: Set default discount value to 10.0 2017-01-30 14:37:31 +01:00
Yannick Tivisse 30c4e11ed8 [FIX] Resolve layout use 2017-01-30 14:37:31 +01:00
Yannick Tivisse 7ef998f103 [FIX] sale_coupon: Select only salable products on coupon programs 2017-01-30 14:37:31 +01:00
Yannick Tivisse 35332ac1e7 [FIX] sale_coupon: Select only customers on coupon programs 2017-01-30 14:37:31 +01:00
Yannick Tivisse 4682b9cd61 [FIX] sale_coupon: Hide debug information on SO form view 2017-01-26 13:23:59 +01:00
Yannick Tivisse d8a306aa71 [FIX] sale_coupon: Create immediate no code rewards on copy 2017-01-26 13:15:47 +01:00
Yannick Tivisse fc0c2368b5 [FIX] sale_coupon: Correct message generation in _check_coupon_code 2017-01-26 10:13:23 +01:00
Yannick Tivisse 049b44cefa [FIX] sale_coupon: Removed a field displayed twice on form view 2017-01-26 10:13:23 +01:00
Christophe Simonis 03a04005f1 [MERGE] forward port branch saas-14 up to bbb2f605094 2017-01-23 15:03:45 +01:00
Yannick Tivisse 034baaa82f [FIX] sale_coupon: Create a discount_line_product_id on program creation
When creating a program, we should always create a discount_line_product_id. Now on a product creation, if a product is not specified, the `vals` dictionary contains `discount_line_product_id: False` and the product is not created. It seems that the behavior on record creation has changed.
2017-01-17 09:46:49 +01:00
Yannick Tivisse 222de1eac2 [IMP] sale: improve sales config settings 2017-01-05 14:01:42 +01:00
qsm-odoo 77de506712 [IMP] sale_coupon, website_crm_score: adapt to new domain widget
Since commit https://github.com/odoo/odoo/commit/e3f99885ca789b338a4cb9ab9a154db50dff500d,
the FieldCharDomain was replaced by the FieldDomain and these form
definitions had to be adapted.
2017-01-03 18:44:20 +01:00
mdi-odoo 94066b25f5 [IMP] sale*: Improve the settings form view 2016-12-30 16:35:44 +01:00
pgu-odoo 5260d22c4d [ADD] sale_coupon: introduce coupon mechanism on sales order
Introduces 2 new concepts:

Promotion programs:
===================

Using promotion programs allows you to propose to your customers:
- Promotional offers limited in time or a limited order number.
- Public code printed in advertisements, magasines, etc.
- Specific offers based on a customers group or a product set.
- A combination of the preceeding points.

You may choose to apply the program reward immediately on the sales order or to propose the reward for a next order. In the second case a coupon will be generated at the order confirmation for the customer to use it later.

Coupon programs:
================

Using coupon programs allows you to propose to your customers:
- Free products or discounts if some conditions on products or purchased amount are met.
- Promotional offers limited in time.
- Generate coupons for a customers group.
- Specific offers based on a customers group or a product set.
- A combination of the preceeding points.

A coupon is applied by entering a valid code if the program rules are met and if the reward is already in the order lines.
2016-12-20 14:46:00 +01:00