Commit Graph
85003 Commits
Author SHA1 Message Date
Denis Ledoux bd4f015533 [FIX]stock: product Forecasted Quantity, incoming and outgoing help tooltip were half removed
bzr revid: dle@openerp.com-20140204100835-z0mlvoot21yoz0z3
2014-02-04 11:08:35 +01:00
Mahendra Barad (OpenERP) 59cc4f2d7f [ADD]demo data
bzr revid: mba@tinyerp.com-20140204095958-kx27zprz58g2e680
2014-02-04 15:29:58 +05:30
Parth Gajjar (Open ERP) 51b1eb6fbf [IMP] moved pagination script in separate js file,and solved minor issues
bzr revid: pga@tinyerp.com-20140204095157-0mfdy27l9l73dxf5
2014-02-04 15:21:57 +05:30
ajay javiya (OpenERP) de2177bb26 [MERGE] : with main
bzr revid: aja@tinyerp.com-20140204072402-ra7u1t0nmyot6j0j
2014-02-04 12:54:02 +05:30
Launchpad Translations on behalf of openerp a12fb24290 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064842-0dbci9bv8whxs8ax
2014-02-04 06:48:42 +00:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00: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
jke-openerp 4f827ec044 [MERGE] Merge with 7.0-fix-css-clearfix-jke - bug clearfix on oe_title and oe_form_group
bzr revid: jke@openerp.com-20140203180637-er9c45xm0d9sk7ub
2014-02-03 19:06:37 +01: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
jke-openerp 41f66b8835 [TYPO] Fix bug css revert rev 4122 and add clear:both
revert because was breaking the rendering of forms using oe_title as clearfix hack
adding clear on .oe_form_group to fix the journal form on firefox (block was unaligned, some fields out of the screen)

bzr revid: jke@openerp.com-20140203173926-ohabh1vahcwqijug
2014-02-03 18:39:26 +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
jke-openerp 0d22b87f3a [FIX] Fix bug of positionning on res_partner form
bzr revid: jke@openerp.com-20140203163052-01m78wwe38974cf5
2014-02-03 17:30:52 +01:00
Xavier Morel 7c12d5d200 [IMP] clearer indication that images are being up/downloaded
bzr revid: xmo@openerp.com-20140203160331-04h1erlunelb9kkn
2014-02-03 17:03:31 +01:00
Gery Debongnie 6ddbb1f8c6 [IMP] work in progress: adds the export functionality in graph view (addon web_graph)
bzr revid: ged@openerp.com-20140203154704-t2i3uvezupw7kn3n
2014-02-03 16:47:04 +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
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
ddm@openerp.com 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
ddm@openerp.com 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
ddm@openerp.com 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
Mahendra Barad (OpenERP) 91459c931b [IMP]imporved demo data
bzr revid: mba@tinyerp.com-20140203120515-oddwj82hw1v7kauh
2014-02-03 17:35:15 +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