 Antony Lesuisse
|
4b30f1fcbd
|
[MERGE] trunk-website-al
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
|
2014-01-31 01:51:57 +01:00 |
|
|
Antony Lesuisse
|
1c283ddf24
|
phantomjs segfaults
bzr revid: al@openerp.com-20140131002019-tbvgpunj6kj6675v
|
2014-01-31 01:20:19 +01:00 |
|
|
Antony Lesuisse
|
c1739bfb8d
|
[IMP] product rename suggested to accessory, add alternative to replace recommend
bzr revid: al@openerp.com-20140130233240-p0wcs2s57qp9nwp2
|
2014-01-31 00:32:40 +01:00 |
|
|
Christophe Matthieu
|
5400c508e5
|
[FIX] website tour test
bzr revid: chm@openerp.com-20140130232330-kgrw8e7d0ez3f3pp
|
2014-01-31 00:23:30 +01:00 |
|
|
jke-openerp
|
04e158151a
|
[FIX] Add tax on product for sale order line from website
bzr revid: jke@openerp.com-20140130231818-selp4mhzak8yjml6
|
2014-01-31 00:18:18 +01:00 |
|
|
Antony Lesuisse
|
3124343f04
|
[IMP] product style model renames, add user_id on website to be used in multiwebsite
bzr revid: al@openerp.com-20140130225853-6fgpmtaa8v1vr25x
|
2014-01-30 23:58:53 +01:00 |
|
|
Fabien Pinckaers
|
566cb4c8ef
|
[IMP] speakers on tracks
bzr revid: fp@tinyerp.com-20140130225152-m35doytzau5f86d1
|
2014-01-30 23:51:52 +01:00 |
|
|
Christophe Matthieu
|
ed45f41f9b
|
[FIX] website tour test + add test for shop
bzr revid: chm@openerp.com-20140130224453-e0drwj4m54vymahz
|
2014-01-30 23:44:53 +01:00 |
|
|
Antony Lesuisse
|
4aa8eadf5f
|
[REN] rename product characterisic into attributes
bzr revid: al@openerp.com-20140130221710-nf2ircxgx3vr1spy
|
2014-01-30 23:17:10 +01:00 |
|
|
Christophe Matthieu
|
5e10f80cd4
|
[fix] website: test tour
bzr revid: chm@openerp.com-20140130215717-h211wj65wl20zfru
|
2014-01-30 22:57:17 +01:00 |
|
|
jke-openerp
|
f1204ee9c3
|
[FIX] Fix bug with demo data from delivery module. We create a grid, but without specify to "use_detailed_pricelist"
bzr revid: jke@openerp.com-20140130214944-c5fg5mp8bitt86uy
|
2014-01-30 22:49:44 +01:00 |
|
|
jke-openerp
|
1fb3cccef4
|
[FIX] Use only published carrier_delivery
bzr revid: jke@openerp.com-20140130212748-57udob0yxz73775r
|
2014-01-30 22:27:48 +01:00 |
|
|
openerp-sle
|
d34abbf1cc
|
[FIX] harmonize website_customer, website_crm_partner_assign and website_membership views
bzr revid: openerp-sle@openerp-sle.home-20140130212434-pqvwrrcd355y77id
|
2014-01-30 22:24:34 +01:00 |
|
|
Fabien Meghazi
|
1931c307a2
|
[IMP] Improved qweb exeptions handling
bzr revid: fme@openerp.com-20140130212053-fkb9ug49qun54ehi
|
2014-01-30 22:20:53 +01:00 |
|
|
jke-openerp
|
895088a91a
|
[FIX] Remove delivery amount from get_price. Else some codes use the delivery amount in the total to compute itself.
Eg: An order of 290$ wih delivery amount of 20$ --> Delivery free if getPrice>300$ -> Delivery = 0$
bzr revid: jke@openerp.com-20140130211649-0x9ryb3349vn7ubh
|
2014-01-30 22:16:49 +01:00 |
|
|
Christophe Matthieu
|
110f3dd910
|
[IMP] website tour: refactoring: Check dom insead of trigger
bzr revid: chm@openerp.com-20140130210001-kiecx5nde2um3ni1
|
2014-01-30 22:00:01 +01:00 |
|
|
Denis Ledoux
|
320b840341
|
[FIX] website_membership, website_customer: keep search, country and assocations when jumping from each other of these filters + count fix between partners displayed and group by country count + fix country orders in website_customer
bzr revid: dle@openerp.com-20140130205713-09cbldm9r9pm6r1i
|
2014-01-30 21:57:13 +01:00 |
|
|
Fabien Meghazi
|
fc979b9a7a
|
[FIX] url_for()
bzr revid: fme@openerp.com-20140130195043-pkfkmqg80c2yk5p5
|
2014-01-30 20:50:43 +01:00 |
|
|
Fabien Pinckaers
|
60fc222a18
|
[REM] unused file
bzr revid: fp@tinyerp.com-20140130195002-713rvmzn7e8iz7xl
|
2014-01-30 20:50:02 +01:00 |
|
|
Fabien Pinckaers
|
a1b95f6823
|
[FIX] Customize menu
bzr revid: fp@tinyerp.com-20140130194227-b5brj96f8tgc88hf
|
2014-01-30 20:42:27 +01:00 |
|
|
Denis Ledoux
|
f85065930e
|
[FIX]website_customer, website_crm_partner_assign: keep search if jump between countries, and keep countries if do a new search.
bzr revid: dle@openerp.com-20140130193706-xxn668p2edr69zue
|
2014-01-30 20:37:06 +01:00 |
|
|
Olivier Dony
|
211f3b74b8
|
[IMP] website theme: update themes to fix CSS glitches, add Yeti theme, fix Default theme thumbnail
Also removed empty static/img directory, images are in static/src/img
bzr revid: odo@openerp.com-20140130185359-z6oomlng9iguxt50
|
2014-01-30 19:53:59 +01:00 |
|
|
Fabien Pinckaers
|
51af63eeb7
|
[FIX] margin left fa-envelop
bzr revid: fp@tinyerp.com-20140130182558-63lw9szcro3qmjee
|
2014-01-30 19:25:58 +01:00 |
|
|
Olivier Dony
|
74ce50fe6e
|
[FIX] hr.holidays test: adapt assertRaises due to constraint validation change in server
See revision odo@openerp.com-20140130094337-7g8ez92viwmbzbft in server
bzr revid: odo@openerp.com-20140130182351-m8mwjz4pbglm8af7
|
2014-01-30 19:23:51 +01:00 |
|
|
Frédéric van der Essen
|
ba2d4c9030
|
[IMP] point_of_sale, hw_escpos: hopefully much faster printing on the posbox by caching logo conversion
bzr revid: fva@openerp.com-20140130182109-11njt0khmylp0r7p
|
2014-01-30 19:21:09 +01:00 |
|
|
Fabien Pinckaers
|
cf2349d63c
|
[FIX] Create an event
bzr revid: fp@tinyerp.com-20140130181638-ww2dor24eshzc81c
|
2014-01-30 19:16:38 +01:00 |
|
|
Christophe Simonis
|
fb69a8bf70
|
[IMP] website: use company logo
bzr revid: chs@openerp.com-20140130181210-y5zbmtc0fimcn9ia
|
2014-01-30 19:12:10 +01:00 |
|
|
Fabien Pinckaers
|
9d7689a553
|
[FIX] typo
bzr revid: fp@tinyerp.com-20140130180424-ffbo1hef07tzxtuq
|
2014-01-30 19:04:24 +01:00 |
|
|
Fabien Pinckaers
|
3503c056f3
|
[FIX] warning on event type missing removed
bzr revid: fp@tinyerp.com-20140130175733-uriko32hjdsy593w
|
2014-01-30 18:57:33 +01:00 |
|
|
Fabien Pinckaers
|
6babc654da
|
[FIX] description of tracks
bzr revid: fp@tinyerp.com-20140130175153-0uy7z55pjbt058gj
|
2014-01-30 18:51:53 +01:00 |
|
|
jke-openerp
|
420e819b1f
|
[FIX] Recompute price at each updates of cart, Fix bug with carrier at payment.
bzr revid: jke@openerp.com-20140130173705-wevz607c5djid9ux
|
2014-01-30 18:37:05 +01:00 |
|
|
Denis Ledoux
|
76b74e16c2
|
[FIX] website_crm_partner_assign: keep search if jump between countries, and keep countries if do a new search
bzr revid: dle@openerp.com-20140130172629-k6qgwd3ongp6bkfl
|
2014-01-30 18:26:29 +01:00 |
|
|
Olivier Dony
|
d248bcb33a
|
[FIX] event_sale: consistent addition of event-related fields on products and templates
bzr revid: odo@openerp.com-20140130172422-wvq804yizh5x3xe0
|
2014-01-30 18:24:22 +01:00 |
|
|
Fabien Pinckaers
|
f7f61a4bfe
|
[FIX] talk proposal
bzr revid: fp@tinyerp.com-20140130165111-wqbxtvkqpx08fgwv
|
2014-01-30 17:51:11 +01:00 |
|
|
Fabien Pinckaers
|
24fc336eb5
|
[IMP] event layout
bzr revid: fp@tinyerp.com-20140130164335-4a3cx3espjtf9rre
|
2014-01-30 17:43:35 +01:00 |
|
|
Denis Ledoux
|
ba09b1d439
|
[FIX] website_customer: keep search even if we change the country, list of country display all countries where there is at least one matching result
bzr revid: dle@openerp.com-20140130163639-5z0pt5npgk0t3u8k
|
2014-01-30 17:36:39 +01:00 |
|
|
Fabien Pinckaers
|
6dca5f8f1c
|
[IMP] remove print statement
bzr revid: fp@tinyerp.com-20140130163350-buaj84dfyjwwxn7o
|
2014-01-30 17:33:50 +01:00 |
|
|
Fabien Pinckaers
|
3b48a82af5
|
[FIX] events
bzr revid: fp@tinyerp.com-20140130163321-f86eq7obsua6x6z9
|
2014-01-30 17:33:21 +01:00 |
|
|
Olivier Dony
|
78fefd54f0
|
[IMP] website tests: unicode test attributes to avoid warnings in auto_init when comparing attr values
bzr revid: odo@openerp.com-20140130162615-nx7f3nhifwqo357u
|
2014-01-30 17:26:15 +01:00 |
|
|
Denis Ledoux
|
a4a25292e7
|
[FIX]website_customer: group by country based on the result of the search, + do not display '0' right to All countries if no result + display 'No result found'
bzr revid: dle@openerp.com-20140130161132-cbn9z0i7aphzdrbn
|
2014-01-30 17:11:32 +01:00 |
|
|
openerp-sle
|
650a0b021c
|
[FIX] website_membership: need to add website_sale in the dependancies list for membership sorting as website_sequence is defined there
bzr revid: openerp-sle@openerp-sle.home-20140130155802-f8kuvin9ih41gr48
|
2014-01-30 16:58:02 +01:00 |
|
|
Denis Ledoux
|
a2fba1c288
|
[FIX] website_membership: do not display '0' in country list head if there is no result
bzr revid: dle@openerp.com-20140130155600-bh412ye3sqsao56p
|
2014-01-30 16:56:00 +01:00 |
|
|
Gery Debongnie
|
62aad0c4b8
|
[MERGE] merge trunk-new-graphview-ged into trunk (mainly a short bug fix in data.js
bzr revid: ged@openerp.com-20140130155516-0fca2sngu8x0gmkz
|
2014-01-30 16:55:16 +01:00 |
|
|
Gery Debongnie
|
1c42440313
|
[MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140130155402-h4y6k4ydk6s2yasv
|
2014-01-30 16:54:02 +01:00 |
|
|
Gery Debongnie
|
fe4f692793
|
[MERGE] merge formatting fix from trunk-new-graphview-ged (date formatting)
bzr revid: ged@openerp.com-20140130155240-tfygb8jqe1bs545w
|
2014-01-30 16:52:40 +01:00 |
|
|
Gery Debongnie
|
e98a1a8f64
|
[MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140130155158-zwddmty5a79mcn90
|
2014-01-30 16:51:58 +01:00 |
|
|
Gery Debongnie
|
02313ae739
|
[IMP] improves the formatting of the dates returned by read_group in orm.py (for ex, January -> January 2014 or W4 -> W4 2014)
bzr revid: ged@openerp.com-20140130155117-ldsq4tjat96ustd8
|
2014-01-30 16:51:17 +01:00 |
|
|
Denis Ledoux
|
369a88a5a1
|
[FIX] event_sale, website_event: copy paste errors in views
bzr revid: dle@openerp.com-20140130154910-xmg8dehh0zubgif8
|
2014-01-30 16:49:10 +01:00 |
|
|
Frédéric van der Essen
|
bc39772f0a
|
[FIX] point_of_sale: add port and protocol to forced proxy ip if necessary
bzr revid: fva@openerp.com-20140130154352-z2ulesl1wliodwja
|
2014-01-30 16:43:52 +01:00 |
|
|
Gery Debongnie
|
8ed584d1ac
|
[FIX] simplify a computation of raw_fields to make sure it doesn't crash (_.contains expects a list, and not a string) (addon web)
bzr revid: ged@openerp.com-20140130153700-2lno0uefta93ex53
|
2014-01-30 16:37:00 +01:00 |
|