46efc164d6
Forward port of branch saas-3 up to rev 2ee1843
2014-09-17 12:58:08 +02:00
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
847093a4b0
[REM] unused class attribute
2014-09-16 22:27:52 +02:00
bc5e6fa2cb
[ADD] Helper for /website/image (allows to use aggressive cache)
2014-09-16 19:54:59 +02:00
6402bcbd92
[IMP] Move website_sale_tracking.js in front-end bundle
2014-09-16 19:54:59 +02:00
780dd9891f
[MERGE] forward port of branch saas-5 up to 7eab880
2014-09-15 14:00:02 +02:00
d3ba8a840d
[FIX] website_sale: the order of the attribute list doesn't matter
2014-09-10 15:08:34 +02:00
a57ebb2c58
[FIX] website_sale: The product breadcrumbs in shop not working. Internal Server Error appears
2014-09-10 13:24:56 +02:00
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
b6fb02a331
[FIX] website_sale: typo in tour
2014-09-09 16:50:42 +02:00
fac96241df
[I18N] Update 8.0 translations with latest changes from Launchpad
2014-09-08 19:04:25 +02:00
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
77b1f2bf29
Merge pull request #2021 from odoo-dev/8.0-wmsbomtasks-jco
...
8.0 wmsbomtasks jco
2014-09-03 21:13:44 +02:00
9b34358196
[IMP] Adapt mrp workflow and moves + Differ between Bose speakers and Custom Computer
2014-09-03 19:18:17 +02:00
2ad607feec
[FIX] website_sale: pay now button should be translatable
2014-09-02 11:31:03 +02:00
2d296cb779
[MERGE] ir-ui-view split active and show_customize
...
Split the ternary field application in active and show_customize, all four
possible value are now needed for the customize theme popup.
2014-08-31 16:56:44 +02:00
8046b7367d
[MERGE] forward port of branch saas-5 up to 7e117b1
2014-08-28 16:51:11 +02:00
5e6e1303e3
[IMP] pretty urls for /website/image
2014-08-28 16:37:38 +02:00
8aca457e34
[IMP] Updated website urls on modules and info page
2014-08-26 21:40:18 +02:00
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
1e4501076d
[FIX] bad link
2014-08-20 10:31:25 +02:00
50ef63881a
[I18N] Update 8.0 translation with latest source code
2014-08-14 17:01:54 +02:00
f43e349d85
[IMP] Footer message according to installed apps
2014-08-12 13:06:08 +02:00
8c7519ccad
[FIX] website_sale: partially revert 086cfd5.
...
Use less specific css selectors in "buy product" tour.
2014-08-12 12:16:36 +02:00
ef944dcd55
[IMP] Maifest for Github README.md on main apps
2014-08-12 11:33:15 +02:00
086cfd5c92
[FIX] website_sale: correct "buy product" tour to search the product before selecting it
2014-08-12 11:26:32 +02:00
e4c0940e9f
[FIX] website_sale: avoid displaying inactive products in shops
...
The domains in the form ('o2m_field', operator, False) do not use the orm but convert the domain to ('id', 'invert operator', [list of ids]). This means that the orm is not used and implicit filter (active=True) or access rights are not checked.
A proper fix in master should be done to use the orm instead of an SQL query.
This patch force a search to be made on product.product and then exclude the products where active=False (opw 607602).
2014-08-07 18:15:37 +02:00
1bb219907f
[MERGE] forward port of branch saas-5 up to 655a5b9
2014-08-04 16:56:10 +02:00
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
0023955074
[FIX] website_sale: confirm sale order on payment_confirmation
...
Same behavior than in saas-5
2014-08-01 14:48:16 +02:00
87a20d1cc3
[FIX] website_sale: can't click on confirm order in mobile view
2014-07-31 15:22:51 +02:00
6dc94f0c4e
Forward port of branch saas-5 up to eda2f06
2014-07-28 16:37:56 +02:00
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
ef53a831c6
[MERGE] Forward-port saas-5 up to a5f7891
2014-07-23 16:58:00 +02:00
a5f7891b68
[MERGE] forward port of branch saas-4 up to 5739aebfb1
2014-07-23 13:18:30 +02:00
5739aebfb1
[MERGE] forward port of branch saas-3 up to 474eae9a43
2014-07-23 12:14:14 +02:00
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
586b0e2f5d
[FIX] website_sale: _rec_name product.attribute.line
...
Set the _rec_name for product.attribute.line model, as its column name wasn't defined, and therefore search on it wasn't possible (For instance, do an advanced search on product.product with "Product Attributes" "Contains" "Something" wasn't possible).
2014-07-23 08:56:36 +02:00
8b67a7202d
[REF] OpenERP --> Odoo in various UI texts
...
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages
(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)
Closes #1260
2014-07-18 13:45:41 +02:00
49c203d6b9
[FIX] website_sale: do not set t-field in option
...
t-field in option input (select > option) is not supported
2014-07-17 17:22:43 +02:00
f9170a04fb
[FIX] website_sale: make the 'Ship to a different address' always available
...
In the backend the option 'Allow a different address for delivery and invoicing' will set the group sale.group_delivery_invoice_address to employees. However the public user is not an employee (and we don't want to change that) so does not get this group. As we don't have similar group mechanism for public user, we have no other choice than always displaying the option to have different address. opw 610118
2014-07-17 16:09:52 +02:00
f8d8179a92
[FIX] website_sale: add shop/pricelist controller
2014-07-16 10:51:02 +02:00
9b8e307eb1
Merge pull request #1143 from odoo-dev/8.0-fix-website_sale-chm
...
[FIX] website_sale: fiscal_position is undefined; website: add user into the tour logs
2014-07-14 12:10:03 +02:00
5f25cb9244
[FIX] website_sale: install website_event_sale click on event to make a registration, error because fiscal_position is undefined
2014-07-11 15:29:22 +02:00
f654a7719b
[MERGE] forward port of branch saas-5 up to 73d39a0
2014-07-10 22:49:53 +02:00
b333457ca3
CSS Fix: /shop
2014-07-09 18:51:07 +02:00
ac7f1d9e0e
CSS Fix for Products in /shop
2014-07-09 18:48:25 +02:00
8eb97cc082
[IMP] website_sale: Add google analytics on checkout process
2014-07-09 17:45:40 +02:00
928f4fbf76
merge from 8.0
2014-07-09 16:10:08 +02:00
4117c9c3ed
[FIX] product: add menu item to attributes and attribute values. Adding constraint to prevent deleting attributes with references to products.
2014-07-08 09:12:17 +02:00
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
0c702bdfa7
Merge pull request #885 from odoo-dev/master-shop-fp
...
Fixes for perf issues /shop + cleaning pricelists & currencies
2014-07-02 20:34:21 +02:00
c0307f37d2
FIX
2014-07-02 19:20:30 +02:00
1ce0b70a02
Speed Improvements
2014-07-02 19:03:10 +02:00
5cc81dd64f
Fixes
2014-07-02 18:18:29 +02:00
21615e6b2b
[FIX] website_sale: change picture in function of the product selected
2014-07-02 14:45:37 +02:00
8914453a50
[FIX] website: enable test for blog, event...
2014-07-02 14:09:57 +02:00
78f87dce34
[FIX] website_sale_options: tour and filter by attributes
2014-07-02 13:00:13 +02:00
5a73fb7500
[FIX] tour.js: tour shop
...
wait that the snippets are loaded before clicking on the picture and open the media editor.
2014-07-01 10:57:38 +02:00
162ee61d4f
[FIX] website_sale: discount price is never hide
2014-06-30 13:53:25 +02:00
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
25d0a3ecb1
[FIX] phantomjs test remove injection
...
It's now deprecated, assets bundles should be used instead.
2014-06-28 19:59:59 +02:00
1f57528bc6
[MERGE] forward port of branch saas-5 up to 8dfd5ea
2014-06-27 16:14:40 +02:00
195fa93168
[MERGE] backend front end integration
...
Render the top-menu (backend menu or frontend editbar) server-side.
Use Fontawesome icons (mail, timezone, chat).
Refactor website widgets, split Website.editorBarin editorbar, ace, editorbar- content, editorbarCustomize.
2014-06-27 11:03:34 +02:00
368936df7c
[FIX] product, website_sale: Go in GB (Go is fr)
2014-06-26 23:31:57 +02:00
a7816a827f
[FIX] website_sale: assets xml id and jquery selector (unbind click for login page)
2014-06-25 15:05:48 +02:00
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
95c7cf8a68
[FIX] website_sale_options: tour for test use the modal
2014-06-25 12:39:21 +02:00
216456127d
[IMP] website_sale_options: clean code; add ondelete cascade for optional product on sale order
2014-06-25 12:00:27 +02:00
412a7593be
[IMP] website_sale_options
2014-06-25 11:31:39 +02:00
7505cce2e9
[WIP]
2014-06-24 17:37:13 +02:00
204a62499a
[IMP] website_sale_options
2014-06-24 15:11:53 +02:00
1d68662fb9
[IMP] website_sale: use geoip session key insead of import GeoIP
2014-06-24 11:02:52 +02:00
34815021b8
merge upstream
2014-06-24 10:13:11 +02:00
518feee650
[FIX] merge error
2014-06-24 08:17:12 +02:00
1d1b6e79b5
[FIX] website_sale: user can't edit the price.
2014-06-23 16:38:04 +02:00
e75d9525bb
merge upstream
2014-06-20 10:09:16 +02:00
5165b52b43
merge upstream
2014-06-19 18:46:49 +02:00
eef6330c55
[MERGE] forward port of branch saas-5 up to adf07a9
2014-06-19 16:23:32 +02:00
adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
5206eb16d5
merge upstream
2014-06-19 13:13:27 +02:00
54605acc65
[FIX] website_sale: demo data must set website_sequence insead of sequence
2014-06-19 13:12:09 +02:00
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
40840436f4
[FIX] website_sale: add shop/pricelist controller
2014-06-19 13:12:07 +02:00
43ca22d10c
[FIX] website_sale: access right for currency for public user
2014-06-19 13:12:07 +02:00
a6185caa18
[FIX] website_sale: display in currency of the user
2014-06-19 13:12:06 +02:00
7295a07c4a
[FIX] website_sale: display price with user curencie.
2014-06-19 13:12:06 +02:00
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
c3c922f84e
[IMP] website_sale: convert comma to dashed for url attrib
2014-06-19 13:12:05 +02:00
86c6cf7a68
[FIX] website_sale: display discount only if the price is lower than the standard price
2014-06-19 13:12:04 +02:00
bc3fc54fac
[IMP] Tour: add tour in web module; tour became available in backend.
2014-06-18 12:25:13 +02:00
7ae7a5315f
[FIX] website_sale: modal layout
2014-06-17 15:58:13 +02:00
0d9f3af113
[IMP] website_sale: optional product + fix forgotten line_id in website_event_sale
2014-06-17 15:49:48 +02:00
25c564d635
[FIX] website_sale: check ipod product insead of ipad because demo data of ipad was changed
2014-06-17 14:27:26 +02:00
9f77cb9d1f
[IMP] website_sale: optional product have all time the same quantity of the liked product.
2014-06-17 14:23:15 +02:00
9867d63b5d
[IMP] website_sale: add demo data for optional products
2014-06-17 12:01:36 +02:00
0ac338ea0a
[IMP] website_sale: display state function of selected country
2014-06-17 11:33:28 +02:00
dcce993958
[FIX] website_sale: typo and preview display all time in modal
2014-06-17 10:54:47 +02:00
474d63d6b9
[FIX] website_sale: fix keep query and clean code
2014-06-17 09:44:32 +02:00
45a6012f22
[FIX] product: remove unused values
2014-06-16 17:33:18 +02:00
a8497e07c9
[ADD] added instantclick library to load data faster in anonymous mode
2014-06-16 16:00:06 +05:30
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
0492e59314
[FIX] website_sale: rounding price; typo and search sequence of membership
2014-06-16 10:53:34 +02:00
e915f4ca4d
[FIX] website_sale: tour test customize
2014-06-13 18:32:56 +02:00
0f78e602d6
[FIX] website_sale: tour; product split kanban view of product and product template
2014-06-13 17:08:19 +02:00
98d9901c17
[FIX] website_sale: retur the browse record of category insead of int
2014-06-13 16:17:51 +02:00
b8d4cd277e
[FIX] website_sale: bind event with touch for ipad
2014-06-13 15:50:08 +02:00
f4474d7295
[FIX] website_sale: add steps to remove the confirm dialog box in tour test
2014-06-13 14:24:48 +02:00
13920b09f1
[IMP] website_sale: add a tour of test to check confirm dialog box
2014-06-13 14:10:53 +02:00
8fdfc68074
[IMP] website_sale: display variants choice in confirm dialog box
2014-06-13 13:59:28 +02:00
d8516bcfd8
[IMP] website_sale: optional quantity in product form
2014-06-13 12:47:54 +02:00
1e9c72f308
[MERGE] from master
2014-06-13 12:35:23 +02:00
57c59ddfac
[IMP] website_sale: confirm/options dialog box have same layout of my cart
2014-06-13 12:31:41 +02:00
8a24171996
[IMP] website_sale: display 'Product not available' message in product selector
2014-06-13 09:32:28 +02:00
9d363b8758
[FIX] website_sale: remove disabled attribute on button in the xml template for product without variants
2014-06-12 17:03:17 +02:00
f62673c266
[IMP] website_sale: Optional product with variant suggestion
2014-06-12 16:58:44 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
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
ef48c4d440
[FIX] website_sale: disable button does'nt work in the product template.
2014-06-06 10:57:50 +02:00
5f43d87a33
[IMP] website_sale: display image function of the selected product variant
2014-06-06 10:40:50 +02:00
489742873d
[FIX] website_sale: backport commit 3cc4785ba6 of master
...
This fix aimed saas-5, not master.
original Commit message:
display accessory field in form view and display the good accessory product inside ecommerce
This is related to previous rev 86055fb8cd
2014-06-04 11:25:51 +02:00
86055fb8cd
[FIX] website_sale: accessory_product_ids are product.product, not product.template
...
This many2many field should actually have product.template as relation
But, in a stable release, we cannot alter the database
Therefore, when displaying accessory products in the card, it display the product_tmpl_id of the product.product, not itself
This relation should be changed in trunk
+ Actually displaying this field in the backend
2014-06-04 10:44:56 +02:00
a5908c5812
[MERGE] forward port of branch saas-5 up to b1c0bc0
2014-06-03 20:02:00 +02:00
c5ab412acc
[FIX] website_sale: change template for product and variant selector (type color)
2014-06-03 15:38:11 +02:00
3cc4785ba6
[FIX] website_sale: display accessory field in form view and display the good accessory product inside ecommerce
2014-06-02 12:11:54 +02:00
e3bd7d953a
[FIX] website_sale: tour about customize don't check last step
2014-06-02 12:11:04 +02:00
9d33ce4900
[FIX] website_sale: missing openerp.tools import
2014-06-01 20:20:21 +02:00
285e1d5c38
[FIX] website_sale: so javascipt does not like tuples. use a list instead
2014-05-31 15:37:23 +02:00
960b86611e
[FIX] website_sale: remove invalid (and stupid) function field
2014-05-31 14:05:48 +02:00
29387c518e
[REV][FIX] Reverting regression introduced in forward-port
...
04211015fc
2014-05-30 15:20:18 +02:00
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
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
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
f085274d5f
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1
2014-05-28 14:53:32 +02:00
00dc3a59df
[FIX] website_sale: force changing pricelist on different account signin
...
opw-607517
2014-05-28 12:04:41 +02:00
c6f0699435
[FIX] website_sale: search attributes error when the user select a product with a search
2014-05-27 20:57:00 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
585511d36e
[FIX] website_sale: inherit_option_id must be convert in optional='enabled'
2014-05-27 18:56:58 +02:00
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
bb669f82c8
[FIX] website_sale: search by attributes not work for more of one selection
2014-05-27 18:20:42 +02:00
e987cd6c75
[FIX] website_sale: fix the product attribute templates to display the comma
2014-05-27 18:07:26 +02:00
d24aede8d7
[FIX] product: don't create new variants if the product.template is create by product.product.
2014-05-27 18:03:15 +02:00
e16233217c
[MERGE] Replace inherit_option_id by a selection field (PR #229 )
2014-05-27 17:57:33 +02:00
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
0544fc2929
Revert "Merge pull request #225 from odoo-dev/master-frontend-assets"
...
This reverts commit dd900408de4da882d48f
2014-05-27 16:12:52 +02:00
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
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
4fecb29c51
[FIX] website_sale, website_event_sale: updated tests according to the new dom of the checkout page introduced in pull request 232
2014-05-27 14:22:29 +02:00
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
e06f5b414b
[IMP] inherit_option_id -> application
2014-05-27 12:13:51 +02:00
b5a7156f7d
Merge pull request #224 from odoo-dev/master-payment-post-tde
...
[IMP] website_sale: correctly submit the payment form using a post request, correctly create the tx asynchronously
2014-05-27 12:09:01 +02:00
b5833591dc
[IMP] website_sale: add vat field on checkout
2014-05-27 12:05:41 +02:00
a6379e2e67
[IMP] payment addons: fixed submit buttons: now have type=submit (and not image or nothing) and removed name, because this may cause issues when trying to submit a form manually with type=submit and a name. Also improved js code in website_sale to correctly handle the click binding, the asynchronous call to the server to create the transaction, and then submit the form. As form submission is synchronous in javascript, we cannot use the deferred. Instead we prevent the click event from bubbling, wait for the server to create the transaction, adn then manually submit the form.
2014-05-27 11:35:32 +02:00
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
1744208928
Changed xpath expression from /t to .
2014-05-27 10:45:07 +02:00
af72adcd64
[DIRTY FIX] website_sale: make the runbot green
2014-05-27 10:01:58 +02:00
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
d89064c73c
[IMP]Improved code
2014-05-27 10:45:04 +05:30
e137a7713b
[FIX] website_sale: test did not load js properly and failed
2014-05-26 16:58:14 +02:00
daba406886
[IMP]Move assetss to frontend template.
2014-05-23 18:31:01 +05:30
13ac3865d5
[CLEAN] Use none or false, but not both on two lines ...
2014-05-22 15:40:29 +02:00
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
35a07975de
[FIX] website_sale: add the parameter _mail_post_access on product.template
...
This parameter gives the possibility to post messages en product.template to
people having a read access. The website_sale giving the possibility to post
comments, people not belonging to the 'Sale Manager' group were not able to
post messages.
2014-05-22 12:15:45 +02:00
35efb5bf5f
[MERGE] upstream
2014-05-19 12:12:46 +02:00
721a3d4ed2
[MERGE] [IMP] Added a website salesteam, used to handle ecommerce quotations and
...
contact leads. Also added use_opportunities and use_quotations boolean fields on
sales team, like use_leads to ease the salesteam customization.
Also removed some dead code in website_sale_crm and website_sale_delivery.
2014-05-15 10:02:02 +02:00
37ccbada84
[FIX] website_sale, website_crm: website salesteam value in correct
...
module.
2014-05-14 17:34:43 +02:00
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
ae89496bbc
[MERGE] Sync with trunk
2014-05-14 17:21:54 +02:00
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
e53c7748a0
[IMP] website_sale: toggle multi salesteam mode
2014-05-13 12:21:00 +02:00
a1e70ea0a4
[IMP] website_crm, website_sale: have only one salesteam to handle ecommerce and contact form.
...
The xml_id is now based on website.
2014-05-13 12:09:24 +02:00
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
3385300cb7
[IMP] website: sale_order: display acquirer only when set. The purpose is to
...
avoid maanging it from the sale order view; the website will set the acquirer
for ecommerce related orders. This way the acquirer and tx will be displayed
on the sale order linked to ecommerce sales, and not on other orders.
2014-05-13 11:01:18 +02:00
7ef0d94d6e
[IMP] website_sale: sale_order: add acquirer/tx data (to be improved)
2014-05-12 18:14:42 +02:00
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
2ac1156925
[MERGE] Merged lp:openobject-addons.
2014-05-12 10:31:53 +05:30
fe9b88a3ba
[REVERT] Reverted the changes of rev 9219.
2014-05-12 10:25:20 +05:30
54d30d5194
[IMP] clean sitemap, enumerate pages + fixes
...
bzr revid: fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4
2014-05-11 13:52:31 +02:00
2fe8beac28
Missed while merging.
2014-05-08 18:51:17 +05:30
f1dd083521
[MERGE] Merged lp:openobject-addons.
2014-05-08 18:41:39 +05:30
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
56eeefdfda
[MERGE] trunk-websit-al-refactor by chm
...
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request
bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
ee1fbd17c8
[FIX] jQuery.ui - boostrap conflict
...
bzr revid: fme@openerp.com-20140506153335-x2fwpajvthcru1cv
2014-05-06 17:33:35 +02:00
6b26a3896b
[FIX] website_sale: manifest typo
...
bzr revid: dle@openerp.com-20140506075126-mv6g869aqdl1yt5g
2014-05-06 09:51:26 +02:00
74a6bde093
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
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
b0cbaf330a
[IMP] website: load website.xml templates only in editable mode
...
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
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
06c63594be
[FIX] website_sale: message confirmation
...
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
5b839bea89
[IMP] website_sale: attribute's filters template unactive by default
...
bzr revid: chm@openerp.com-20140505092730-pxsdxlhxwuxoc3fr
2014-05-05 11:27:30 +02:00
9e176a977e
[FIX] website_sale: apply tax position on checkout signup
...
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
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
939b2f2d44
[FIX] website_sale & tour
...
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +02:00
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
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
5e3eb59d0f
[MERGE] Merged lp:openobject-addons.
2014-05-02 16:22:26 +05:30
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Martin Trigaux
Fabien Meghazi
Christophe Simonis
Denis Ledoux
Christophe Matthieu
Jeremy Kersten
Olivier Dony
Josse Colpaert
Thibault Delavallée
Antony Lesuisse
Fabien Pinckaers
rlu-odoo
Raphael Collet
Simon Lejeune
Dharmraj Jhala
Denis Ledoux
Richard Mathot
Christophe Simonis
Xavier Morel
Mitesh Savani
Paramjit Singh Sahota
Fabien Pinckaers
Christophe Simonis
chm@openerp.com