Commit Graph
57 Commits
Author SHA1 Message Date
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
qdp-odoo a825ceea3a [MERGE] forward port of branch saas-14 up to 9f97c017a5953851a88e2002570238d73b974cf3 2017-12-20 11:01:10 +01:00
Jeremy Kersten ee7928d4bc [FIX] website_sale_coupon: fix performance issue on cart update.
It was a bad idea to recompute_coupon_lines into the function 'sale_get_order'.
This function is called several times on each pages. The purpose of this one is
to return a browse record only and IF needed recompute more.
But apply a method that take several secondes will dramastically reduce the
ecommerce performance.

Now, we call the method only when we change the cart and so potentially change
the right to benefit of a coupon or not. And not at each call of the method
'sale_get_order'. In checkout, that reduce from 6 call on some page to one this
costly method that take several seconds.
2017-12-12 18:15:11 +01:00
Romain Derie 36512cc1b2 [REM] website_sale_coupon: Fields and file not used anymore
Since this commit https://github.com/odoo/enterprise/commit/87d542, these fields are not used anymore.
It needed to be removed in master.
2017-12-12 16:39:19 +01:00
Romain Derie c1b6c95d8d [FIX] website_sale_coupon: hide qty spinner/input for reward line
Before this commit, a reward line in cart would have the same qty field/spinner
than regular line even if the field is readonly and the spinner qty disabled.

Now, as for a linked line (eg: optionnal product warranty), simply show the
qty without qty spinner and input.
2017-11-30 17:39:30 +01:00
Christophe Simonis 7c0b15283f [MERGE] forward port branch saas-16 up to b81f9d89876 2017-11-16 12:41:31 +01:00
Christophe Simonis 0fecd4b121 [MERGE] forward port branch saas-15 up to e9575185a57 2017-11-15 17:56:16 +01:00
Christophe Simonis c351be9e16 [MERGE] forward port branch saas-14 up to 198dac55ca2 2017-11-15 15:38:57 +01:00
Romain Derie f7c58b65df [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
rde 1bd44e1106 [FIX] website_sale_coupon: update reward line total when changing product qty on cart
- Add a product (imac 1.799$) and a promo code (eg: 10%) in your cart
  - Go to checkout (/shop/cart). You now see 1,619.10 Total and 179.90 discount
  - Change product qty (eg: 2)
  - Subtotal is now 2x 1.799 - 179.90 instead of 2x 1.799 - 2x 179.90
  - Reward line total (discount) is still the same amount (10% on 1 ipad)

Now, we will recompute the discount price based on the entire cart

Note: This behavior was wanted and comes from this commit #87d542
But for the shop, we need to have the reward line being updated on the fly or
it wont make sense for the end user.

This closes #ee4be7a532dd707a0cd19c766dc8e8537dcda242
2017-11-11 17:10:17 +01:00
Christophe Simonis 20bb922bf0 [MERGE] forward port branch saas-16 up to 8525b0e95e6 2017-10-31 21:00:46 +01:00
Christophe Simonis 55851f469a [MERGE] forward port branch saas-15 up to 076217630ae 2017-10-31 18:38:52 +01:00
Christophe Simonis 938297b6dd [MERGE] forward port branch saas-14 up to b488c5bd946 2017-10-31 18:37:54 +01:00
rde 74e116fcc1 [FIX] website_sale_coupon: prevent concurent t-if on same element
Before this commit, website_sale_coupon and website_sale_options (which are not
dependant) were both setting an attribute name="t-if" on the same element (same
xpath).

*website_sale_coupon: hide cart line qty widget if line is a coupon
(reward_line)
*website_sale_options: hide cart line qty widget if line is an optional product

The problem was that only one of the condition would be considered:
  - On saas-14: always the one from website_sale_coupon, because qweb would
    sort inherited views by [priority, name, id]
  - On v18: always the one from the last installed module of these 2 would be
    considered, because commit #dbb931976fd102a1eceea4ebf195efea7576f260 change
    the inherited views order in qweb [priority, id]. Therefore, last installed
    module will have higher ID on its view, being interpreted last.

Now, both coupon and optional product lines have their qty correctly hidden.
To do so, we had to change an attribute t-if by an attribute style setting the
display to none. We can't change the xpath to a parent since it is a table
element and it would remove a TD, breaking the HTML. We can't either add a
container because of the themes that may conflicts.

To reproduce on v18:

  - Install website_sale_coupon and website_sale_options
  - Create a promotion code
  - Add item to cart with it's optionnal product and go to checkout
  - Add promotion code
  - If you installed website_sale_coupon first, the coupon cart line will
    display the qty twice (t-if overrided by website_sale_options)
  - If you installed website_sale_options first, the optionnal product car
    line will display the qty twice (t-if overrided by website_sale_coupon)

To reproduce on saas-14:

  - Do the same 4 first steps
  - Optional product cart line will display the qty twice

Website_sale_options and website_sale_coupon both xpath and t-if the same
element.
The module that has been installed last will have the upper hand on the
condition and only its condition will be applied.

Now, it correctly take care of both conditions.
2017-10-27 17:37:20 +02:00
Deep Patel 58d2bf2883 [FIX] res_config: Fix several layout issues on config views
- subscription settings are broken and show up at the bottom of any setting page: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrra01leUZ1Wnczbms/view?usp=drivesdk
- don't put setting item of the app you are configuring at the top of the list: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrdXEwUmFWTTlLd1E/view?usp=drivesdk
- hide empty sections when searching not in debug mode: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrVGFOa0FKVmtNTWs/view?usp=drivesdk
- when installing Invoicing, setting item should be Invoicing and not "Accounting": https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrWGQwY1ktaXlNSUk/view?usp=drivesdk
- app labels: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrreXlNTXZnbU13aFk/view?usp=drivesdk
- coupon programs links: duplicate in sales + no link at all in website: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrraTV1YTNPdWU2VUE/view?usp=drivesdk
- delivery methods: links are duplicated in sales settings https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrczR5X1FOUllUZHM/view?usp=drivesdk
- add subtitles to all the carriers in sales settings: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrS1NXXzhwRTFQV2c/view?usp=drivesdk
- inner options should never be in bold:
        customer account: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrMnpualBta2x6dU0/view?usp=drivesdk
        phone validation: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrraHJrYngtaGJ6T2s/view?usp=drivesdk
        signature & payment: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrWTJ3dVBuTzNONlU/view?usp=drivesdk
        bill control: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrRy16UkdTWWdrdDQ/view?usp=drivesdk
- make similar settings look the same through all the apps:
        taxcloud: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrraGlVWmNXRjJ5WEk/view?usp=drivesdk
        pricelist: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrQ2pwVmtEZXM1SWM/view?usp=drivesdk
        multi-currencies: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrTFNWTTJpcS1XbnM/view?usp=drivesdk
        shipping costs: https://drive.google.com/a/odoo.com/file/d/0B1uIL9E_zXrrM2hKdk5XRy1WTjg/view?usp=drivesdk
2017-09-29 14:14:50 +02:00
Barad Mahendra 9e7dd18742 [IMP] website: Clean and simplify res_config view
Purpose
=======

- Settings are too complex: too long + too many options that shouldn't be suggested with checkboxes

e.g. twitter roller is now suggested as a new snippet to install from website editor
google maps, slides, forum, etc. should show up in the apps store

- When saving the page I expect to stay in the settings -> no redirection to homepage anymore!

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

See task 33620
2017-09-06 15:21:10 +02:00
Yannick Tivisse f64b4abc28 [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 d5992c5693 [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 d7c947b354 [MERGE] forward port branch saas-15 up to 6492adc3c4c 2017-06-27 13:45:01 +02:00
Christophe Simonis 712a97e06b [MERGE] forward port branch saas-14 up to 23d93a69581 2017-06-27 12:11:13 +02:00
Yannick Tivisse 63c5b7c9c5 [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
xmo-odoo bfca4119cd [FIX] implicitly relative imports 2017-04-28 09:07:28 +02:00
Pratima Gupta fdf3d4c62d [IMP] website_sale_coupon: Rename Coupon code into Promo code in frontend 2017-03-27 10:32:18 +02:00
Jeremy Kersten 28eee52c78 [FIX] website_sale_coupon: show discount in subtotal 2017-03-10 17:53:57 +01:00
Jeremy Kersten 535d6360e2 [FIX] website_sale_coupon: remove duplicated controller and view 2017-03-10 17:53:57 +01:00
Christophe Simonis 50ab76c230 [MERGE] forward port branch saas-14 up to 7dfb2e44b6e 2017-03-06 17:58:34 +01:00
Rohan Patel b909914124 [IMP] website_sale_coupon: renamed coupon programs and promotion programs submenu items in website catalog 2017-03-03 16:49:08 +01:00
Yannick Tivisse e93293a856 [FIX] website_sale_coupon: Merge the price coupon code and sale coupon code boxes
On the ecommerce, we may activate an option that allows a user to enter a coupon code related to a pricelist.

On the website_sale_coupon module, we are also able to enter a code to activate a reward related to a program.

Theses 2 boxes may appear on the same page.

This commit merges the 2 boxes into a single one. When a coupon is entered, it will
- Check if a coupon program or a promotion program is linked to this code
   - If yes, it applied the reward accordingly
   - If not, it will check if a pricelist is linked to this coupon code
      - If yes, it will modify the prices accordingly
      - If not, it will display a warning to explain that the code is invalid
2017-02-24 11:01:23 +01:00
Yannick Tivisse 1abba847ef [FIX] website_sale_coupon: Fix unknown id on html block
Coming from https://github.com/odoo/odoo/commit/2b4b60dc5e1ce081889f0418c30b2ddd919e468b
2017-02-01 15:24:11 +01:00
Yannick Tivisse 97f03fe11d [FIX] website_sale_coupon: Add configuration menuitems under Website Admin/Catalog 2017-01-31 13:12:22 +01:00