Quentin (OpenERP)
|
753f7541db
|
[MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
|
2014-02-03 18:30:00 +01:00 |
Martin Trigaux
|
c25827f845
|
[MERGE] Forward port of saas-3 branch up to revid 9093 mat@openerp.com-20140203091848-9kspakimqorltvxx
bzr revid: mat@openerp.com-20140203095528-xo1u0vah94edmbub
|
2014-02-03 10:55:28 +01:00 |
|
Martin Trigaux
|
a9ea8c2275
|
[FIX] gamification_sale_crm: in demo data, end_date is last day of month, not 31th of month
bzr revid: mat@openerp.com-20140203091848-9kspakimqorltvxx
|
2014-02-03 10:18:48 +01:00 |
|
Quentin (OpenERP)
|
3d392cab4e
|
[MERGE] branch with fixes of picking wave
bzr revid: qdp-launchpad@openerp.com-20140203072833-tda8bncaanf0b36j
|
2014-02-03 08:28:33 +01:00 |
Launchpad Translations on behalf of openerp
|
4208281471
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201060213-5gub5wavdno2vcu4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202053135-qolj2vd2n4tjwbp3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203051828-wflc11kw2q8wc0aq
|
2014-02-03 05:18:28 +00:00 |
Antony Lesuisse
|
5960d495e5
|
[FIX] website_sale typo feh police
bzr revid: al@openerp.com-20140201121415-pxnhjdc4o3tp91hj
|
2014-02-01 13:14:15 +01:00 |
Xavier Morel
|
830618d871
|
[IMP] oe: get db password from config file
bzr revid: xmo@openerp.com-20140131114828-b90z3pxql63ky6gp
|
2014-01-31 12:48:28 +01:00 |
Christophe Simonis
|
46cbf22efb
|
[FIX] allow to use "dbname" as keyword in routes
bzr revid: chs@openerp.com-20140131163139-89lfordriamw9i1w
|
2014-01-31 17:31:39 +01:00 |
|
Antony Lesuisse
|
059715b348
|
[MERGE] trunk-website-al fix tour startup
bzr revid: al@openerp.com-20140131132610-orsceg18a31hifch
|
2014-01-31 14:26:10 +01:00 |
|
ddm@openerp.com
|
9428c563d5
|
chm patch
bzr revid: ddm@openerp.com-20140131132243-xsahk1e6rikv0a34
|
2014-01-31 14:22:43 +01:00 |
Olivier Dony
|
e846c499e8
|
[REL] version: 7.~saas-3
bzr revid: odo@openerp.com-20140131122313-zaet2jih5dg76qu6
|
2014-01-31 13:23:13 +01:00 |
Frédéric van der Essen
|
8342a7c51d
|
[FIX] point_of_sale: update redirection system with the website-al changes
bzr revid: fva@openerp.com-20140131114542-09hnjju5sdcen20q
|
2014-01-31 12:45:42 +01:00 |
Fabien Meghazi
|
5451f5587d
|
[REV] Bring back QWebExceptions
bzr revid: fme@openerp.com-20140131113611-wee3xvnvzw9smq2r
|
2014-01-31 12:36:11 +01:00 |
|
Fabien Meghazi
|
fa61a1e5a7
|
[REV] Bring back QWebException, rename QWebException#inner to 'cause'
bzr revid: fme@openerp.com-20140131113515-ahcix3h6uzzdz8ix
|
2014-01-31 12:35:15 +01:00 |
Denis Ledoux
|
54dff0857d
|
[ADD]web: controller to redirect /apps/{appname} to install module form (not yet perfect, the menu is not displayed, but meanwhile this is something)
bzr revid: dle@openerp.com-20140131113347-twndgtaq6d16eycc
|
2014-01-31 12:33:47 +01:00 |
|
Fabien Meghazi
|
3fac414239
|
[FIX] CORS routing should use new routing api
bzr revid: fme@openerp.com-20140131104840-e0557qke365ym2x4
|
2014-01-31 11:48:40 +01:00 |
Nicolas Wisniewski
|
93bbdc6b53
|
[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)
bzr revid: nwi@openerp.com-20140228110637-dh15ixb2nppikuif
|
2014-02-28 12:06:37 +01:00 |
|
Olivier Dony
|
c52cd95348
|
[IMP] website_crm_partner_assign: move partner grade filter in the left column
bzr revid: odo@openerp.com-20140131104232-62nc8wua8xflrd64
|
2014-01-31 11:42:32 +01:00 |
|
Frédéric van der Essen
|
a45ae1384c
|
[IMP] point_of_sale: increased size of logo on receipt
bzr revid: fva@openerp.com-20140131102245-hhshe83xuanllhyt
|
2014-01-31 11:22:45 +01:00 |
|
Fabien Meghazi
|
526c5fb6cb
|
[FIX] Login redirection problem
bzr revid: fme@openerp.com-20140131095606-xlyzzhm2tc0myq0s
|
2014-01-31 10:56:06 +01:00 |
|
Olivier Dony
|
1d147f0392
|
[FIX] website*: no border for customer/reseller/member entries + extra bottom margin on left column
bzr revid: odo@openerp.com-20140131093902-n3h10eflemmjvlyt
|
2014-01-31 10:39:02 +01:00 |
|
Olivier Dony
|
1a63261096
|
[IMP] website apps flagged as such: website, website_event (replaces event), website_blog, website_sale
bzr revid: odo@openerp.com-20140131092721-r8ye1nc6abbgrg5j
|
2014-01-31 10:27:21 +01:00 |
Fabien Pinckaers
|
dc42b875b3
|
[IMP] missing picture
bzr revid: fp@tinyerp.com-20140131091149-e7whsr3cbj6p54ci
|
2014-01-31 10:11:49 +01:00 |
|
Olivier Dony
|
09d7908b28
|
[IMP] website themes: simpler wording
bzr revid: odo@openerp.com-20140131084821-703lcteu3ipfoiji
|
2014-01-31 09:48:21 +01:00 |
|
Launchpad Translations on behalf of openerp
|
807f7d87e4
|
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140131060902-49qieib6km3uwgli
|
2014-01-31 06:09:02 +00:00 |
|
Antony Lesuisse
|
974c666bcd
|
[REV] website qweb dont change exception types
bzr revid: al@openerp.com-20140131011427-3bome249kut8fs3t
|
2014-01-31 02:14:27 +01:00 |
|
Antony Lesuisse
|
f119c818c7
|
[REV] never change exceptions types
bzr revid: al@openerp.com-20140131010802-5zh9m5jc1ajnp5wj
|
2014-01-31 02:08:02 +01:00 |
|
Antony Lesuisse
|
d6c1346e12
|
[MERGE] trunk-website-al
bzr revid: al@openerp.com-20140131005207-mn7t6tar8cywe9hz
|
2014-01-31 01:52:07 +01:00 |
|
Antony Lesuisse
|
f051043a26
|
[MERGE] trunk-website-al
bzr revid: al@openerp.com-20140131005202-sjsfy3tc8ys1a325
|
2014-01-31 01:52:02 +01:00 |
|
Antony Lesuisse
|
4b30f1fcbd
|
[MERGE] trunk-website-al
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
|
2014-01-31 01:51:57 +01:00 |
|
Antony Lesuisse
|
698d02e3b5
|
web disable jsonrpc test
bzr revid: al@openerp.com-20140131003956-jo9grgfizich2dlu
|
2014-01-31 01:39:56 +01:00 |
|
Fabien Pinckaers
|
849125efd2
|
[FIX] removing test that commits and small fix
bzr revid: fp@tinyerp.com-20140131002701-4eaggu8tszph4vl5
|
2014-01-31 01:27:01 +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 |
|
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 |