Commit Graph
86 Commits
Author SHA1 Message Date
qsm-odoo 1c80416e82 [REF] *: definitely get rid of web_editor.base
* website_form_editor, website_sale_coupon

Part of https://github.com/odoo/enterprise/pull/3603
See https://github.com/odoo/odoo/pull/29442
task-1932066
2019-02-27 10:03:16 +00:00
Géry Debongnie b425bd9335 [FIX] website_sale_coupon: no crash allowed in tour
The tour shop_sale_coupon was changed to use the testUtils.dom.click
method when we introduced the new test utility functions.  Probably
because the filename ends with 'test.js'.  Obviously, this is not
correct, because the testUtils function is not imported.

To prevent issues in the future, we simply remove the two problematic
calls.  Another solution was to import the testUtils module, however, I
think that it is simpler not to use those functions at all in tours,
because tours can be executed in the web client/website, and in that
case, they do not have access to the test utility functions.

closes odoo/enterprise#3239
2018-12-07 13:30:50 +00:00
Géry Debongnie d28c413991 [REF] *: update js test suite to use helpers
This rev. is the counterpart of community PR odoo/odoo/pull/28784.

Joint work with aab, dam, ged, mge, svs and vsc.

closes odoo/enterprise#3100
2018-11-19 13:30:30 +00:00
Christophe Simonis 26f916cde5 [MERGE] forward port branch saas-11.3 up to a9f3cf76b93 2018-11-16 14:27:04 +01:00
Christophe Simonis ce6b098df8 [MERGE] forward port branch 11.0 up to d2af0b13250 2018-11-15 20:41:29 +01:00
Christophe Simonis ab1b8dc3c1 [MERGE] forward port branch saas-15 up to a267fcbdf62 2018-11-15 19:20:15 +01:00
Christophe Simonis 2e3795b238 [MERGE] forward port branch saas-14 up to 6e254b8ae9c 2018-11-15 18:16:38 +01:00
Romain Derie 6f380eaf8f [FIX] website_sale_coupon: do not show generated coupon code if expired
Before this commit, an `expired` generated coupon would be shown to the user.
Now we hide these `expired` coupons.

Note: An `expired` generated coupon might typically come from a SO that does
      not meet a 'on_next_order' program anymore. So the generated coupon that
      was set to `reserved` got canceled and set to `expired`.

Step to reproduce:
  - Create a program oferring a product B on next order if you buy 2 product A
  - Add 2 product A to cart, you then see the message that you got a coupon for
    your next order
  - Remove on product A, you still see the message even if the generated coupon
    is now expired and not valid anymore.

Closes #3062
2018-11-15 15:56:29 +01:00
Christophe Simonis 570e381fcc [MERGE] forward port branch saas-11.4 up to 5999fd47c43 2018-10-23 15:18:46 +02:00
Christophe Simonis 53109feaea [FIX] website_sale_coupon: correct template logic 2018-10-16 20:47:49 +02:00
Christophe Simonis ef7b24eb75 [FIX] wbesite_sale_coupon: inherit to correct view
Adaptation of a0a811861332e34fb3ee0bcdedccfe7057685a5d to new version.
2018-10-16 19:02:17 +02:00
Christophe Simonis 2532200c04 [MERGE] forward port branch 11.0 up to 263773c35f0 2018-10-16 17:26:16 +02:00
Lucas Perais (lpe) 76e7a7082b [FIX] website_sale_coupon: update freeshipping on delivery change
Since this module is not bridged to website_sale_delivery, there was no support for changing the freeshipping line
when changing the delivery carrier

Now it has, at the price of ugly code

OPW 1871526

closes odoo/enterprise#2651
2018-10-10 14:25:41 +00:00
Christophe Simonis 5a589e8c0a [FIX] website_sale_coupon: force option activation to avoid race condition 2018-10-02 16:36:23 +02:00
Christophe Simonis a7af5679c2 [MERGE] forward port branch saas-11.4 up to 8faebd0cf52 2018-10-01 20:17:14 +02:00
Christophe Simonis 1c4b562d6a [FIX] website_sale_coupon: adapt test tour to new checkout flow 2018-09-28 15:11:19 +02:00
Christophe Simonis b3d9496263 [MERGE] forward port branch 11.0 up to 1e8ab568c1f 2018-09-26 20:02:37 +02:00
Aurélien Warnon b2318ced50 [IMP] product,(website_)sale: Allow users to fully configure products
Purpose
=======

- Configure a product from a sales order as easily as in the ecommerce
  The backend uses the same template as the frontend to configure a products and its options

- Display optionnal products of optionnal products in the "sale options" section

- Allow adding exlusions to some combinations of the product and/or
  to some combinations of the optionnal and accessory products

- Product attributes can now have custom values.
  These values are specified by the user during the SO creation.
  They are also available on the webshop frontend.

- Product attributes can be configured to create variants "on demand".
  This means that product.templates having these attributes will only create product.product variant
  when that combination is actually selected in a sale order/in the web shop.

  Product attribute values are also improved to handle extra prices and exclusions
  in all three modes ("never", "dynamic, "always")

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

1. Improve the "Add to cart" with optional products

- When you add an option to cart, move the product to the cart & show the options of this option
- Don't open the option wizard if no option available (in case this module becomes generic,
  it's better to skip this step when it's not needed)
- Display the options right under their related product in the cart

2. Do not allow to add the product as an optional product for itself
Why ?
- No functional sense
- Creates issues in the add to cart wizard

3. Exclude some attribute combinations within the product or with related options and accessory products

- Rename VARIANT PRICES button -> CONFIGURE VARIANTS
- When you click this button and select a value, open form view rather than inline edition
- Form view of variant values:
	- Attribute
	- Value
	- HTML Color Index
	- Attribute Price Extra
	- Not Compatible with: o2m tab with 2 fields: Product AND Attribute Value (of this product)
	  [m2m tag selection]
	- in any new line, autocomplete the current product by default
	- Tooltip: A list of product and attribute values that you want to exclude for
          this product's attribue value. Also applies on optionnal and accessory products.

4. New option to configure a product in a sales order line

- This option is only visible if the corresponding option is activated in the sales settings
- It opens a wizard to select a product template, configure related attribute values
  and select optional products (based on frontend view)
- Attributes not compatible with other selected attributes should not be selectable
- Must work like in the frontend

5. Create variants on demand
- add a new mode to generate variants as they are added to the order/cart
  (needed for big # of combinations managed in the inventory and/or produced in mrp with specific boms)
- replace the boolean by a selection radio
  tooltip for this new field:
	Always:
	  Variants are generated straight away when
	  the attribute values are combined in the product configuration.
	Only when the product is added to a sales order:
	  Variants are generated once the combination is selected in the sales order.
	  This is advised when variants are customized on demand and manufactured as such in Odoo.
	Never:
	  Advised when variants are not needed in Odoo.
	  The selected values just show up in the description of sales order lines.
- ability to define attribute extra prices & exclude combinations in all variant modes
- if at least one attribute of the product in set to "on demand" mode, generate all the variants "on demand"
2018-09-25 18:54:07 +02:00
Christophe Simonis 64484e0544 [MERGE] forward port branch saas-15 up to c74e1ae51a8
closes odoo/enterprise#2707
2018-09-22 19:41:40 +00:00
Christophe Simonis b4ddcca4ae [MERGE] forward port branch saas-14 up to 448b17e601b 2018-09-21 15:17:50 +02:00
Romain Derie c51e60ef39 [FIX] (website_)sale_coupon: fix website dependence in sale_coupon
67c3de295e9 wrongly adapt coupon to multi-websites as website references should
have been written in website_sale_coupon and not sale_coupon.

Closes #2673
2018-09-18 12:09:17 +02:00
qsm-odoo 8cefc928b1 [FIX] *: use responsive BS text utilities instead of our own
* website_form_editor, website_sale_coupon

See https://github.com/odoo/odoo/commit/737d272997da341922f7d720c4a7c9f01c041a59
2018-09-14 13:47:06 +02:00
Romain Derie 2f392ec561 [FIX] (website_)sale_coupon: _compute_tax_id with tax on reward line
It should get tax from the SOL and not the SO's product as the tax is applied
on the SOL only (the reward product has no tax by default).
2018-09-13 15:20:40 +02:00
Romain Derie 269f8c5601 [FIX] website_sale_coupon: merge 'sibling' discount lines in cart
A discount on products with different taxes will result in as many discount
lines as there is different taxes.

This commit will merge all these lines in a single one on the front-end (cart)
to not change the behavior/display for the end user. This will be purely visual
as it does not affect SO lines.

task-1866977
Related to #2224
2018-09-13 15:16:57 +02:00
Romain Derie fe72773b20 [IMP] sale_coupon: adapt to multi-websites
This commit adds the `website.multi.mixin` to coupon program to make it
multi-websites.

It also adds the website_id field in the views and adapt SQL constraint on code
which now became multi-websites friendly.
2018-09-02 15:27:05 +02:00
Romain Derie adc41c0ed2 [FIX] webite_sale_coupon: adapt test with new checkout
Since commit 006ce9c887 set the `Promo Code` view active (customize_show),
the `shop_sale_coupon` JS tour should not be working anymore.
But it was working since this change introduced a race condition that was
luckily making the test to succeed (most of the time).
(This bug appeared weeks ago on nightly build)

Basically, the tour flow was:
1. Activating `Promo Code` in customize option -> Cause a page refresh
2. Waiting for the DOM to contains the promo code input (shown after page
   refresh performed by step 1.)
3. Typing a promo code and submitting it
4. Waiting for the discount line to appear (after page load performed by
   step 3 form submit.)

This test was working fine as the promo code customize option was disabled.
Thus, the promo code input would only be visible after the refresh of step 1.
It would always wait for the refresh to occur before continuing.
No race condition possible.

Since the change of 006ce9c887 that activated that view by default:
  - The promo code input would already be on the DOM when the tour was executed
  - Clicking on the customize option would actually disable it.

Then, since the input was already in the DOM, the step 2 would instantly
continue without waiting for the refresh of step 1 and step 3 would be
performed while step 1 would still be refreshing the page.
You would then land sometimes on the refresh of step 1, sometimes on the
refresh of step 3, depending of the test speed (and so the runbot).
In case you landed on refresh of step 1, step 4 would never find the discount
line.

---- SOLUTION ----

Click on the customize option only if not already enabled.
(The customize step could have simply been removed as it is now activated by
default. But this is better to prevent the test to fail in case we change that
customize active state in the future or to simply run the test more than once)
2018-08-14 22:09:27 +02:00
Jeremy Kersten 53e6684a86 [TYPO] website_sale_coupon: quick fix
While we find why PhantomJs crash on this tour that works for humans
2018-08-14 15:45:42 +02:00
Jeremy Kersten 863b86ea9f [FIX] website_sale_coupon: make test determinist
avoid race condition when refresh of /shop finish after the search click.

Now we start on the search page directly, that make tour faster and that
don't remove any usefull test, since the purpose of this test is to test
coupon and not the search view already tested by others tests.
2018-08-14 14:02:48 +02:00
stefanorigano f7ffbcd1c8 [REF] *: improve app icons, add SVG version
- Uniform colors and design
- Replace duplicated icons (eg. mrp_maintenance / maintenance)
- Improve misleading icons (eg. sale_subscription)
- Add icons for new apps

Add SVG versions to lossless future editing and print/marketing use.

See https://github.com/odoo/odoo/commit/1d9208c4fa92d00090b37b8e5dbed48087a7f52f

task-54681
2018-08-09 15:51:42 +02:00
Priyanka KakadiyaandNimesh Jethva dfb3bc933f [REF] various: update manifests for better wording and names
Time has come to update a bit applications name, summary and website links.
Purpose is to have a website page correctly set for applications to be used
in conjunction with the newly-introduced discover button.

Names and summaries are updated to be more updated and shiny.

This commit is related to task ID 47179 and 1861544. Related PR are #1834
and #2365. First one is about classic applications while second one is about
website applications.

Co-Authored-By: Nimesh Jethva <nje@odoo.com>
2018-08-03 15:00:57 +02:00
qsm-odoo 2187efc2aa [FIX] website_sale_coupon: adapt to https://github.com/odoo/odoo/commit/b1107cba38e296f17d03d9919be67e6789a407be 2018-08-02 11:28:53 +02:00
qsm-odoo 1f68e93e4b [REF] *: BS4, 'pull-left/right' -> 'float-left/right'
See https://github.com/odoo/odoo/commit/d48b8593dde7c6adf679359e2dd64dee288e9544
2018-07-27 12:54:55 +02:00
qsm-odoo adb84f760b [REF] *: BS4, review panel and well structure
See https://github.com/odoo/odoo/commit/59237ea81988bdcd0cc746422a7c94bf2eadaaa2
2018-07-27 12:53:11 +02:00
Yannick Tivisse c186a1b096 [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
2018-07-12 13:45:10 +02:00
Fabien Pinckaers 73d2c5b5b6 [IMP] product: Unify/Clean product demo data
PURPOSE
=======

1. Unified product demo data
2. Less demo: one per use case
3. Demo data for all models

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

1. Refactor all the brol in the demo data
2. Adapt the tests to make them green, as some products are
   renamed, removed, created in python instead of as demo data
   ...
2018-07-05 08:59:55 +02:00
Christophe Simonis 0cf42b95b5 [MERGE] forward port branch saas-11.2 up to 662fc05dafb 2018-03-27 19:41:45 +02:00
Christophe Simonis 58d436d3ec [MERGE] forward port branch 11.0 up to 6cfb5426c67 2018-03-27 18:42:44 +02:00
Christophe Simonis 02dc8c6552 [MERGE] forward port branch saas-15 up to 9bfd3b585ab 2018-03-27 17:28:32 +02:00
Christophe Simonis a3e0ffc27f [MERGE] forward port branch saas-14 up to 094ab954f7d 2018-03-27 16:50:17 +02:00
Romain Derie f71c33230a [FIX] website_sale_coupon: change tour trigger since class remove
The `oe_website_sale` class got removed by commit https://github.com/odoo/odoo/commit/809776914613b28814b24419b4a9ba40d40f7b9b

The tour that needed that class need to be changed to trigger on something else
2018-03-22 18:12:10 +01:00
Jeremy Kersten 909b901e19 [IMP] website_sale_coupon: adapt layout to new checkout flow
Related commit community: odoo/odoo#006ce9c88763053de9003b2a1
2018-03-19 21:29:52 +01:00
Christophe Simonis a6c76d2fd2 [MERGE] forward port branch 11.0 up to 10886317711 2018-03-02 17:55:33 +01:00
Christophe Simonis ee065efddf [FIX] website_sale_coupon: adapt test to capitalized text 2018-03-02 16:13:24 +01:00
Christophe Simonis e3ff8a11e4 [FIX] website_sale_coupon: adapt test to new term.
Option has been renamed with odoo/odoo@fff0314623
2018-03-02 10:51:52 +01:00
Christophe Simonis 775065ec49 [MERGE] forward port branch saas-15 up to 9aca5ca19d0 2018-03-01 18:18:16 +01:00
Christophe Simonis 999f150062 [MERGE] forward port branch saas-14 up to 06572f39cdb 2018-03-01 17:40:01 +01:00
Romain Derie 5db5f8e981 [IMP] sale_coupon, website_sale_coupon: add tests
Commit a42c27f99e0061b7c4f recently fixed some bugs on sale_coupon.
This commit add some tests to be sure theses bugs are fixed and won't appear
again.

This closes #1744
2018-02-23 18:37:20 +01:00
Christophe Simonis 1e30dbe78e [MERGE] forward port branch saas-11.1 up to 6cb9ed4c424 2018-01-03 14:23:59 +01:00
qdp-odoo 5c98e532f9 [MERGE] forward port of branch saas-16 up to 387324aba16444d54e48bf8acac4b62e9492ba0b 2017-12-20 11:15:51 +01:00
qdp-odoo 5880d13384 [MERGE] forward port of branch saas-15 up to 59a505127b21b8dddc756a3f06d98a6165446288 2017-12-20 11:07:27 +01:00