2e214db155
Merge trunk
...
bzr revid: ddm@openerp.com-20140203151754-o5ijkuzxnjtqhekp
2014-02-03 16:17:54 +01:00
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
6a20494b50
[IMP] Microdata for event list page
...
bzr revid: ddm@openerp.com-20140203144608-l2yb7o5o9uq74hor
2014-02-03 15:46:08 +01:00
Christophe Simonis
ef14282df0
[FIX] tests: pass correct passwords to js
...
bzr revid: chs@openerp.com-20140203141506-zmfhd7g0zorveb5v
2014-02-03 15:15:06 +01:00
Xavier Morel
85579973a5
[ADD] large throbber
...
bzr revid: xmo@openerp.com-20140203160237-jlvp70gnkny2fx98
2014-02-03 17:02:37 +01:00
e31d566ff0
[IMP] Event microdata support
...
bzr revid: ddm@openerp.com-20140203140829-if35stozydxwk5xw
2014-02-03 15:08:29 +01:00
Martin Trigaux
897cafed99
[MERGE] [FIX] read_group: aggregate values on all columns instead of only the one of the current model
...
Without this you could not have a sum value on a column belonging to the parent model (eg: 'unit_amount' when grouping on hr.analytic.timesheet)
bzr revid: mat@openerp.com-20140203140247-n090tx2yf8mujkcz
2014-02-03 15:02:47 +01:00
Martin Trigaux
5f10bec1a0
[IMP] better assert message and cleaning
...
bzr revid: mat@openerp.com-20140203134051-lgwo4v0rdntgxyor
2014-02-03 14:40:51 +01:00
Martin Trigaux
6ea8851fd0
[ADD] test read_group on a column of _inherits model and group on right field
...
bzr revid: mat@openerp.com-20140203133331-mujvv812zd971ci2
2014-02-03 14:33:31 +01:00
Fabien Meghazi
2638b11f38
[MERGE] saas-3
...
bzr revid: fme@openerp.com-20140203133132-4pljci0aiofv4o2q
2014-02-03 14:31:32 +01:00
Parth Gajjar (Open ERP)
c8beefd3cf
[IMP] removed panel structure from page and question
...
bzr revid: pga@tinyerp.com-20140203132357-jt9qxkiu019j9o21
2014-02-03 18:53:57 +05:30
Christophe Matthieu
33353c6ebc
[FIX] website_sale: extend time for test tour
...
bzr revid: chm@openerp.com-20140203131539-fva4au60w4ic46c5
2014-02-03 14:15:39 +01:00
319185a1ed
[FIX] Remove redundant microdata
...
bzr revid: ddm@openerp.com-20140203131454-7h3t2x4ff1z085xi
2014-02-03 14:14:54 +01:00
Anael Closson
f6207124f9
[FIX] OPW 598942 : orm read_group doesn't take referenced fields or aggregated fields in account when sorting
...
Sorting was done using a search on ids that where found in a custom SQL field,
only 1 record among aggregated records with same groupby value was used
when using search for ordering, resulting data ordered on
max(aggregated_data).field_value instead of sum(aggregated_data.field_value).
lp bug: https://launchpad.net/bugs/106086 fixed
bzr revid: acl@openerp.com-20140203125854-ypi0bu0lbhatg9b1
2014-02-03 13:58:54 +01:00
0733d51365
[IMP] Organization microdata
...
bzr revid: ddm@openerp.com-20140203124718-8ogunilwsvm42ikt
2014-02-03 13:47:18 +01:00
Fabien Meghazi
967c9db196
[FIX] never let me commit in saas-3 again
...
bzr revid: fme@openerp.com-20140203124516-l8wwu9vdyo2nu2s0
2014-02-03 13:45:16 +01:00
Christophe Matthieu
67e0806547
[FIX] website_sale: test tour and bootstrap col layout
...
bzr revid: chm@openerp.com-20140203123354-xt5zco6rz92z3str
2014-02-03 13:33:54 +01:00
Martin Trigaux
cafa5e7854
[FIX] orm: read_group aggregates values on all columns instead of only the one of the parent model
...
bzr revid: mat@openerp.com-20140203123311-38rwp7tfyc08flid
2014-02-03 13:33:11 +01:00
Fabien Meghazi
4bf0284d4b
[IMP] Cosmetic change for easier debugging
...
bzr revid: fme@openerp.com-20140203122300-pduwmt5z5cprehey
2014-02-03 13:23:00 +01:00
Xavier Morel
5de043e044
[FIX] various issues with JS tests
...
bzr revid: xmo@openerp.com-20140203120553-foe2jutor33j1b8q
2014-02-03 13:05:53 +01:00
Mohammed Shekha (OpenERP)
15813479f5
[FIX]Fixed the issue of html field import fails, because of no converter found for str to html.
...
bzr revid: msh@openerp.com-20140203120525-ui117od6lpksm1bq
2014-02-03 17:35:25 +05:30
Christophe Matthieu
d08ca544db
[MERGE] from sass-3
...
bzr revid: chm@openerp.com-20140203120437-5a1w6v46vrokkr5d
2014-02-03 13:04:37 +01:00
Xavier Morel
0aa0bbd539
[FIX] add warning when dbfilter logs out current session
...
bzr revid: xmo@openerp.com-20140203115633-es2o542ywg85d46i
2014-02-03 12:56:33 +01:00
Gery Debongnie
f2cb468942
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140203113422-u6j8pk275u0lpa6o
2014-02-03 12:34:22 +01:00
Gery Debongnie
882fde48f0
[IMP] work in progress: adds the export functionality in graph view (addon web_graph)
...
bzr revid: ged@openerp.com-20140203113332-fvr9cra2dhj4h0ju
2014-02-03 12:33:32 +01:00
Christophe Matthieu
d23f8425ad
[FIX] website tour: flickering; banner auto run; work with different language
...
bzr revid: chm@openerp.com-20140203112816-c350lxr5pgo9x2li
2014-02-03 12:28:16 +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
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
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
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
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
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
ddm@openerp.com