63fc1d7f35
Merge trunk
...
bzr revid: ddm@openerp.com-20140203092711-03yvclkue6eboqir
2014-02-03 10:27:11 +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
Richard Mathot (OpenERP)
e534d4ba5c
[IMP] Quizz mode
...
bzr revid: rim@openerp.com-20140203082409-hqg940320ds5or5m
2014-02-03 09:24:09 +01:00
Parth Gajjar (Open ERP)
e942cb2cd0
[IMP] moved graph JavaScript from template to separate JS file (using AJAX), removed static copy of graph library
...
bzr revid: pga@tinyerp.com-20140203073439-mj21tfw6a0mg56v1
2014-02-03 13:04:39 +05:30
9b25045d95
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055616-29ji7mugvwf3jpmn
2014-02-03 05:56:16 +00:00
2a297c3b2f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065247-b0hmat9ikp0cj2sx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202055930-0e8qd9refwne4999
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055525-2z3nfmfb0t7lpqpf
2014-02-03 05:55:25 +00:00
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
ajay javiya (OpenERP)
cdd0470877
[MERGE]: with main
...
bzr revid: aja@tinyerp.com-20140203051026-n7bw5f26kzu94obx
2014-02-03 10:40:26 +05:30
Dharmraj Jhala (OpenERP)
9f7dd63acd
[MERGE] with trunk-survey2-rim
...
bzr revid: dizzy.zala@gmail.com-20140203050752-mu2067skmaxivk51
2014-02-03 10:37:52 +05:30
Mahendra Barad (OpenERP)
92fb702d9f
[REV]revert last rev
...
bzr revid: mba@tinyerp.com-20140203045540-nw863fk48tiwmgwr
2014-02-03 10:25:40 +05:30
Richard Mathot (OpenERP)
3ceb0e8a3f
[REM]
...
bzr revid: rim@openerp.com-20140202162549-i16bdqlm80uqp6pc
2014-02-02 17:25:49 +01:00
Richard Mathot (OpenERP)
7f0c30580b
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140131154544-tfcci0uo0q6652jh
bzr revid: rim@openerp.com-20140202135602-82pcqeqqtdp6h9fr
2014-02-02 14:56:02 +01:00
Richard Mathot (OpenERP)
55af2a1d48
[MERGE] Sync with trunk-website-al
...
bzr revid: rim@openerp.com-20140202135507-rug48570brhwd646
2014-02-02 14:55:07 +01:00
jke-openerp
c18d350468
[FIX] Fix bug where button with contenteditable does not work in cross browser. Fix : replace tag 'button' by 'a' with class 'a-submit'
...
bzr revid: jke@openerp.com-20140201204741-ygdxaauq0m5axttg
2014-02-01 21:47:41 +01:00
jke-openerp
6abf20906e
[Typo] Replace t-esc in t-field for amount_untaxed in checkout of website_sale. Else display monetary does not work
...
bzr revid: jke@openerp.com-20140201200413-zww5pcobl6vmvqe1
2014-02-01 21:04:13 +01: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
7d67db1aed
Merge trunk
...
bzr revid: ddm@openerp.com-20140131172655-z2a4wqy75elho8v7
2014-01-31 18:26:55 +01:00
c5da05715c
Merge trunk
...
bzr revid: ddm@openerp.com-20140131171707-62mipquizz9k36ko
2014-01-31 18:17:07 +01:00
5a07191a9d
[FIX] Re-enable UI tests
...
bzr revid: ddm@openerp.com-20140131171619-ctiww3na8wm53rzf
2014-01-31 18:16:19 +01:00
Laurent Mignon (Acsone)
476a0b620d
[FIX] ir_cron: use the same search criteria as when listing job to excecyte when acquiring the lock on the job before its execution to prevent running already executed job
...
bzr revid: laurent.mignon@acsone.eu-20140131163210-2sw8f2e5n4my5o5l
2014-01-31 17:32:10 +01:00
Denis Ledoux
3e4d932c58
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9801 revid:mat@openerp.com-20140131160304-22mokur2uuo1cw4r
...
bzr revid: dle@openerp.com-20140131162637-046v995ozpy22qjj
2014-01-31 17:26:37 +01:00
Martin Trigaux
62d72aa238
[FIX] stock: when creating manufacturing order from procurement workflow, do not write location on state (already set previously). (opw 603600)
...
This avoids having an access rights error when trying to write on a move in done state (eg: in case of force availibility)
bzr revid: mat@openerp.com-20140131160304-22mokur2uuo1cw4r
2014-01-31 17:03:04 +01:00
Xavier Morel
e9a3d8bcec
[FIX] enable jsonrpc-auth tests, remove stray log
...
bzr revid: xmo@openerp.com-20140131154147-oi30v8u8h3c3htx7
2014-01-31 16:41:47 +01:00
Xavier Morel
8be916910e
[FIX] re-enable web_tests_demo tests
...
bzr revid: xmo@openerp.com-20140131152753-81418oy8wjzxkgmt
2014-01-31 16:27:53 +01:00
Richard Mathot (OpenERP)
308a3def95
[REM] Old code
...
bzr revid: rim@openerp.com-20140131152656-ieutl7s9rg313fh9
2014-01-31 16:26:56 +01:00
Xavier Morel
ae3223907b
[FIX] modules initialization when testing
...
broken "adaptation" to single-instance openerp would only initialize the first
set of dependencies, any further module would see its test runs without itself
or its dependencies being guaranteed to be initialized/installed into the
current openerp instance.
bzr revid: xmo@openerp.com-20140131152640-coxqulkdb0xupbvq
2014-01-31 16:26:40 +01:00
Richard Mathot (OpenERP)
35fe898793
[IMP] Quizz mode
...
bzr revid: rim@openerp.com-20140131152640-9j43vm5jxvjqwjd6
2014-01-31 16:26:40 +01:00
Xavier Morel
b78703c122
[IMP] console.log js output should be piped to stdout during JS tests
...
bzr revid: xmo@openerp.com-20140131152612-rqxkge24w6p95q10
2014-01-31 16:26:12 +01:00
9428c563d5
chm patch
...
bzr revid: ddm@openerp.com-20140131132243-xsahk1e6rikv0a34
2014-01-31 14:22:43 +01:00
Mahendra Barad (OpenERP)
66cd601666
[IMP]added font
...
bzr revid: mba@tinyerp.com-20140131124941-6avc8u8ra7gcpwqi
2014-01-31 18:19:41 +05:30
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
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
Mahendra Barad (OpenERP)
1b9b674684
[IMP]imporved css
...
bzr revid: mba@tinyerp.com-20140131114041-h33ognwu2pzdw4gt
2014-01-31 17:10:41 +05:30
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
ajay javiya (OpenERP)
c556c0b54b
[FIX] : Header should have full height background and revert unwanted chages
...
bzr revid: aja@tinyerp.com-20140131113325-ry2fi5poilcx0498
2014-01-31 17:03:25 +05:30
Xavier Morel
99743cae43
[REM] useless comment
...
the database password is necessary to duplicate databases
bzr revid: xmo@openerp.com-20140131110748-nfguxwjysgbn6y3y
2014-01-31 12:07:48 +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
Martin Trigaux
23de024718
[IMP] attachement: remove unnecessary redraw added at rev 4128 and change message to be the same than in mail
...
bzr revid: mat@openerp.com-20140131102836-e89xo4nrwk32uij8
2014-01-31 11:28:36 +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
Mahendra Barad (OpenERP)
f0da1bd3c3
[IMP]reload bg color if image not present
...
bzr revid: mba@tinyerp.com-20140131094157-gny5h8ngn8jbo8xy
2014-01-31 15:11:57 +05:30
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
ddm@openerp.com