Commit Graph

350 Commits

Author SHA1 Message Date
Olivier Dony e5bff82aff [MERGE] Forward-port saas-5 up to f9bcd67 2014-09-17 16:39:06 +02:00
Martin Trigaux 46efc164d6 Forward port of branch saas-3 up to rev 2ee1843 2014-09-17 12:58:08 +02:00
Martin Trigaux 2ee1843757 [FIX] website_sale: retrieve transactions as superuser
Due to additional security rules, the transactions made as public user will have a new partner_id. The transaction needs to be retrieved as admin to be set in the context.
The operations in payment_get_status are made as superuser but the session_id is checked in the assert above to avoid url manipulation.
2014-09-17 12:52:28 +02:00
Christophe Matthieu b2f3de6da7 [FIX] website_sale: Price of accessory product are all time null. Need to use new api to send the context. 2014-09-10 11:22:04 +02:00
Christophe Matthieu c9a134b541 [FIX] website_sale: customer write on public user and the sale order is apply to public user if the public user is active=True; the checkout layout display state_id field twice 2014-09-04 13:31:44 +02:00
Thibault Delavallée 2ad607feec [FIX] website_sale: pay now button should be translatable 2014-09-02 11:31:03 +02:00
Christophe Simonis 8046b7367d [MERGE] forward port of branch saas-5 up to 7e117b1 2014-08-28 16:51:11 +02:00
Martin Trigaux 231a478ca9 [FIX] website_sale: pager in product list
Keep the reference to category and search view in pager.
Update the search template to include form and keep correct reference to the category (as a slug and not a parameter).
Fixes #688
2014-08-25 17:43:03 +02:00
Denis Ledoux 1bb219907f [MERGE] forward port of branch saas-5 up to 655a5b9 2014-08-04 16:56:10 +02:00
Christophe Matthieu ce7212d5d7 [FIX] website_sale: everytime you want to change both billing & delivery address, any change creates duplicates in the backend 2014-08-01 17:11:20 +02:00
Denis Ledoux 0023955074 [FIX] website_sale: confirm sale order on payment_confirmation
Same behavior than in saas-5
2014-08-01 14:48:16 +02:00
Martin Trigaux 6dc94f0c4e Forward port of branch saas-5 up to eda2f06 2014-07-28 16:37:56 +02:00
Jeremy Kersten 451d2de355 [FIX] website_sale: fix error in tracking_last_order which was using the field is_delivery from module delivery 2014-07-24 11:07:46 +02:00
Olivier Dony ef53a831c6 [MERGE] Forward-port saas-5 up to a5f7891 2014-07-23 16:58:00 +02:00
Denis Ledoux a5f7891b68 [MERGE] forward port of branch saas-4 up to 5739aebfb1 2014-07-23 13:18:30 +02:00
Denis Ledoux 5739aebfb1 [MERGE] forward port of branch saas-3 up to 474eae9a43 2014-07-23 12:14:14 +02:00
Denis Ledoux 474eae9a43 [FIX] website_sale: translated terms payment status
Payment status (website_sale confirmation page) inject a status message, which was not set to be translatable. It should be the case.
2014-07-23 12:00:09 +02:00
Christophe Matthieu f8d8179a92 [FIX] website_sale: add shop/pricelist controller 2014-07-16 10:51:02 +02:00
Christophe Simonis f654a7719b [MERGE] forward port of branch saas-5 up to 73d39a0 2014-07-10 22:49:53 +02:00
Jeremy Kersten 8eb97cc082 [IMP] website_sale: Add google analytics on checkout process 2014-07-09 17:45:40 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Fabien Pinckaers c0307f37d2 FIX 2014-07-02 19:20:30 +02:00
Fabien Pinckaers 1ce0b70a02 Speed Improvements 2014-07-02 19:03:10 +02:00
Fabien Pinckaers 5cc81dd64f Fixes 2014-07-02 18:18:29 +02:00
Antony Lesuisse 22f4c315a3 [IMP] automatic fiscal positions for simple cases
Add group of countries res.country.group
Add get_fiscal_position method a method to compute a fiscal position based on company_id, partner_id, delivery_id
The meaning of res.partner.fiscal_position is now a forced a fiscal position.
The default implementation should handle simple cases, like VAT in UE and sales
tax in the US, but the method can be overriden to handle more complex ficals
rules.
2014-06-30 02:12:41 +02:00
Christophe Matthieu 77a07670cf [IMP] website: move custom scripts in the assets; fix website_sale_option to display modal in grid view 2014-06-25 14:03:23 +02:00
Christophe Matthieu 216456127d [IMP] website_sale_options: clean code; add ondelete cascade for optional product on sale order 2014-06-25 12:00:27 +02:00
Christophe Matthieu 412a7593be [IMP] website_sale_options 2014-06-25 11:31:39 +02:00
Christophe Matthieu 7505cce2e9 [WIP] 2014-06-24 17:37:13 +02:00
Christophe Matthieu 204a62499a [IMP] website_sale_options 2014-06-24 15:11:53 +02:00
Christophe Matthieu 1d68662fb9 [IMP] website_sale: use geoip session key insead of import GeoIP 2014-06-24 11:02:52 +02:00
Christophe Matthieu e75d9525bb merge upstream 2014-06-20 10:09:16 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Christophe Matthieu 22d528c7a7 [IMP] website_sale: display the discount in the product template when the user select a variant 2014-06-19 13:12:08 +02:00
Christophe Matthieu 40840436f4 [FIX] website_sale: add shop/pricelist controller 2014-06-19 13:12:07 +02:00
Christophe Matthieu 087bf22fb5 [IMP] website_sale: add GeoIP localisation for default value in checkout; display vat number if vat module is installed; fix labels 2014-06-19 13:12:05 +02:00
Christophe Matthieu c3c922f84e [IMP] website_sale: convert comma to dashed for url attrib 2014-06-19 13:12:05 +02:00
Christophe Matthieu 9f77cb9d1f [IMP] website_sale: optional product have all time the same quantity of the liked product. 2014-06-17 14:23:15 +02:00
Christophe Matthieu 474d63d6b9 [FIX] website_sale: fix keep query and clean code 2014-06-17 09:44:32 +02:00
Christophe Matthieu 45a6012f22 [FIX] product: remove unused values 2014-06-16 17:33:18 +02:00
Jeremy Kersten 7107b646f6 [IMP] Website Sale - ribbon - html class from product.style is not required, so we need to display it as empty in website to avoid an internal 500 2014-06-16 11:31:21 +02:00
Christophe Matthieu 98d9901c17 [FIX] website_sale: retur the browse record of category insead of int 2014-06-13 16:17:51 +02:00
Christophe Matthieu f4474d7295 [FIX] website_sale: add steps to remove the confirm dialog box in tour test 2014-06-13 14:24:48 +02:00
Christophe Matthieu 57c59ddfac [IMP] website_sale: confirm/options dialog box have same layout of my cart 2014-06-13 12:31:41 +02:00
Christophe Matthieu f62673c266 [IMP] website_sale: Optional product with variant suggestion 2014-06-12 16:58:44 +02:00
Christophe Matthieu 8319356630 [IMP] website_sale: allow optional products in shop; In shop, it opens the modal jus after having clicked on the 'Add to cart'. The modal contains the optional products. 2014-06-11 12:50:41 +02:00
Christophe Simonis 285e1d5c38 [FIX] website_sale: so javascipt does not like tuples. use a list instead 2014-05-31 15:37:23 +02:00
Christophe Simonis 960b86611e [FIX] website_sale: remove invalid (and stupid) function field 2014-05-31 14:05:48 +02:00
Richard Mathot 29387c518e [REV][FIX] Reverting regression introduced in forward-port
04211015fc
2014-05-30 15:20:18 +02:00