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
Fabien Meghazi
6be5db45b0
[IMP] QWeb exceptions shall not shadow original exceptions
...
bzr revid: fme@openerp.com-20140130211708-5i9lpi4ddn7a2xbe
2014-01-30 22:17:08 +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
Fabien Meghazi
9cc89156cc
[REM] outdated disable_db
...
bzr revid: fme@openerp.com-20140130210612-su04ki3zlv043bvz
2014-01-30 22:06:12 +01:00
Fabien Meghazi
4b70011c12
[FIX] ir_ui_view#read_template() bring back old behavious, raises ValueError if xmlid not found
...
bzr revid: fme@openerp.com-20140130210154-llo2tjl323k0yxyr
2014-01-30 22:01:54 +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
171408280c
[FIX] res.partner: properly (re)compute display_name and commercial_partner_id on inactive partners
...
bzr revid: odo@openerp.com-20140130192848-orv1glg2j26wdpml
2014-01-30 20:28:48 +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
Christophe Simonis
ca844edcf8
[IMP] web: alternative routes for company logo
...
bzr revid: chs@openerp.com-20140130180827-xior7wc6shtamcgu
2014-01-30 19:08:27 +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
Christophe Simonis
7a0262a4d5
[FIX] allow "none" route to be accessible when logged in
...
bzr revid: chs@openerp.com-20140130162626-z83x9e6ekdfqku0a
2014-01-30 17:26:26 +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
Christophe Simonis
83bd83dc63
[REVERT] revert commit 5210 chs@openerp.com-20140130150628-qqbno0nu8mp27b9u: bring back magic
...
bzr revid: chs@openerp.com-20140130162041-63wbcsq1udxw529f
2014-01-30 17:20:41 +01:00
Olivier Dony
7e6be99a63
[IMP] res.partner: more selective child_of _search() hack
...
Makes the conditions for disabling the `active` test
on res.partner.search() more selective, to avoid
triggering it when we are not actually searching for
the children of specific parents.
(Broke base tests now that data includes an deactivated
partner)
bzr revid: odo@openerp.com-20140130162419-09tit4cyef570aze
2014-01-30 17:24:19 +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
Olivier Dony
c3c0705203
[FIX] ir.ui.view: fix tests after refactoring of ir.ui.view/qweb view processing
...
bzr revid: odo@openerp.com-20140130154354-6xg4mx31to4dg0ql
2014-01-30 16:43:54 +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
Olivier Dony
5908a45e47
[FIX] ir.ui.view: better error message upon missing model for non-qweb views, misc cleanup
...
bzr revid: odo@openerp.com-20140130154349-rnwjz0bgxp6vdxwu
2014-01-30 16:43:49 +01:00
Olivier Dony
79dc0235cd
[IMP] orm: log underlying exception at DEBUG level when a constraint check raises
...
bzr revid: odo@openerp.com-20140130154100-rdr1n5u1aiz9cbk3
2014-01-30 16:41:00 +01:00
Olivier Dony
0428c00e2f
[FIX] browse_record.__str__: avoid crashing when ID is None
...
bzr revid: odo@openerp.com-20140130153955-naxbrcz5pv17z4rq
2014-01-30 16:39:55 +01:00