pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,031 Commits 1 Branch 0 Tags
3bfbcfee360e39b83d07bc38d2a331ae2cfe70a0
Commit Graph
1202 Commits
Author SHA1 Message Date
Thibault Delavallée 1037874e15 [CLEAN] mail: removed modifications that have nothing to do with website in mail.js + typo introduced in a test file 
bzr revid: tde@openerp.com-20131206101716-08q6f4ufhj50e239
 2013-12-06 11:17:16 +01:00
Christophe Matthieu fd2821086f [MERGE] sync with trunk 
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
 2013-12-02 16:09:25 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3 
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
 2013-12-02 14:24:45 +01:00
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp 
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
 2013-11-30 14:07:25 +01:00
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf 
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
 2013-11-30 14:00:14 +01:00
Martin Trigaux 11a81298e9 [MERGE] [FIX] mail: css improvement, no overflow when too long words, line break instead 
lp bug: https://launchpad.net/bugs/1167323 fixed

bzr revid: mat@openerp.com-20131128113520-s0i7cri632n7a01g
 2013-11-28 12:35:20 +01:00
Christophe Simonis 0521d1aab3 [MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m 
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
 2013-11-27 12:12:08 +01:00
Christophe Simonis 6b05beecc1 [MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7 
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
 2013-11-27 12:00:46 +01:00
Thibault Delavallée a6ae52affa [FIX] mail_followers widget: fixed a traceback appearing 
when quickly changing the displayed record in a form view when the
followers widget is displayed. This was due to variables not correctly
set because of a concurrence issue.
However there is no need to hse this.view.datarecord or dataset as
the function already receives its id as argument.

bzr revid: tde@openerp.com-20131126124630-2m5wjwr008ys1e9e
 2013-11-26 13:46:30 +01:00
Thibault Delavallée 6bfcee2cb7 [FIX] mail: fixed replying to the first message in Inbox that was crashing 
lp bug: https://launchpad.net/bugs/1212109 fixed

bzr revid: tde@openerp.com-20131125155349-4wfvjxuffnxyumkd
 2013-11-25 16:53:49 +01:00
Thibault Delavallée f148061b94 [MERGE] [IMP] chatter: improved 'Log a note' 
- the button is now only displayed for employee users. This is done
by overriding the fields_view_get in mail.thread and adding options
to the widget according to the groups the user belongs to. Indeed
it is currently not possible to set widget options specific to
some groups. Therefore an override of fields view get was
necessary.
- small layout improvements: Log a note -> Log an internal note, 
background color of notes updated.

bzr revid: tde@openerp.com-20131125130455-u8517iyr4jgdgoqn
 2013-11-25 14:04:55 +01:00
Fabien Pinckaers 75d0a23352 [FIX] Small issue in layout 
bzr revid: fp@openerp.com-20131117110720-b0jdwk9ywlxrug2u
 2013-11-17 12:07:20 +01:00
Fabien Pinckaers 963c994be8 [IMP] layout issue minor 
bzr revid: fp@tinyerp.com-20131115102901-9vm2whxw0t9ahfvs
 2013-11-15 11:29:01 +01:00
ima-openerp 88a79fdaf3 [IMP]improved css for survey kanban, file attach button and my current timesheet in hr. 
bzr revid: ima@tinyerp.com-20131115101317-3jb422klc3jgdwps
 2013-11-15 15:43:17 +05:30
ima-openerp 1098f7021e [IMP]improved css for sales team kanban, sale order payment_acquirers and attach file button. 
bzr revid: ima@tinyerp.com-20131114120529-5ltoe9aoglsx92vv
 2013-11-14 17:35:29 +05:30
ajay javiya (OpenERP) 1bafe48697 [MERGE]: with trunk 
bzr revid: aja@tinyerp.com-20131029133048-1ki53bbmy31igan7
 2013-10-29 19:00:48 +05:30
Thibault Delavallée 5bb4fa2b43 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
 2013-10-28 17:33:21 +01:00
Thibault Delavallée 438b06ef13 [FIX] mail: followers widget: wrong default value when calling read_followers_data, should be a list, not a dict 
bzr revid: tde@openerp.com-20131017131634-b1j9evzgu9q837i8
 2013-10-17 15:16:34 +02:00
ajay javiya (OpenERP) 217fdcba70 [IMP][REM]: Remove nobody if user have no rights on partner that will display 'portal to nobody 5 minutes ago' that will confuse to end user, now it display 'portal 5 minutes ago' if no rights. 
bzr revid: aja@tinyerp.com-20131009110031-7jdsi3ic3eo3sb2m
 2013-10-09 16:30:31 +05:30
ajay javiya (OpenERP) e5db6ce4e6 [MERGE]: with trunk 
bzr revid: aja@tinyerp.com-20131007054529-3nlgi9szgaen4kau
 2013-10-07 11:15:29 +05:30
Thibault Delavallée 94887c5cb8 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
 2013-10-04 10:50:39 +02:00
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8 
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
 2013-10-03 13:12:22 +02:00
Denis Ledoux 22baa3253f [FIX]mail: backport of fix 8787 from saas-1 branch, rev-id: chm@openerp.com-20131003091603-rarztafazl56ugid 
bzr revid: dle@openerp.com-20131003095400-wgfwaazfdfhho3vb
 2013-10-03 11:54:00 +02:00
Christophe Matthieu acb8f23a19 [FIX] mail.js: not found do_reload_menu_emails; fix: Use instanceof insead of comparaison of __proto__ arguments 
bzr revid: chm@openerp.com-20131003091603-rarztafazl56ugid
 2013-10-03 11:16:03 +02:00
Thibault Delavallée 607de396ba [MERGE] Sync with trunk, until revision 8927 
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
 2013-10-02 15:54:42 +02:00
Christophe Simonis f2e1240522 [FIX] mail: correct button on "Suggested Groups" 
bzr revid: chs@openerp.com-20131002120733-6hsz0ugl3ir2gwfp
 2013-10-02 14:07:33 +02:00
ajay javiya (OpenERP) d9cf77b80d [IMP]: change internal notes color light light gray 
bzr revid: aja@tinyerp.com-20130927100513-dj1y3qyqk7tqf57d
 2013-09-27 15:35:13 +05:30
ajay javiya (OpenERP) 6b4a1a3d55 [IMP]: Rename log a note to Log an internal note 
bzr revid: aja@tinyerp.com-20130926132322-pvu18fr5w24lc18m
 2013-09-26 18:53:22 +05:30
ajay javiya (OpenERP) 2f708369cb [IMP][REM]: Improve code and remove unused method 
bzr revid: aja@tinyerp.com-20130924133041-0j2k8qc5ubjxwghx
 2013-09-24 19:00:41 +05:30
ajay javiya (OpenERP) cbe9d337a5 [IMP]: reduce rpc call , add options 'display_log_button' on field, 
[REM]: unwanted record rule

bzr revid: aja@tinyerp.com-20130923133201-zclwecr2n596e989
 2013-09-23 19:02:01 +05:30
ajay javiya (OpenERP) de52e90cfa [ADD]: add an option in chatter 'display_log_button', that is true for employee action, and False for portal action 
bzr revid: aja@tinyerp.com-20130920130449-8c5z33tgegftdxu3
 2013-09-20 18:34:49 +05:30
ajay javiya (OpenERP) c841fd0ca3 [IMP]:color of notes , and notes restrict to group hr/employee 
bzr revid: aja@tinyerp.com-20130919133829-bthuzij8g78v72cv
 2013-09-19 19:08:29 +05:30
Christophe Matthieu ed35895126 [MERGE] from trunk 
bzr revid: chm@openerp.com-20130828163937-japdo58t20hhqfoz
 2013-08-28 18:39:37 +02:00
Atul Patel (OpenERP) 1a382f268c [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20130812043810-y14dmqwvuxrxkuag
 2013-08-12 10:08:10 +05:30
Thibault Delavallée 079ea21883 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130808083451-plvcks1kwjhh2vzi
 2013-08-08 10:34:51 +02:00
niv-openerp ea92a186f5 [FIX] mail: minor potential problem with JavaScript module loading 
bzr revid: nicolas.vanhoren@openerp.com-20130726121938-b2uapok2dup56ol9
 2013-07-26 14:19:38 +02:00
Atul Patel (OpenERP) ac9e08f481 [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20130725073521-nbuthhc3l0a3y2zi
 2013-07-25 13:05:21 +05:30
Atul Patel (OpenERP) 4468117ad5 [FIX] mail: remove is author unused assignment. 
bzr revid: atp@tinyerp.com-20130725073249-t1fvurzfdp0wh8j3
 2013-07-25 13:02:49 +05:30
Atul Patel (OpenERP) 2706328ca4 [IMP] mail: Pass current user partner id into datasets and get it into template. add author also for private mail. 
bzr revid: atp@tinyerp.com-20130725071939-9lmuhfgte987nu03
 2013-07-25 12:49:39 +05:30
Thibault Delavallée 68d1c2928f [CLEAN] Cleaning befor merging 
No need to use an image for edition -> use webtypo font instead
Small code cleaning in js / python

bzr revid: tde@openerp.com-20130723095509-knp45uvmlfmr27v9
 2013-07-23 11:55:09 +02:00
Thibault Delavallée 6a066aca56 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130723091308-dck3bt8ihi6480lc
 2013-07-23 11:13:08 +02:00
Atul Patel (OpenERP) 48c68c3a99 [FIX]: Fix private message partnerid problem and display and when no author 
bzr revid: atp@tinyerp.com-20130723055511-edtutz2au78rcinx
 2013-07-23 11:25:11 +05:30
Atul Patel (OpenERP) 5d4f89f9d6 [IMP]: check is_author condition 
bzr revid: atp@tinyerp.com-20130723054926-4t0whshbgcrkql3h
 2013-07-23 11:19:26 +05:30
Atul Patel (OpenERP) 70d47d809a [MERGE]: Merged with addons 
bzr revid: atp@tinyerp.com-20130718041650-rpo69kehswfc8gq4
 2013-07-18 09:46:50 +05:30
Paramjit Singh Sahota b7160bc1cf [IMP] Improved code for fetch_followers and done as was previously && added condition for the record in display_followers so that it never breaks && improve the mouse-enter and mouse-leave. 
bzr revid: psa@tinyerp.com-20130717124842-vuqct26jy6a7palb
 2013-07-17 18:18:42 +05:30
Christophe Matthieu 75ff22286f [MERGE] from trunk 
bzr revid: chm@openerp.com-20130726143134-4vmzxqcb2d3fnwwx
 2013-07-26 16:31:34 +02:00
Christophe Matthieu 18248b94e8 [IMP] mail: remove the default parent_id in js post method (logic server side) 
bzr revid: chm@openerp.com-20130726141303-i3991kinyso9yan6
 2013-07-26 16:13:03 +02:00
Thibault Delavallée 48dd55b1e8 [FIX] mail: fixed merge issue, forgottent conflict 
bzr revid: tde@openerp.com-20130717085925-l0u2nkvz91wm5kcy
 2013-07-17 10:59:25 +02:00
Thibault Delavallée 32d0f6bce0 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij
 2013-07-17 09:47:10 +02:00
Mehul Mehta (OpenERP Trainee) 295d807aa5 [IMP] change a reply private discussion Document in chatter and remove a author notified of its own messages 
bzr revid: mehulmehta008@gmail.com-20130716094124-ksigo91x3njgdj4f
 2013-07-16 17:41:24 +08:00