pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,704 Commits 1 Branch 0 Tags
724cbb6dee94de43343fa380c33ea9329647a759
Commit Graph
70704 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Patel (OpenERP) 64470badab [IMP]:project:improved code 
bzr revid: apa@tinyerp.com-20120816093817-gxsvt8bdmjvb2bu8
 2012-08-16 15:08:17 +05:30
Fabien Pinckaers c7c1cb1037 [IMP] renaming message_state to message_unread 
bzr revid: fp@tinyerp.com-20120816092616-jnoj0d18rw1ifqth
 2012-08-16 11:26:16 +02:00
Antonin Bourguignon 59dadc9a80 [MERGE] latest trunk 
bzr revid: abo@openerp.com-20120816092351-rmfsvd0pab2npr25
 2012-08-16 11:23:51 +02:00
Mustufa Rangwala (OpenERP) d38148abba [FIX] l10n_in_hr_payroll: YAML Fix 
bzr revid: mra@tinyerp.com-20120816092010-vq3eqe8prjufd0rc
 2012-08-16 14:50:10 +05:30
Fabien Pinckaers a2b7f82a81 [IMP] no auto_follow, we will use auto-compose instead on some actions 
bzr revid: fp@tinyerp.com-20120816090243-nzu6ounygswiceqi
 2012-08-16 11:02:43 +02:00
Ajay Chauhan (OpenERP) e1e730ffbc [Merge] Merge with main addons. 
bzr revid: cha@tinyerp.com-20120816085147-o1wzevd3cj85vm2y
 2012-08-16 14:21:47 +05:30
Amit Patel (OpenERP) 03c1fd4992 [MERGE]:project:in create: all followers of the task project are automatically followers of the task, with default subscription 
bzr revid: apa@tinyerp.com-20120816085018-088pgprpv81q3u3v
 2012-08-16 14:20:18 +05:30
Mustufa Rangwala (OpenERP) e283ea49e3 [FIX] l10n_in_hr_payroll: If bank account number not available 
bzr revid: mra@tinyerp.com-20120816084821-la394tds5ysfgpys
 2012-08-16 14:18:21 +05:30
Mayur Maheshwari (OpenERP) 16e15df3a0 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20120816084811-u0202w99e9iu27de
 2012-08-16 14:18:11 +05:30
Sanjay Gohel (Open ERP) 1f60976cbc [IMP]minor changes in name 
bzr revid: sgo@tinyerp.com-20120816084621-s0v4o24o6hlqfrs0
 2012-08-16 14:16:21 +05:30
Rucha (Open ERP) 7a24bdb1f7 [FIX]: Improved old product names with new 
bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7
 2012-08-16 14:12:24 +05:30
Purnendu Singh (OpenERP) 0f5f09b2c9 [IMP] hr_expense: small change 
bzr revid: psi@tinyerp.com-20120816083402-i0u6j8grvat6jcty
 2012-08-16 14:04:02 +05:30
Sanjay Gohel (Open ERP) 95082105eb [IMP]improve code as per new changes 
bzr revid: sgo@tinyerp.com-20120816073021-p7wwjuoeegapjxjn
 2012-08-16 13:00:21 +05:30
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