Commit Graph
64770 Commits
Author SHA1 Message Date
Hiral Patel (OpenERP) fc6976e7b2 [MERGE] Merge with lp:openobject-server
bzr revid: hip@tinyerp.com-20121108044628-j84nb6hnj041nrzn
2012-11-08 10:16:28 +05:30
Divyesh Makwana (Open ERP) ab890754c0 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121108044445-d0b690dz549m23oz
2012-11-08 10:14:45 +05:30
Divyesh Makwana (Open ERP) 33501d1d7a [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121108044353-0w5igwrzus3xe4tp
2012-11-08 10:13:53 +05:30
Divyesh Makwana (Open ERP) 4d1c0cea75 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121108044256-6rbiw1daq36w7q9p
2012-11-08 10:12:56 +05:30
Atul Patel (OpenERP) d42be21c3b [MERGE]: Merged shp branch for add separator in chart template view
bzr revid: atp@tinyerp.com-20121108035200-gjfwux4ke758ox41
2012-11-08 09:22:00 +05:30
Atul Patel (OpenERP) 428f1285d0 [MERGE]: Merged tpa branch for adding remaining days in leave types dropdown
bzr revid: atp@tinyerp.com-20121108033818-qmwoscdse0i6t6oc
2012-11-08 09:08:18 +05:30
Atul Patel (OpenERP) 7adca7df2f [MERGE]: Merged ssu branch to remove create button from unrealized gain report
bzr revid: atp@tinyerp.com-20121108023111-son0ozln8uw2qkhi
2012-11-08 08:01:11 +05:30
Atul Patel (OpenERP) d833e25c2d [FIX]: FIX voucher company_id and state domain problem
bzr revid: atp@tinyerp.com-20121108022259-qs0uy4151ucggpz0
2012-11-08 07:52:59 +05:30
Atul Patel (OpenERP) 45f4b9d287 [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-ps-tests-week44-atp-nel-issue-10-pja
bzr revid: atp@tinyerp.com-20121107175100-zq9w04gstbu8jg0e
2012-11-07 23:21:00 +05:30
Atul Patel (OpenERP) 057e5ce95f [MERGE]: Merged shp branch which change filter name in project
bzr revid: atp@tinyerp.com-20121107174505-d1rxuwnoveb5lsw7
2012-11-07 23:15:05 +05:30
Atul Patel (OpenERP) 4ef1a32187 [MERGE]: Merged ss branch change doc link for thunderbird.
bzr revid: atp@tinyerp.com-20121107173509-ailj66g16bovhcmm
2012-11-07 23:05:09 +05:30
Fabien Pinckaers b5b3cbf4e4 [FIX] typo
bzr revid: fp@tinyerp.com-20121107173349-02vp0acqgdcnmi83
2012-11-07 18:33:49 +01:00
Atul Patel (OpenERP) cf5325c3b3 [MERGE]: Merged ssu branch
bzr revid: atp@tinyerp.com-20121107172408-bdck026rez35vy32
2012-11-07 22:54:08 +05:30
Thibault Delavallée 935964a710 [IMP] mail: mail_message: some string made more understandable.
bzr revid: tde@openerp.com-20121107172237-iqe5ay844eh2zsm5
2012-11-07 18:22:37 +01:00
Thibault Delavallée 389b502b63 [FIX] mail: posting from mailboxes now correctly handles recipients of replies message. Body is now converted into html.
bzr revid: tde@openerp.com-20121107171521-whwcjefpjvt91ye6
2012-11-07 18:15:21 +01:00
Atul Patel (OpenERP) f4d83e6b12 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121107170856-gzcbnkiviw15x4zt
2012-11-07 22:38:56 +05:30
Antonin Bourguignon a6d3dfbe59 [MERGE] trunk-bug-1065751-abo: fix the double partner creation in lead2opportunity (introduced in revno 7251.1.122 revid:odo@openerp.com-20120823200629-1m1eym62l7aabzgl)
lp bug: https://launchpad.net/bugs/1065751 fixed

bzr revid: abo@openerp.com-20121107170532-nhrxnm0rv58osk4m
2012-11-07 18:05:32 +01:00
Thibault Delavallée ead36dfd9a [TMP] mail.compose.message wizard: set some fields visible for debug purpose. Will have to be reverted when merging.
bzr revid: tde@openerp.com-20121107170305-1ukzn33bak8y0irl
2012-11-07 18:03:05 +01:00
Thibault Delavallée 3027b749ba [IMP] mail: signature in send notifications is now plaintext (as before), but htmlized (not inside a pre, but inside div and p, with entities escaped). Updated mail tests. Same for portal URL. Updated portal tests.
bzr revid: tde@openerp.com-20121107170241-0gjwraxkuhe0fm6p
2012-11-07 18:02:41 +01:00
Atul Patel (OpenERP) 2569b98288 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121107165906-hpmxixny953556jn
2012-11-07 22:29:06 +05:30
Atul Patel (OpenERP) a81e1b2881 [ADD]: Add button on specific condition.
bzr revid: atp@tinyerp.com-20121107164842-lymoy84p30byl0en
2012-11-07 22:18:42 +05:30
Thibault Delavallée b7188293d7 [IMP] Portal: updated demo data.
bzr revid: tde@openerp.com-20121107164254-0ypt3sltc5e2vfkl
2012-11-07 17:42:54 +01:00
Thibault Delavallée e6a9084677 [IMP] tools: added text2html function, basically turning plaintext into html. Added a test for this function. Updated signature for demo data.
bzr revid: tde@openerp.com-20121107164117-2caoqna2aclzowpk
2012-11-07 17:41:17 +01:00
Antonin Bourguignon 664e05b3a2 [MERGe] trunk
bzr revid: abo@openerp.com-20121107164012-tmog8zotnel3f5ob
2012-11-07 17:40:12 +01:00
Antonin Bourguignon ab8b6fae11 [FIX] the double partner creation in lead2opportunity (introduced in revno 7251.1.122 revid:odo@openerp.com-20120823200629-1m1eym62l7aabzgl)
lp bug: https://launchpad.net/bugs/1065751 fixed

bzr revid: abo@openerp.com-20121107163037-bmywme6nnhlxaaic
2012-11-07 17:30:37 +01:00
Xavier Morel a423c32454 [IMP] m2m_tags code
bzr revid: xmo@openerp.com-20121107161955-bc7bxmmbdkmr34ix
2012-11-07 17:19:55 +01:00
niv-openerp 6f79b279bf [IMP] removed "blacklist" feature in form view that was implemented due to inability to call get_value() on a o2m during its modification. With the recent commit_value() implementation this feature is now useless.
bzr revid: nicolas.vanhoren@openerp.com-20121108103856-uou2leyng8bhx5ba
2012-11-08 11:38:56 +01:00
Cedric Snauwaert 7e3222f924 [REF]refactoring of search function to find vehicle with due or overdue contracts
bzr revid: csn@openerp.com-20121107161932-mv2jpfjftw0fpbmp
2012-11-07 17:19:32 +01:00
Arnaud Pineux f5375d0eaa [FIX] Analytic name_get fixed
lp bug: https://launchpad.net/bugs/1076015 fixed

bzr revid: api@openerp.com-20121107161313-c4np82ftmwcy0wvb
2012-11-07 17:13:13 +01:00
Antonin Bourguignon 48bf8e72da [IMP] minor imp of code style
bzr revid: abo@openerp.com-20121107161142-c5iqr501mxbghy82
2012-11-07 17:11:42 +01:00
Fabien Meghazi c73ac9ef04 [YEAH] jquery ui bootstrap has 1.9 support in dev branch
bzr revid: fme@openerp.com-20121107155758-e6637hp114k2twve
2012-11-07 16:57:58 +01:00
Thibault Delavallée b36547e3ef [CLEAN] tools: mail: removed commented code; moved some code.
bzr revid: tde@openerp.com-20121107154129-nhz7qjv1ksq521ur
2012-11-07 16:41:29 +01:00
Thibault Delavallée da6ee587e3 [CLEAN] Misc cleaning in comments and domain for mailboxes.
bzr revid: tde@openerp.com-20121107153910-uo22t1ahd9qoo1ub
2012-11-07 16:39:10 +01:00
Thibault Delavallée 281a4d0801 [FIX] mail: notifications: fixed access rights issues when setting as read/unread for lambda users.
bzr revid: tde@openerp.com-20121107153822-j7f1a63a2ix66e5n
2012-11-07 16:38:22 +01:00
Fabien Meghazi 1de27448ea [FIX] jquery ui bootstrap not yet ready for jquery ui 1.9, load jquery ui 1.9 css before
bzr revid: fme@openerp.com-20121107153018-zla0kxkospg0lpxj
2012-11-07 16:30:18 +01:00
vta vta@openerp.com 4d56a3c591 [FIX] Remove icon in Import Invoice button, added Journal Entries button.
bzr revid: vta@openerp.com-20121107152220-20k5s5i37bem6gug
2012-11-07 16:22:20 +01:00
Thibault Delavallée 2799ba172c [FIX] portal: fixed class name and imports.
bzr revid: tde@openerp.com-20121107152158-ze50vqj673nvavib
2012-11-07 16:21:58 +01:00
Thibault Delavallée 48cec81235 [IMP] Chatter widget: display email icon only when sender is unknown.
bzr revid: tde@openerp.com-20121107152126-71yzsy1nb0tj549w
2012-11-07 16:21:26 +01:00
Antony Lesuisse a963bd019a [MERGE] m2o button
bzr revid: al@openerp.com-20121107151954-aqqtn4w6hpd39kmi
2012-11-07 16:19:54 +01:00
Cedric Snauwaert 2665f36934 [FIX]correct a small bug when creating odometer with value zero
bzr revid: csn@openerp.com-20121107151726-xr6754fd9t39k5zc
2012-11-07 16:17:26 +01:00
Arnaud Pineux 153ab3b020 [FIX] domain resolution for Document button in project FORM
lp bug: https://launchpad.net/bugs/1075436 fixed

bzr revid: api@openerp.com-20121107144845-yi437u8w9fbcgs3u
2012-11-07 15:48:45 +01:00
Antony Lesuisse af9304fc98 [FIX] seupt.py zsi not needed anymore
bzr revid: al@openerp.com-20121107144232-xf9qyo1rurwc0xnq
2012-11-07 15:42:32 +01:00
Xavier Morel 1b8a0e66ee [REV] nicolas.vanhoren@openerp.com-20120712074237-xugmbw19wjjoes9l
eagerly loaded treeviews, making heavily loaded charts of accounts
completely unusable

bzr revid: xmo@openerp.com-20121107143740-31i16933dfg4t6xk
2012-11-07 15:37:40 +01:00
Christophe Matthieu da2bc197c4 [FIX] mail: jquery event
bzr revid: chm@openerp.com-20121107142407-zqnvehh0i7bx1v7k
2012-11-07 15:24:07 +01:00
Cedric Snauwaert 19f710b03a [REF]some change to reduce further the code and improve readability
bzr revid: csn@openerp.com-20121107142044-m807da3apljtl0z2
2012-11-07 15:20:44 +01:00
RGA(OpenERP) 83d3ff99bd [FIX] translation tree view
bzr revid: rgaopenerp-20121107140706-dwy1l9381qrl6fb9
2012-11-07 19:37:06 +05:30
Frédéric van der Essen 7bfc5c3fe4 [FIX] forgot to remove a call to a removed method
bzr revid: fva@openerp.com-20121107135418-xa74vzqvqlgt3469
2012-11-07 14:54:18 +01:00
Arnaud Pineux 8740c3306f [FIX] bug 1062119
bzr revid: api@openerp.com-20121107134404-pmpq2q691fmpt1ie
2012-11-07 14:44:04 +01:00
Arnaud Pineux a50f46c488 [MERGE]
bzr revid: api@openerp.com-20121107134258-05254zobnci373xe
2012-11-07 14:42:58 +01:00
Frédéric van der Essen 47967fa1cc [FIX] removed useless log
bzr revid: fva@openerp.com-20121107132857-oj0zyo3y84agprdm
2012-11-07 14:28:57 +01:00