Fabien Pinckaers
1b58af40cc
[IMP] subscriber --> follower
...
bzr revid: fp@tinyerp.com-20120816072642-614ukk9q5zvrdp6i
2012-08-16 09:26:42 +02:00
Sanjay Gohel (Open ERP)
3f57f6db11
[MERGE]merge with parent branch
...
bzr revid: sgo@tinyerp.com-20120816072459-kz6ulq5z0jsqptg9
2012-08-16 12:54:59 +05:30
Fabien Pinckaers
e5b76be9b8
[IMP] merge trunk
...
bzr revid: fp@tinyerp.com-20120816072402-7w1avco6ryt12x10
2012-08-16 09:24:02 +02:00
Purnendu Singh (OpenERP)
05609f24ff
[MERGE, IMP] merge with mma branch and small improvement
...
bzr revid: psi@tinyerp.com-20120816071452-5gl39inc3lwkh4wl
2012-08-16 12:44:52 +05:30
Mayur Maheshwari (OpenERP)
26d020fe4c
[FIX]hr_expense :improve multi currency code for expense line with multiple cases
...
bzr revid: mma@tinyerp.com-20120816064637-4c5oo6jbprqcocdx
2012-08-16 12:16:37 +05:30
Atul Patel (OpenERP)
cbb41e6ed3
[FIX]: Remove mail_subscription
...
bzr revid: atp@tinyerp.com-20120816064026-f3egkm1h2ximajzm
2012-08-16 12:10:26 +05:30
vivisci
738040e15b
[FIX] the issue of not showing data on bilan report and compute resultant report
...
lp bug: https://launchpad.net/bugs/1036943 fixed
bzr revid: rmu@tinyerp.com-20120816063808-3jw4q056p9nfm911
2012-08-16 12:08:08 +05:30
Mustufa Rangwala (OpenERP)
fc4ec216ae
[IMP] l10n_in_hr_payroll: Employee form view for join date
...
bzr revid: mra@tinyerp.com-20120816054512-93cpurza3ykzfvtk
2012-08-16 11:15:12 +05:30
Mayur Maheshwari (OpenERP)
6accc69e56
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120816053002-1e25xdayfldq7hqr
2012-08-16 11:00:02 +05:30
Purnendu Singh (OpenERP)
049e8a12f0
[FIX] small fix
...
bzr revid: psi@tinyerp.com-20120816052846-gxi0q4gd4at7r7pp
2012-08-16 10:58:46 +05:30
Rucha (Open ERP)
327e7d095f
[MERGE]: Merge with latest trunk-server
...
bzr revid: rpa@tinyerp.com-20120816052255-anabrq2e0q74ba0e
2012-08-16 10:52:55 +05:30
Rucha (Open ERP)
637ba6de59
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120816052249-8dut5m0li3o394lm
2012-08-16 10:52:49 +05:30
Atul Patel (OpenERP)
22a810507c
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120816052021-igdj7knaimwg9x7z
2012-08-16 10:50:21 +05:30
Mayur Maheshwari (OpenERP)
fdac923424
[MERGE]Merge with parent branch
...
bzr revid: mma@tinyerp.com-20120816051518-2ymocyufeddvalax
2012-08-16 10:45:18 +05:30
Atul Patel (OpenERP)
81a1bd6898
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120816051123-ekldd1gox8py3pgl
2012-08-16 10:41:23 +05:30
Purnendu Singh (OpenERP)
4ef4dd3054
[MERGE] merge with main addons
...
bzr revid: psi@tinyerp.com-20120816051019-ybu9967pkdpq122a
2012-08-16 10:40:19 +05:30
Divyesh Makwana (Open ERP)
1be6ba81f2
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120816050624-x5vk010tflfv072u
2012-08-16 10:36:24 +05:30
Amit Patel (OpenERP)
b1f3d31410
[MERGE]:merged with trunk
...
bzr revid: apa@tinyerp.com-20120816050008-dnw9mn5uiueh91cp
2012-08-16 10:30:08 +05:30
Mustufa Rangwala (OpenERP)
0def7e63f4
[MERGE] Merge from main addons
...
bzr revid: mra@tinyerp.com-20120816045516-0btt11bg3wow7oor
2012-08-16 10:25:16 +05:30
Jigar Amin - OpenERP
cf464eb273
[FIX] kanban : Keep is_action_enable consistant as per previous commit
...
bzr revid: jam@tinyerp.com-20120816043310-b0sbicnv73jgzhti
2012-08-16 10:03:10 +05:30
Jigar Amin - OpenERP
9698fadbb3
[MERGE] lp:openobject-server
...
bzr revid: jam@tinyerp.com-20120816041259-kcqcy66o2o57m3r4
2012-08-16 09:42:59 +05:30
Jigar Amin - OpenERP
e0ba6465ea
[MEGRE] lp:openerp-web
...
bzr revid: jam@tinyerp.com-20120816041219-xjdh003bs6zmc62h
2012-08-16 09:42:19 +05:30
Thibault Delavallée
f4f7de1369
[MERGE] Merged OpenChatter-3-5 followers refactoring. Followers is now a modified many2many field, using reference (res_model, res_id) to access one of the relationship. Added message_followers_ids and message_is_follower fields. Refactored subscribers management, because it is now managed through classic reads and writes in the field.
...
Web-side: the followers display is now a separated widget. It has been moved out of mail.js, into mail_followers.js. Modified views accordingly, because mail_followers is a widget on message_follower_ids field. This is more clean with other OpenERP aspects.
Misc: updated all views using Chatter in addons, to use mail_followers widget. Cleaned some issues. Also renamed mail.subscription into mail.followers, and propagated that change through the code.
bzr revid: tde@openerp.com-20120816003157-f2820hibc17f0j5q
2012-08-16 02:31:57 +02:00
Thibault Delavallée
5f866fbacd
[MERGE] Merged OpenChatter-3-5 followers refactoring. This server-side branch holds a small refactoring in many2many fields: the query has been taken in a method to be more easily overiden. Please note that this commit is likely to be trashed when merging trunk-mail-review.
...
bzr revid: tde@openerp.com-20120816002627-n3gnbi7izq34t09h
2012-08-16 02:26:27 +02:00
Thibault Delavallée
370839860b
[FIX] mail.group security: member_ids -> message_follower_ids.
...
bzr revid: tde@openerp.com-20120816000833-ld4cjhyvs8lc1ta4
2012-08-16 02:08:33 +02:00
Thibault Delavallée
1bde3b3a4c
[CLEAN] mail_thread: cleaned some typos/words.
...
bzr revid: tde@openerp.com-20120815233831-66socygrtp99gve7
2012-08-16 01:38:31 +02:00
Thibault Delavallée
540346de57
[DOC] mail_followers: added few few comments.
...
bzr revid: tde@openerp.com-20120815232825-avpmpmn3egjkt65y
2012-08-16 01:28:25 +02:00
Thibault Delavallée
2051bd9fda
[IMP] mail_followers widget: removed white spaces, removed a debugger statement, made the title generic.
...
bzr revid: tde@openerp.com-20120815232649-8e8ehqhchxh2kypk
2012-08-16 01:26:49 +02:00
Antony Lesuisse
7125c97d65
[MERGE] sign up, openid, auth_oauth
...
bzr revid: al@openerp.com-20120815225856-j4um24esr5fjxvte
2012-08-16 00:58:56 +02:00
Antony Lesuisse
21cfdfb988
[MERGE] trunk
...
bzr revid: al@openerp.com-20120815224827-b3sl1q6rso62f69d
2012-08-16 00:48:27 +02:00
Antony Lesuisse
23178302c4
oauth generic with buttons from zocial
...
bzr revid: al@openerp.com-20120815224708-rcge3914klkwrw6u
2012-08-16 00:47:08 +02:00
Thibault Delavallée
df6a7026d8
[IMP] mail_thread: cleaned subscription procses: do not add uid when modifying subscribers.
...
bzr revid: tde@openerp.com-20120815223725-2w2lmdagwuj0d59p
2012-08-16 00:37:25 +02:00
Thibault Delavallée
d90b1ad170
[MERGE] Merged with server/trunk.
...
bzr revid: tde@openerp.com-20120815223442-fgs0x83kqlbx9zad
2012-08-16 00:34:42 +02:00
Antony Lesuisse
da8045d784
add message_followers_ids
...
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
2012-08-16 00:30:38 +02:00
Thibault Delavallée
0c706a768d
[FIX] Fixed wrong var name...
...
bzr revid: tde@openerp.com-20120815220354-9c4ohv57g1vn65xj
2012-08-16 00:03:54 +02:00
Thibault Delavallée
5a89f31bdf
[IMP] mail_thread: check before subscribing at message creation, because there is a loop in procurement.
...
bzr revid: tde@openerp.com-20120815215510-5gd1wtkhoqpswu83
2012-08-15 23:55:10 +02:00
Thibault Delavallée
454803c150
[REM] mail_thread: res_users: removed dead code.
...
bzr revid: tde@openerp.com-20120815212059-n1hf253xylxq7y7x
2012-08-15 23:20:59 +02:00
Thibault Delavallée
0529e1a0fb
[IMP] mail_thread: automatic subscription: do not add 'False' user_ids.
...
bzr revid: tde@openerp.com-20120815211105-0vdhw7x1lkz0dct8
2012-08-15 23:11:05 +02:00
Antony Lesuisse
35e620ce68
[FIX] check credentials now works
...
bzr revid: al@openerp.com-20120815211004-3arwfttwprm3tblh
2012-08-15 23:10:04 +02:00
Antony Lesuisse
774ea74c38
[IMP] res_users check,login,authenticate cleanup
...
bzr revid: al@openerp.com-20120815210645-nwmfltbeiegvcdz9
2012-08-15 23:06:45 +02:00
Thibault Delavallée
e1870a434e
[FIX] FIxed call to message_get_automatic_followers.
...
bzr revid: tde@openerp.com-20120815210149-jujf2tv1hffm09g0
2012-08-15 23:01:49 +02:00
Thibault Delavallée
b046ac3fae
[FIX] ids -> id.
...
bzr revid: tde@openerp.com-20120815205459-irdfe1aeosqnu3nm
2012-08-15 22:54:59 +02:00
Thibault Delavallée
92c70aa6ea
[IMP] Addons: propagated new automatic subscription mechanism.
...
bzr revid: tde@openerp.com-20120815205143-twthjirie2b5kr7n
2012-08-15 22:51:43 +02:00
Thibault Delavallée
3c733c508f
[IMP] mail_thread: cleaned automatic subscription.
...
bzr revid: tde@openerp.com-20120815204522-qe5fll60wbk0drp9
2012-08-15 22:45:22 +02:00
Antony Lesuisse
1e1936b59a
[FIX] session missing import
...
bzr revid: al@openerp.com-20120815203504-nqlfj264xkk5wuh5
2012-08-15 22:35:04 +02:00
Thibault Delavallée
ec23d716d4
[FIX] mail_thread: fixed reference to a deleted variable.
...
bzr revid: tde@openerp.com-20120815201954-z0jf0qwp8orr76vn
2012-08-15 22:19:54 +02:00
Thibault Delavallée
39cc9217bf
[FIX] Fixed var name not correct after moving code.
...
bzr revid: tde@openerp.com-20120815201724-6mkif7u7n0svoqu8
2012-08-15 22:17:24 +02:00
Thibault Delavallée
819d4adfa7
[CLEAN] message_subscribe: removed unnecessary code. Use command generation everywhere.
...
bzr revid: tde@openerp.com-20120815201546-pcb1juts1ryzctqd
2012-08-15 22:15:46 +02:00
Thibault Delavallée
8b616f3302
[REM] sale, purcahse, crm_phonecall, analytic: stop subscribing default subscribed users. Purchase: added monitored field: validator.
...
bzr revid: tde@openerp.com-20120815201320-gzkzdm14vnni8dsq
2012-08-15 22:13:20 +02:00
Thibault Delavallée
af44478ff3
[REF] mail_thread: removed get_subscribers, because not necessary anymore with the new field.
...
bzr revid: tde@openerp.com-20120815200715-075no768khroyyoe
2012-08-15 22:07:15 +02:00