Commit Graph
81214 Commits
Author SHA1 Message Date
ddm@openerp.com e1661776ff Merge trunk
bzr revid: ddm@openerp.com-20140205080002-wvi80x4oycm6yi3j
2014-02-05 09:00:02 +01:00
ddm@openerp.com 706881ab38 [FIX] Proper ticket price micodata
bzr revid: ddm@openerp.com-20140205075141-xxedwfwf3lz2v0ej
2014-02-05 08:51:41 +01:00
Launchpad Translations on behalf of openerp 6400ffb5e5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204055105-bumib76esi2di1lu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204061211-5sehiztcrv9vrxp6
2014-02-04 06:12:11 +00:00
Launchpad Translations on behalf of openerp 974bcdf97e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204055041-y3n9csfmrqvglcqs
2014-02-04 05:50:41 +00:00
ddm@openerp.com 6818f6f84b Merge trunk
bzr revid: ddm@openerp.com-20140203174624-ad5knhf7zo4rz36y
2014-02-03 18:46:24 +01:00
ddm@openerp.com af2db3b19d [IMP] Microdata for product
bzr revid: ddm@openerp.com-20140203174422-tah5bx94y9mctlei
2014-02-03 18:44:22 +01:00
ddm@openerp.com 9e12243350 [IMP] Microdata for product list (+description)
bzr revid: ddm@openerp.com-20140203165853-g3nt28nzbe59gbvl
2014-02-03 17:58:53 +01:00
ddm@openerp.com 2d4d872300 [IMP] Microdata for product list
bzr revid: ddm@openerp.com-20140203165536-5wxskybc50fdd8x3
2014-02-03 17:55:36 +01:00
Frédéric van der Essen 2b6ec868e7 [MERGE] point_of_sale: open the cashbox on payment validation
bzr revid: fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq
2014-02-03 16:32:33 +01:00
Frédéric van der Essen 73569da5e8 [IMP] point_of_sale: open cashbox on payment validation and not on payment method selection
bzr revid: fva@openerp.com-20140203153102-kfdaoaoo50mbudpk
2014-02-03 16:31:02 +01:00
ddm@openerp.com 2e214db155 Merge trunk
bzr revid: ddm@openerp.com-20140203151754-o5ijkuzxnjtqhekp
2014-02-03 16:17:54 +01:00
ddm@openerp.com 2646680a45 [IMP] Microdata for event tickets
bzr revid: ddm@openerp.com-20140203151648-hggq6pc54ayuqzj5
2014-02-03 16:16:48 +01:00
Frédéric van der Essen 51520b3393 [MERGE] hw_escpos: fixes for the cashbox opening
bzr revid: fva@openerp.com-20140203144847-21cv7pt7lnlxdsve
2014-02-03 15:48:47 +01:00
Frédéric van der Essen 689fb009a0 [FIX] hw_escpos: fix cashbox opening
bzr revid: fva@openerp.com-20140203144725-py0sdlvas927p76k
2014-02-03 15:47:25 +01:00
ddm@openerp.com 6a20494b50 [IMP] Microdata for event list page
bzr revid: ddm@openerp.com-20140203144608-l2yb7o5o9uq74hor
2014-02-03 15:46:08 +01:00
ddm@openerp.com e31d566ff0 [IMP] Event microdata support
bzr revid: ddm@openerp.com-20140203140829-if35stozydxwk5xw
2014-02-03 15:08:29 +01:00
ddm@openerp.com 319185a1ed [FIX] Remove redundant microdata
bzr revid: ddm@openerp.com-20140203131454-7h3t2x4ff1z085xi
2014-02-03 14:14:54 +01:00
ddm@openerp.com 0733d51365 [IMP] Organization microdata
bzr revid: ddm@openerp.com-20140203124718-8ogunilwsvm42ikt
2014-02-03 13:47:18 +01:00
Frédéric van der Essen 49d60fbaa4 [MERGE] from trunk
bzr revid: fva@openerp.com-20140203105147-1rwz4ja8q5y4gqe8
2014-02-03 11:51:47 +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
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