Commit Graph

86 Commits

Author SHA1 Message Date
Olivier Dony 39f00b3637 [I18N] Update translation templates with latest terms
Total new terms: 270
Total deleted terms: 82
Total identical terms: 19653
Old total number of terms: 19735
New total number of terms: 19923
2015-01-21 15:31:22 +01:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +01:00
Christophe Matthieu 23f9736372 [FIX] website_event_sale: display the discounted price in website.
Add price_reduce compute method on ticket and sale order line
2014-10-24 14:16:16 +02:00
Jeremy Kersten 8ff6299d9d [FIX] website_sale: save the company in street and the street in street2.
The old behaviour was not better, because when we print the invoice, the order was ugly:
    Name
    Street
    Company name
    Country

Now we will have:
    Name
    Company name
    Street
    Country

This patch is not retro-compatible:
   Old partners will see the address in company name and vice-versa.
   Need to update view and switch street field and street2 field
2014-10-07 19:00:45 +02:00
Denis Ledoux eaa0f29094 [FIX] website*sale: product_id_change qty is 0 by default
Thus, need to pass the actual quantity to product_id_change in order to set values correctly
2014-09-30 17:20:28 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +02:00
Christophe Matthieu 5064c5b1a5 [FIX] website_event_sale: need to use new api to send the context. Add some step for test to check if the cart have the distinct products 2014-09-10 10:09:55 +02:00
Jeremy Kersten b6fb02a331 [FIX] website_sale: typo in tour 2014-09-09 16:50:42 +02:00
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +02:00
Antony Lesuisse 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
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +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
Christophe Matthieu 8914453a50 [FIX] website: enable test for blog, event... 2014-07-02 14:09:57 +02:00
Antony Lesuisse 25d0a3ecb1 [FIX] phantomjs test remove injection
It's now deprecated, assets bundles should be used instead.
2014-06-28 19:59:59 +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 e75d9525bb merge upstream 2014-06-20 10:09:16 +02:00
Christophe Matthieu bc3fc54fac [IMP] Tour: add tour in web module; tour became available in backend. 2014-06-18 12:25:13 +02:00
Christophe Matthieu 0d9f3af113 [IMP] website_sale: optional product + fix forgotten line_id in website_event_sale 2014-06-17 15:49:48 +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
Olivier Dony e276ac33f6 [MERGE] Forward-port saas-4 up to bf135ad 2014-05-28 17:45:31 +02:00
Denis Ledoux f085274d5f [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. df0ae7e4d1 2014-05-28 14:53:32 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Denis Ledoux cadf582d78 [FIX] event_sale, website_event_sale: ACLs for event.event.ticket
event.event.ticket were set in website_event_sale, while this model is set in event_sale module
Manager acl moved from website_event_sale to event_sale
Created a new acl for event user in event_sale
Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user
2014-05-27 18:39:00 +02:00
Christophe Simonis e16233217c [MERGE] Replace inherit_option_id by a selection field (PR #229) 2014-05-27 17:57:33 +02:00
Thibault Delavallée 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
Xavier Morel e06f5b414b [IMP] inherit_option_id -> application 2014-05-27 12:13:51 +02:00
Richard Mathot 88202680ea [FIX] website_event_sale: bad xpath in template 2014-05-27 09:18:31 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +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
Xavier Morel cc9d056711 [FIX] website_crm, website_event_sale: remove stray prints
also do some trivial cleanup/simplification of website_crm while at it:

* Initialize a dict directly via literal
* Use straightforward dict copy instead of whatever that convoluted crap was
* Use gencomp for set creation
* Lift a pair of keysets to the original dict creation
2014-05-13 09:56:28 +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
chm@openerp.com ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Antony Lesuisse 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
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
Denis Ledoux 22edf72dc1 [FIX] website_sale: fiscal_position must be passed to product_id_change in order to compute taxes correctly
bzr revid: dle@openerp.com-20140425145739-3s7wgsc6l0re3lhe
2014-04-25 16:57:39 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
chm@openerp.com b1bc68d8eb [FIX] website: tour inject sale/event
bzr revid: chm@openerp.com-20140423154530-rfc3glnp5xk50xoc
2014-04-23 17:45:30 +02:00
Olivier Dony 60cafe4da2 [FIX] website_event_sale: hide event tickets that are not for sale anymore
This should ideally be based on an extra timezone
field on each event, pending fix later in trunk.

bzr revid: odo@openerp.com-20140422123153-m6za55oqkiqysalx
2014-04-22 14:31:53 +02:00
chm@openerp.com 9284bd4817 [FIX] website: tour test inject javascript
bzr revid: chm@openerp.com-20140416082138-rhwo2tl9l6jrko78
2014-04-16 10:21:38 +02:00
chm@openerp.com a001e9c4bc [FIX] website: tour for website_event_sale
bzr revid: chm@openerp.com-20140414084833-gsanxrhysk7jn9bo
2014-04-14 10:48:33 +02:00
chm@openerp.com a2f62bc341 [FIX] website tour: error log
bzr revid: chm@openerp.com-20140411123305-t2n1aej9akn0zb5r
2014-04-11 14:33:05 +02:00
chm@openerp.com 7298130f31 [MERGE] from trunk
bzr revid: chm@openerp.com-20140410152925-ndajhnyh4rt8pkgu
2014-04-10 17:29:25 +02:00
chm@openerp.com 69dfcab5d9 [WIP] add console.log
bzr revid: chm@openerp.com-20140408144741-ylt01232o58xb7ys
2014-04-08 16:47:41 +02:00
chm@openerp.com f4225eda24 [FIX] website test tour
bzr revid: chm@openerp.com-20140408124119-jkmeh5vfdb3sjlna
2014-04-08 14:41:19 +02:00
chm@openerp.com fd593a3049 [FIX] website_sale: test tour and activate website_event_sale test
bzr revid: chm@openerp.com-20140331151237-ec0j7ywfsbjsw83k
2014-03-31 17:12:37 +02:00
chm@openerp.com b28a32f6ef [FIX] website: test_ui running
bzr revid: chm@openerp.com-20140326144442-ye2a51f03wyaxi8a
2014-03-26 15:44:42 +01:00
chm@openerp.com 62814f9c23 [FIX] website: activate new tour tests
bzr revid: chm@openerp.com-20140324081112-15n58puu29weydme
2014-03-24 09:11:12 +01:00