Chirag Dodiya (OpenERP)
d93cdf4c10
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140319104323-036jlo6ywrn0dm5x
2014-03-19 16:13:23 +05:30
Richard Mathot (OpenERP)
3379880680
[REV] to r10597 (typo)
...
bzr revid: rim@openerp.com-20140319103036-jijpbummihwie8yb
2014-03-19 11:30:36 +01:00
00aa1b69dc
[FIX] website tour: don't hide error in test mode if openerp don't exist
...
bzr revid: chm@openerp.com-20140319102348-rb1tkgd14nca6o15
2014-03-19 11:23:48 +01:00
Gery Debongnie
31645ea1cf
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140319101615-9a9vb0uj0sg58nrd
2014-03-19 11:16:15 +01:00
Gery Debongnie
c0a51ebc34
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140319101509-txjzkcgk7cs4x4rz
2014-03-19 11:15:09 +01:00
ajay javiya (OpenERP)
aee1189f9e
[IMP] : update cover height when page resize
...
bzr revid: aja@tinyerp.com-20140319093547-pwee79qt1gzovfzq
2014-03-19 15:05:47 +05:30
f857905a61
[FIX] website tour: remove testPath from test buy event and product, who hide the real error
...
bzr revid: chm@openerp.com-20140319093338-f5l9mgmkw2yyl0fx
2014-03-19 10:33:38 +01:00
b80d06d327
[FIX] website tour: reset tour before console.log 'ok' or 'error' who close phantomjs tour
...
bzr revid: chm@openerp.com-20140319092012-v83w99ts6z0apgl0
2014-03-19 10:20:12 +01:00
ajay javiya (OpenERP)
77e9baec05
[FIX] : remove mark on selected text when click on edit
...
bzr revid: aja@tinyerp.com-20140319090917-hkaj0jnm95hr0wb2
2014-03-19 14:39:17 +05:30
Turkesh Patel (Open ERP)
9bb6139cd2
[IMP] gamification: improved code to send notification message when bedge assigned, website_forum: improved code to show notification when badge assigned to user.
...
bzr revid: tpa@tinyerp.com-20140319090735-zi01wzh8a8u5cfb7
2014-03-19 14:37:35 +05:30
Gery Debongnie
8ac730074a
[MERGE] merge from trunk into local branch
...
bzr revid: ged@openerp.com-20140319090153-aczgy9uqqw72702x
2014-03-19 10:01:53 +01:00
Dharmraj Jhala (OpenERP)
e07861bb19
[MERGE] with latest trunk addons
...
bzr revid: dizzy.zala@gmail.com-20140319090139-1eaj26atlah94n7y
2014-03-19 14:31:39 +05:30
Gery Debongnie
f4cfed3f0e
[IMP] improves the look of the stat buttons in form view: the statinfo widget displays the information on two lines, the padding/margin/width have been adjusted. (addon web)
...
bzr revid: ged@openerp.com-20140319085718-9v1l3pb43ee6qws6
2014-03-19 09:57:18 +01:00
Fabien Meghazi
14c3ffcb39
[IMP] Allow openerp.modules.load_information_from_description_file() to take an optional mod_path argument
...
bzr revid: fme@openerp.com-20140319085708-prrs0m4gjvuu4o86
2014-03-19 09:57:08 +01:00
a762af1f21
[FIX] website_sale: payment get status url (ending slash); fix debbuger template url scripts
...
bzr revid: chm@openerp.com-20140319085700-b4v9iu51a9jtzty3
2014-03-19 09:57:00 +01:00
Fabien Meghazi
46cfd8940f
[FIX] doc typo
...
bzr revid: fme@openerp.com-20140319085454-1pnjm55b4vxfm1wc
2014-03-19 09:54:54 +01:00
ajay javiya (OpenERP)
bb5b23a01b
[MERGE] : with trunk
...
bzr revid: aja@tinyerp.com-20140319085347-2la6j6uw2o1x1qkc
2014-03-19 14:23:47 +05:30
Fabien Meghazi
40fdb08a7d
[WIP] base_import_module
...
bzr revid: fme@openerp.com-20140319085343-zkee3rmqc9dzpa7h
2014-03-19 09:53:43 +01:00
ajay javiya (OpenERP)
abb2da7d43
[FIX] : if we select a text for tweet, and then edit, tweet logo stay
...
bzr revid: aja@tinyerp.com-20140319085123-r9a87xpabxhpu0gi
2014-03-19 14:21:23 +05:30
Fabien Meghazi
43419ed6e9
[IMP] Allow openerp.tools.convert_file() to optionally take the full path name
...
bzr revid: fme@openerp.com-20140319084931-1ipjqi2dd3ug7i2t
2014-03-19 09:49:31 +01:00
Thibault Delavallée
c04e2f41ce
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140319084817-v82juqdl2mxq7jee
2014-03-19 09:48:17 +01:00
Thibault Delavallée
44e8722cc3
[FIX] portal_sale, purchase: fixed inherit of _postprocess_sent_message, now taking a new argument
...
mail_sent telling whether the email has effectively been sent (because mail.state
is not available du to transient state).
bzr revid: tde@openerp.com-20140319084748-um13u2mr9u2qt23s
2014-03-19 09:47:48 +01:00
8db7982726
[IMP] website_sale: remove print
...
bzr revid: chm@openerp.com-20140319083054-x10c4m7ecxk9202o
2014-03-19 09:30:54 +01:00
Richard Mathot (OpenERP)
ecc7c1fbd3
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140319072330-lvlrxsqq667hfu28
2014-03-19 08:23:30 +01:00
Chirag Dodiya (OpenERP)
dd404cd701
[MRG]Merge with lp:openobject-addons
...
bzr revid: cod@tinyerp.com-20140319070736-oxjw6beks1fda6xn
2014-03-19 12:37:36 +05:30
Sunil Sharma (OpenERP)
3fa07a4d6a
[imp]:admin user edit a question asked by demo user to improve typo
...
bzr revid: sunilsharma.sharma07@gmail.com-20140319063642-4fek8778h2h8b82y
2014-03-19 12:06:42 +05:30
edf0f26d59
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319055226-bk4bs5tp612t236j
2014-03-19 05:52:26 +00:00
Sunil Sharma (OpenERP)
0e1483bba9
[imp]:improve user downvote or upvote and improve create_uid field to user_id
...
bzr revid: sunilsharma.sharma07@gmail.com-20140319050635-7ph64mvoy58pbm3r
2014-03-19 10:36:35 +05:30
Kersten Jeremy
758d467982
[FIX] In mail text2Html, replace url (http or ftp) before the replacement of return line, else some return line was sometimes considered as the link.
...
Eg : <a href="http://www.google.com <br/><br/>Puis">http://www.google.com <br/><br/><br/>Puis</a>
bzr revid: jke@openerp.com-20140318203051-lk92fjgwltkwbk68
2014-03-18 21:30:51 +01:00
Kersten Jeremy
66918d6e32
[FIX] Force recompute the size of column for calendar, else on small screen, the size of columns for the last day is not the same that others.
...
lp bug: https://launchpad.net/bugs/1290942 fixed
bzr revid: jke@openerp.com-20140318174445-rjv3xq2rcxr3n5y9
2014-03-18 18:44:45 +01:00
Kersten Jeremy
e50b3bf7ff
[FIX] Only set table-row for kanban view (for drag and drop), Else the switch between eg view Calendar and view form (without pass by another view (on IE)) does not work properly.
...
lp bug: https://launchpad.net/bugs/1294059 fixed
lp bug: https://launchpad.net/bugs/1097219 fixed
bzr revid: jke@openerp.com-20140318165622-kb4j5zz899lciz8v
2014-03-18 17:56:22 +01:00
Thibault Delavallée
c2e13ccb3b
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140318164215-4k7fx6r3b4uden6h
2014-03-18 17:42:15 +01:00
Thibault Delavallée
0417efb59d
[MERGE] Sybnc with trunk
...
bzr revid: tde@openerp.com-20140318164208-a1d66czkki6on3ca
2014-03-18 17:42:08 +01:00
Thibault Delavallée
a581d864a2
[IMP] mass_mailing: improved test send / send to all
...
- now workign on various models, taking the correct recipient (email, partner_id for partner or lead)
- improved test send: use email_to, now a many2many on contact model to ease the use of templates
- added action to create a mailing list from leads
- moved a res.partner dedicated action to its own file
- added an actoin to create a mailing list from contacts
- fixed mail_mail post_process: use mail_sent variable as mail.state is not available
bzr revid: tde@openerp.com-20140318164117-f2aou25u633j8m57
2014-03-18 17:41:17 +01:00
Thibault Delavallée
4583c1829b
[DEMO] mass_mailing: updated demo data
...
bzr revid: tde@openerp.com-20140318163918-x1jg382boqdci0l3
2014-03-18 17:39:18 +01:00
ed2743f755
merge upstream
...
bzr revid: chm@openerp.com-20140318161114-4t331xpt4xeitgxo
2014-03-18 17:11:14 +01:00
17956befd7
[FIX] do not rolback cursor in test mode
...
bzr revid: chm@openerp.com-20140318160941-w4c8r15sl0vag0sa
2014-03-18 17:09:41 +01:00
cb6af2b2f0
merge upstream
...
bzr revid: chm@openerp.com-20140318160653-2l1t1ntzr1lpuwo9
2014-03-18 17:06:53 +01:00
Richard Mathot (OpenERP)
79428ff8a9
[FIX] Several fixes into hr_evaluation models
...
hr_evaluation now uses the revamped surveys
bzr revid: rim@openerp.com-20140318155534-pc7m615ogqp9p30n
2014-03-18 16:55:34 +01:00
c0a97887b4
[WIP] rev me
...
bzr revid: chm@openerp.com-20140318153525-uhimflitcgk16rlk
2014-03-18 16:35:25 +01:00
42ba805cc8
[WIP] rev me
...
bzr revid: chm@openerp.com-20140318153456-gwz47zs8il23rwii
2014-03-18 16:34:56 +01:00
Denis Ledoux
cac0c9600a
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
...
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
Denis Ledoux
1225c8b530
[FIX] purchase: for drop shipping po, the supplier of the picking was the customer address, which is obviously wrong, it should be the supplier of the po
...
bzr revid: dle@openerp.com-20140318151456-qw896i1t55wgwhkm
2014-03-18 16:14:56 +01:00
Kersten Jeremy
9d65ff69da
[FIX] Hack css for graph view
...
The best way will be to set svg height, but IE9 does not understand height="xxx". So we override the overflow set by bootstrap.css to fix it.
bzr revid: jke@openerp.com-20140318150059-nd6bdd58uvr1s4um
2014-03-18 16:00:59 +01:00
Vidhin Mehta (OpenERP)
ec837facef
[FIX]
...
bzr revid: vme@tinyerp.com-20140318133544-igwmmruotonjy62k
2014-03-18 19:05:44 +05:30
Parth Gajjar (Open ERP)
c49befd59f
[ADD] added website_gengo module
...
bzr revid: pga@tinyerp.com-20140318133036-j1hcrz7bybolw44u
2014-03-18 19:00:36 +05:30
Christophe Simonis
99a3c45976
[MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
...
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Thibault Delavallée
feadcf402c
[FIX] mass_mailing: fixed wrong method called in composer
...
bzr revid: tde@openerp.com-20140318132017-lx3c4yd9rbelc1an
2014-03-18 14:20:17 +01:00
Dharmraj Jhala (OpenERP)
ac8b0fcfc5
[IMP] improved code as suggested
...
bzr revid: dizzy.zala@gmail.com-20140318130903-6u2t94bfvh98jby7
2014-03-18 18:39:03 +05:30
Kersten Jeremy
af8147fc95
[FIX] Display placeholder on IE9.
...
The hack was not working since we migrate jQuery 1.8 to 1.9 because $.browser has been removed.
bzr revid: jke@openerp.com-20140318130655-yqgj851enc0293hr
2014-03-18 14:06:55 +01:00
Chirag Dodiya (OpenERP)