Olivier Dony
59f77103cc
[FIX] website_sale: checkout: do not reset address country every time
...
Once the value is set it can be modified by the user
(e.g. if geoip detection was wrong), so should not be reset.
2014-10-01 15:16:00 +02:00
Thibault Delavallée
dce983dea0
[IMP] website_sale: confirm quotation only when the payment is done, not directly when hitting 'pay now'.
2014-09-29 11:12:37 +02:00
Olivier Dony
dd2f229153
[FIX] website_sale: avoid subscribing the website user (Public) to all shop orders
...
Especially as this user does not have a valid email, which
could prevent notifications to reach other followers.
2014-09-26 16:13:56 +02:00
Olivier Dony
b2b3d629f9
[FIX] website_sale: auto-confirm free orders upon cart validation
...
Orders are normally confirmed when the payment transaction
is processed, but there is no transaction for free orders.
This caused them to stay in draft until manually cancelled.
2014-09-26 14:36:59 +02:00
Denis Ledoux
c8f1bebcc5
[FIX] website_sale: free carts were not confirmed
2014-09-25 16:25:43 +02:00
Denis Ledoux
8d773dcd23
[FIX] website_sale: only display payment method from the same company as the order
2014-09-18 10:51:57 +02:00
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
Christophe Simonis
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
Christophe Matthieu
435b5b9ca3
[IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product.
2014-05-28 19:42:15 +02:00
Christophe Simonis
d42840a6f8
Merge pull request #226 from odoo-dev/master-website_sale-add-vat-chm
...
[IMP] website_sale: add vat field on checkout + validate it if base_vat module is installed
2014-05-28 18:45:12 +02:00
Christophe Matthieu
c6f0699435
[FIX] website_sale: search attributes error when the user select a product with a search
2014-05-27 20:57:00 +02:00
Olivier Dony
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
Christophe Matthieu
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
Christophe Matthieu
bb669f82c8
[FIX] website_sale: search by attributes not work for more of one selection
2014-05-27 18:20:42 +02:00
Olivier Dony
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
Denis Ledoux
63b7f678f3
[FIX] website_sale: in the product grid, a product must have min size 1 and max size 4
2014-05-27 16:11:27 +02:00
Christophe Matthieu
2efb074733
[IMP] website_sale: use company vat_check_vies field to select the method to check the vat id base_vat is installed
2014-05-27 14:35:07 +02:00
Christophe Matthieu
59be055c37
[IMP] website_sale: if base_vat is installed, when the use try to validate checkout, the vat is checked (VAT Information Exchange System)
2014-05-27 12:49:16 +02:00
Christophe Matthieu
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00
--global
ed51e843a2
[IMP] website_sale: change 'pay now' button behavior.
...
Now: intercept the call, make an asynchronous call to create the tx, then continue to the acquirer. Previous this was done by
a redirection, leading to a get request beign done. However it should be a post request.
2014-05-27 11:35:32 +02:00
Christophe Matthieu
43977deb71
[IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison.
2014-05-27 09:42:52 +02:00
--global
13ac3865d5
[CLEAN] Use none or false, but not both on two lines ...
2014-05-22 15:40:29 +02:00
--global
15e874b5c8
[FIX] website_sale: still cleaning lost references to deleted code in website_sale ...
...
Fixed checkout redirection that was meant to clean the session (incorrect sale order or transaction) that may happen
when having issues with the payment.
2014-05-22 15:34:09 +02:00
Fabien Meghazi
35efb5bf5f
[MERGE] upstream
2014-05-19 12:12:46 +02:00
Thibault Delavallée
9b0b918ed6
[FIX] website_sale: removed now unnecessary dependency
...
towards crm for website-sale, as sales_team module is a dependancy of sale.
Also reverted some changes in comments.
2014-05-14 17:34:17 +02:00
Thibault Delavallée
ae89496bbc
[MERGE] Sync with trunk
2014-05-14 17:21:54 +02:00
Thibault Delavallée
28b20d312d
[FIX] Re-added code removed by al at rev 9421: website quotation email was not sent anymore.
2014-05-13 12:32:53 +02:00
Fabien Meghazi
8eed143112
[IMP] Invert multilang logic in route decorator. True by default, can be set to False explicitlty
2014-05-13 11:35:45 +02:00
Thibault Delavallée
2b8739cf8b
[IMP] website sales salesteam: refactored implementation
...
- now having a website sales sales team in website_sale;
- temporarily crm accepted as a dependency of website_sale (will be improved when sales team are
taken out of crm);
- removed website_sale_crm unnecessary module + dead code
- removed shopping cart state + its management
- added acquirer and transaction fields on sale order
- azdded use_opportunities and use_quotations fields on sales team like use_leads
2014-05-12 17:52:10 +02:00
Paramjit Singh Sahota
2ac1156925
[MERGE] Merged lp:openobject-addons.
2014-05-12 10:31:53 +05:30
Paramjit Singh Sahota
fe9b88a3ba
[REVERT] Reverted the changes of rev 9219.
2014-05-12 10:25:20 +05:30
Fabien Pinckaers
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
Paramjit Singh Sahota
2fe8beac28
Missed while merging.
2014-05-08 18:51:17 +05:30
Paramjit Singh Sahota
f1dd083521
[MERGE] Merged lp:openobject-addons.
2014-05-08 18:41:39 +05:30
chm@openerp.com
d3678bf521
[FIX] website_sale: don't rewrite sale order partner_id with the public user
...
bzr revid: chm@openerp.com-20140505124702-cq6tvb6h3lgyst99
2014-05-05 14:47:02 +02:00
chm@openerp.com
41ade23b09
[FIX] website_sale & website_event: create product (redirect with slug)
...
bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
2014-05-05 11:57:24 +02:00
chm@openerp.com
06c63594be
[FIX] website_sale: message confirmation
...
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
chm@openerp.com
1fd1114c69
[FIX] website_sale: access to the webite partner_id
...
bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
2014-05-02 18:06:28 +02:00
chm@openerp.com
bbfdc57ad9
[FIX] website_sale: add to cart product => quantity + 1
...
bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
2014-05-02 17:08:42 +02:00
chm@openerp.com
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
Paramjit Singh Sahota
5e3eb59d0f
[MERGE] Merged lp:openobject-addons.
2014-05-02 16:22:26 +05:30
Denis Ledoux
79d4c57877
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
...
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
chm@openerp.com
1199b60d70
[IMP] website_sale: use street 2 to set company_name
...
bzr revid: chm@openerp.com-20140428134632-v3w7imtz7j3u3tp0
2014-04-28 15:46:32 +02:00
chm@openerp.com
bb2ebf7cb9
[FIX] website_sale: apply fiscal position on change product id and update cart.
...
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined
bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
Denis Ledoux
b54e49b291
[FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change
...
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
2014-04-25 17:25:41 +02:00
chm@openerp.com
cee3cabaa8
[IMP] website_sale: create new shipping address; company_name field; fix acquierer image
...
bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
2014-04-25 15:20:49 +02:00
chm@openerp.com
3b49850d1a
[FIX] website_sale: filter redirect to 404 error if a category is selected. (url: /shopcategory/?filters=...). Add slash between shop and category
...
bzr revid: chm@openerp.com-20140425075304-qnlyb6n6hpyvttv1
2014-04-25 09:53:04 +02:00
Mehul Mehta (OpenERP)
3ef529f1a1
[MERGE] merged with lp:openobject-addons
2014-04-16 10:34:53 +05:30
Christophe Simonis
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Mehul Mehta (OpenERP)
a8c1649423
[MERGE] merged with lp:openobject-addons
2014-04-15 19:01:17 +05:30
Mehul Mehta (OpenERP)
7ceaefb106
[IMP] draft state replace with shopping_cart state and remove the condition of pending which convert a draft quotation into quotation sent
2014-04-15 18:55:12 +05:30