Darshan Kalola (OpenERP)
30201e75fd
[IMP]improve spacing.
...
bzr revid: dka@tinyerp.com-20140220112638-5in8gomndoy3z08g
2014-02-20 16:56:38 +05:30
Darshan Kalola (OpenERP)
7c1f4fb619
[IMP]convert subtypes list into selection.
...
bzr revid: dka@tinyerp.com-20140220102958-l2uwymwtnzcxnetw
2014-02-20 15:59:58 +05:30
Darshan Kalola (OpenERP)
1f71463cfc
[IMP] extract subtype ordering from lp:~openerp-dev/openobject-addons/trunk-visibility-hr_holidays-darshan.
...
bzr revid: dka@tinyerp.com-20140219105246-qmm78w81erhfvhlc
2014-02-19 16:22:46 +05:30
Atul Patel (OpenERP)
33b99c8a07
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20140218055618-r36w29vat7zig9ar
2014-02-18 11:26:18 +05:30
Olivier Dony
76d89c0477
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9133 dle@openerp.com-20140214131810-9abebxpfeoga1crn
...
bzr revid: odo@openerp.com-20140217091203-kmeg4qsn2qyvll23
2014-02-17 10:12:03 +01:00
Denis Ledoux
0ef17beed0
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9846 revid:dle@openerp.com-20140217124044-o8sgz1esfqeha01f
...
bzr revid: dle@openerp.com-20140214100922-m6rf7c6x85nv67sl
bzr revid: dle@openerp.com-20140214114713-oab4kbearvv7g3nh
bzr revid: dle@openerp.com-20140214131810-9abebxpfeoga1crn
bzr revid: dle@openerp.com-20140217124230-ov201kfep88f5tn7
2014-02-17 13:42:30 +01:00
Denis Ledoux
677c972e85
[FIX] mail: word wrapping in pre tags (for mails without html in chatter)
...
bzr revid: dle@openerp.com-20140214131705-efs3bggixyjalxun
2014-02-14 14:17:05 +01:00
Thibault Delavallée
8409791018
[FIX] [IMP] mail: Wall widget: clickable links on the wall now use
...
the mail.action_mail_redirect client action that redirects to the correct
form view, like the link used in notification emails.
bzr revid: tde@openerp.com-20140213151638-ev2va4y3tmm9m7i8
2014-02-13 16:16:38 +01:00
Olivier Dony
bbd813e76e
[MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
...
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Thibault Delavallée
c2b51ee58a
[FIX] mail: mail_followers.js: fixed the fix about is_follower, use the right variable
...
bzr revid: tde@openerp.com-20140207084946-mkh0ht44x5byhrdj
2014-02-07 09:49:46 +01:00
Thibault Delavallée
4420bdf831
[FIX] mail: followers widget: is_follower was not computed if the current user
...
was not in the first 10 displayed followers of the document. Compute is_follower
based on all followers, not just the first 10.
bzr revid: tde@openerp.com-20140206112145-ibir7cj6wxe1ksgt
2014-02-06 12:21:45 +01:00
Christophe Simonis
a69f789b41
[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7
...
bzr revid: dle@openerp.com-20140205105045-j95kduyjiq83e57z
bzr revid: dle@openerp.com-20140114173613-ruxye1m7fxtcjfim
bzr revid: dle@openerp.com-20140116161158-u95vcs3os4tk2zob
bzr revid: dle@openerp.com-20140121172737-gzawfi3ssg7xifef
bzr revid: chs@openerp.com-20140129094554-c3abc8x3qz9mpszr
bzr revid: chs@openerp.com-20140129140159-9vwkpr078shoonum
bzr revid: chs@openerp.com-20140206110220-myn57cryam1y4k9v
2014-02-06 12:02:20 +01:00
Martin Trigaux
6cb3c4b735
[FIX] some other t-raw to t-esc conversions
...
bzr revid: mat@openerp.com-20140204124242-emrd7hwlk6d4umkj
2014-02-04 13:42:42 +01:00
Martin Trigaux
57b3abdbd6
[FIX] mail: escape user and partner names before being rendered in mail widgets
...
lp bug: https://launchpad.net/bugs/1276078 fixed
bzr revid: mat@openerp.com-20140204113358-2cb39l7ge2f5pcg5
2014-02-04 12:33:58 +01:00
Thibault Delavallée
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Christophe Simonis
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
Denis Ledoux
74e0fbae83
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
...
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
2014-01-10 18:40:38 +01:00
Stephane Wirtel
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Thibault Delavallée
3f2d24d1b7
[FIX] mail: Chatter widget: the RecordThread widget, that is
...
used to display the Chatter on documents, should use the
domain defined on the field. Indeed this domain is used when
computing the 'read more' expandable domains.
Before this fix it was not taken into account, leading to
messages being fetched without respecting the domain
defined on the field.
bzr revid: tde@openerp.com-20140109110709-iz2jxryg5xqjedo4
2014-01-09 12:07:09 +01:00
Thibault Delavallée
4998d09808
[FIX] mail: Chatter widget: keep void list of ids when fetching messages;
...
only specific false ids should be replaced by a domain.
bzr revid: tde@openerp.com-20140109100137-7yy9em3klefz77ij
2014-01-09 11:01:37 +01:00
Thibault Delavallée
0b2d085c1b
[IMP] shop: added openchatter on product shop
...
- product.template now inherits from mail.thread
- added opencahtter on product.template form view
- added discussion thread + attachments in product website view
- added file_type field on ir_attachment, that replaces the javascript thing
from mail.js
- added a controller to comment a product.template
bzr revid: tde@openerp.com-20140106135727-uf0zaxav28pdx4sv
2014-01-06 14:57:27 +01:00
Thibault Delavallée
751eb333bc
[MERGE] [FIX] mail: fixed group button position that was too much dependent of the group description length
...
[IMP] project: removed unnecessary code in project to try to be able to move kanban records in a folded column (was not working + generic solution coming)
bzr revid: tde@openerp.com-20131219135206-nv8i13wjugix84r3
2013-12-19 14:52:06 +01:00
Martin Trigaux
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Mahendra Barad
caa3510ea4
[IMP] Mail Improvements
...
bzr revid: kjo@tinyerp.com-20131218131805-e97d5tmq2tr6pvh2
2013-12-18 18:48:05 +05:30
Denis Ledoux
7f00274384
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
...
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
Christophe Simonis
1734cea7d6
[MERGE] annoucement bar
...
bzr revid: chs@openerp.com-20131210181038-lzeg6v4n9qdup9tp
2013-12-10 19:10:38 +01:00
Christophe Simonis
0d02d06675
[IMP] mail: announcement bar: hardcode close ttl + update link with dbuuid
...
bzr revid: chs@openerp.com-20131210174728-hgkbv609mwq8iuu5
2013-12-10 18:47:28 +01:00
Christophe Simonis
5520d73d5f
[IMP] mail: announcement bar: no dblclick
...
bzr revid: chs@openerp.com-20131209192450-zacfq6i0xli7vjju
2013-12-09 20:24:50 +01:00
Christophe Simonis
f8b889e1db
[IMP] mail: announcement bar only for screen
...
bzr revid: chs@openerp.com-20131209192400-01jpkaofq1arqekz
2013-12-09 20:24:00 +01:00
Antony Lesuisse
57ef91409a
[MERGE] bootstrap3
...
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Christophe Simonis
eba79e46a5
[FIX] mail: correct announcement bar
...
bzr revid: chs@openerp.com-20131202114516-u0u44l3xbkk1zcbx
2013-12-02 12:45:16 +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
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
Denis Ledoux
f07e01f491
[ADD]mail: The announcement bar (blue bar) to inform customers
...
bzr revid: dle@openerp.com-20131025153829-xu6mee27a4hajnk3
2013-10-25 17:38:29 +02: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
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
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
Vidhin Mehta
ef0b4d0202
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20130903051341-cqnxom7mo4dk9zvf
bzr revid: vme@tinyerp.com-20130905053153-5wjz9girs41pupfi
2013-09-05 11:01:53 +05:30
Vidhin Mehta
75ddd5ccbe
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x
2013-08-23 10:36:02 +05:30
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
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
Priket Trivedi (OpenERP Trainee)
e2155ae540
[IMP] mail in add class to set margin and change pixel for filed
...
bzr revid: trivedi.pariket@gmail.com-20130716085231-8qe107fvcm6rwmj4
2013-07-16 14:22:31 +05:30
Christophe Simonis
df8d972057
[IMP] */static/description/index.html: link to /start include app name
...
bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
2013-07-15 18:25:04 +02:00
Paramjit Singh Sahota
54837802ac
Improved code.
...
bzr revid: psa@tinyerp.com-20130715113736-ww4wffkajnwkk961
2013-07-15 17:07:36 +05:30
Paramjit Singh Sahota
21e3d7cdc4
[IMP] 2 little improvements when their is no subtype than no edit_subtype pencil will be visible and bydefault set the message_is_follower to false because when no followers are there than subtypes muzt not be visible.
...
bzr revid: psa@tinyerp.com-20130715084907-nrd2oileuyr30nep
2013-07-15 14:19:07 +05:30
Paramjit Singh Sahota
670710b88e
[IMP] Improved code and passed the data according to the format as suggest (partner_id, partner_name, {'is_editable': True/False, 'is_uid': True/False}) and done changes according this changes.
...
bzr revid: psa@tinyerp.com-20130715080106-63dbeh3mhgiqppzv
2013-07-15 13:31:06 +05:30
Paramjit Singh Sahota
6694183dcb
[IMP] Improved code and added
...
{'is_editable': True/False, 'is_uid': True/False}
-- where is_editable will be True if uid is in technical group
-- where is_uid will be True if uid is in partner.user_ids.
bzr revid: psa@tinyerp.com-20130712133920-96l6axns7yynyz9e
2013-07-12 19:09:20 +05:30
Paramjit Singh Sahota
3ed5c9e838
[MERGE] Sync with lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20130711110346-63ouy2j3zp5sndcr
2013-07-11 16:33:46 +05:30
Paramjit Singh Sahota
b1162e09bd
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130701055016-el0ebw1ohd9d0j4l
2013-07-01 11:20:16 +05:30
Paramjit Singh Sahota
39151ca2af
[IMP] Improved code for the followers which are visually duplicated when you click on a follower's name and get back to the sales order form.
...
bzr revid: psa@tinyerp.com-20130628133712-tcfoaisr3o9wdv7x
2013-06-28 19:07:12 +05:30
Antony Lesuisse
fc70550ca2
[IMP] move html module description and icon
...
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Paramjit Singh Sahota
cc05ab11df
[IMP] Little Improvement.
...
bzr revid: psa@tinyerp.com-20130626104722-jpzcu0gnbbggitv8
2013-06-26 16:17:22 +05:30
Paramjit Singh Sahota
74bbd696f7
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130626065359-z17dk91q9c0rgfaw
2013-06-26 12:23:59 +05:30
Paramjit Singh Sahota
a19a887639
[MERGE] Sync with lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130620051858-96jtajxo5qc51v3s
bzr revid: psa@tinyerp.com-20130624131046-m2fq48j84iyqzm2b
2013-06-24 18:40:46 +05:30
Paramjit Singh Sahota
4180da8a40
[IMP] Improved code and removed unwanted code.
...
bzr revid: psa@tinyerp.com-20130620050026-3kwfmowqfa9f4quz
2013-06-20 10:30:26 +05:30
Paramjit Singh Sahota
ae8302a3d6
[IMP] Now the edit_subtype pencil will be visible when the cursor goes on to the follower_list.
...
And made the edit_subtype icon visible without debug mode.
bzr revid: psa@tinyerp.com-20130619134817-n390r4dsgmpo33nb
2013-06-19 19:18:17 +05:30
Paramjit Singh Sahota
7428cac4af
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130617113826-hb6zbv73t3h2hmij
2013-06-17 17:08:26 +05:30
Thibault Delavallée
7b7dfb955f
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130617095141-74uttqtw60iorl5g
2013-06-17 11:51:41 +02:00
Christophe Simonis
aa133b4d29
[MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
...
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
Christophe Simonis
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Paramjit Singh Sahota
01fcf4686e
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130612130222-ro7iun4a23qqjefj
2013-06-12 18:32:22 +05:30
Thibault Delavallée
fc44f25d3a
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130612123429-a4mp0wiicdhlvk0m
2013-06-12 14:34:29 +02:00
Thibault Delavallée
43d08b898f
[MERGE] [IMP] 'Social Aspects' Task
...
Purpose:
- mail is now focused on messaging; partner document is now a classic document, without specific behavior; removed the concept of 'my followers' from mail;
- hr adds social features to mail: employee profile is used to display internal messages; employees can follow other employees, comment and react on their profile messages;
- display suggestion of Groups and Employees to follow in the Inbox, using a new widget. The purpose is to promote social interactions between employees and to improve the visibility of groups;
mail:
- add suggestions.Group widget that allows to display a list of suggested groups to follow; this widget is displayed in the Inbox;
- display 'Partner profile of' or 'News from' when reading messages from a partner profile / employee profile in the Inbox;
- 'Compose a new message or Write to my followers' is not present anymore when hr is not installed, because this social aspect comes with HR;
- mail_thread: add a search function on message_is_follower;
- mail_group: implement suggested groups behavior;
- res_partner: removed specific code changing message_post with type='email' to a private discussion between author and destination partner; partner document behaves like a classic document;
- res_users: add 'display_groups_suggestions' field that controls the display of suggested groups to follow;
- res_users: writing on a res.users object is considered as a private discussion; when Hr is not installed, only aliases should be able to post on a user;
hr_employee:
- when creating an employee, post a message on its profile and push it to every employees of the same company;
- add follow/unfollow and message and follower count on employee kanban view;
- implement suggested employee behavior;
- HR improves the basic Inbox by adding the 'Compose a new message or Write to my followers';
- allow to post on an employee profile when having read access right if the user that posts is an employee;
HR:
- add suggestions.Employee widget that allows to display a list of suggested employees to follow; this widget is displayed in the Inbox;
- res_users: add 'display_employees_suggestions' field that controls the display of suggested employees to follow;
- res_users: do not welcome new users anymore, welcome new employees instead
- res_users: incoming emails are still considered as private messages (using aliases); however messages posted on user profile are redirected to the related employee profiles (used for 'Write to my followers')
bzr revid: tde@openerp.com-20130612121258-j38do5opsot2ur7c
2013-06-12 14:12:58 +02:00
Paramjit Singh Sahota
14f157e395
[IMP] When the subtypes are not displayed in subtype list below the follow button than the edit subtype pencil will also not displayed.
...
bzr revid: psa@tinyerp.com-20130612114538-21ohwb0l50or62fe
2013-06-12 17:15:38 +05:30
Thibault Delavallée
7d2344bc36
[FIX] Chatter: fixed avatar management as this should be fixed in trunk
...
bzr revid: tde@openerp.com-20130612095944-2aa2mezzbb47uk6g
2013-06-12 11:59:44 +02:00
Paramjit Singh Sahota
b2ce2ae9bc
[IMP] variable name improvements added action_ ahead of subscribe and unsubscribe to clearly understad the work of it.
...
bzr revid: psa@tinyerp.com-20130612052645-x1wv4e1t2zyig4t2
2013-06-12 10:56:45 +05:30
Paramjit Singh Sahota
8d19463d12
1. Improved code for the oe_partner which is overlapping the edit followers image and partners name when the image is displayed.
...
2. Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130607122251-gn567auxz4ny1nu3
bzr revid: psa@tinyerp.com-20130610072250-pfxkmbcutl672877
2013-06-10 12:52:50 +05:30
Jignesh Rathod (OpenERP)
42f27a1527
Merge with latest code.
...
bzr revid: jir@tinyerp.com-20130607054638-61sdf0oip5kk20eg
2013-06-07 11:16:38 +05:30
Olivier Dony
52379022db
[FIX] OPW 586673: mail: make `read more/less` labels translatable
...
lp bug: https://launchpad.net/bugs/1165321 fixed
bzr revid: odo@openerp.com-20130606161837-1loqbdr269cr1udl
2013-06-06 18:18:37 +02:00
Thibault Delavallée
5601fbd78c
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130606135313-u3mbe1a8yeussnck
2013-06-06 15:53:13 +02:00
Thibault Delavallée
9c57f6e1cd
[FIX] mail: various fixes
...
Mass mailing: emails due to mass mailing are not queued instead of sent immediately.
As most of cases go through mail_followers._notify(), a new argument is added that
allows to control the force_send (like what is done in email_template).
Chatter: better display of recipients when having a message_post due to mass mailing
(not always displaying logged a note).
Notified people: when having no subtype, just avoid notifying the followers but
take into account specified recipients (partner_ids).
bzr revid: tde@openerp.com-20130606102437-43s4xp96b5wa3r1q
2013-06-06 12:24:37 +02:00
Paramjit Singh Sahota
da775672ea
[IMP] Improved code.
...
bzr revid: psa@tinyerp.com-20130606054817-k3bbkb4j1u9rolpi
2013-06-06 11:18:17 +05:30
Paramjit Singh Sahota
52b02c879b
[IMP] Improved code without disturbing the others methods and solved the issue of unfollowing the specific user by specific id.
...
bzr revid: psa@tinyerp.com-20130605131031-bppkpzdwmi8sp4f7
2013-06-05 18:40:31 +05:30
Thibault Delavallée
9fd2e7297f
[IMP] Chatter: better display of date
...
bzr revid: tde@openerp.com-20130605101300-t1lwykg3d6lp7au2
2013-06-05 12:13:00 +02:00
Martin Trigaux
ccb38117ee
[MERGE] Forward porting of saas-1 until rev 8739
...
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
Paramjit Singh Sahota
388a3e14a1
[ImP] method name change and removed the access call which is not needed bcz the system is calling it self.
...
bzr revid: psa@tinyerp.com-20130604094722-2b8i6ba7blz1g2rc
2013-06-04 15:17:22 +05:30
Paramjit Singh Sahota
872a688fbe
[IMP] Added code for the access right on specific model.
...
bzr revid: psa@tinyerp.com-20130603123227-76kykft5jl3u5egl
2013-06-03 18:02:27 +05:30
Paramjit Singh Sahota
133ad0b97c
[IMP] Improved code for removing the div of dialog everytime when the dialog box is created.
...
bzr revid: psa@tinyerp.com-20130530044037-02cw9gap03qhz087
2013-05-30 10:10:37 +05:30
Thibault Delavallée
2d8f1f4327
[FIX] [IMP] mail_message: adding a non-stored author_avatar field, allowing to display avatars in Chatter messages without having to write some hacks to display the avatars and author images. The field is not stored to avoid issues in a stable version.
...
bzr revid: tde@openerp.com-20130528143706-3973shwhganlohj8
2013-05-28 16:37:06 +02:00
Thibault Delavallée
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Paramjit Singh Sahota
1c7ce4aa37
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130522064934-9ief76qy3lynwqt9
bzr revid: psa@tinyerp.com-20130527131734-mnqn4fir6b3pzogt
2013-05-27 18:47:34 +05:30
Christophe Matthieu
c61329943a
[IMP] mail: add breadcrumb from inbox
...
bzr revid: chm@openerp.com-20130527121823-tfjevhu5zl5at4ar
2013-05-27 14:18:23 +02:00
Thibault Delavallée
0816717526
[FIX] Chatter: fixed suggested recipients, when having no email, unchecking the box was not taken into account.
...
bzr revid: tde@openerp.com-20130524144224-wbi1o27regxed7mn
2013-05-24 16:42:24 +02:00
Thibault Delavallée
3f5c738084
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130522110325-hos9ocph7yo9ae7w
bzr revid: tde@openerp.com-20130522143206-uv1f6lj6xsenzj6u
2013-05-22 16:32:06 +02:00
Thibault Delavallée
cd278d83ab
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
2013-05-22 13:42:36 +02:00
Thibault Delavallée
c4a019bbfd
[CLEAN] mail: added CSS from web to mail module.
...
bzr revid: tde@openerp.com-20130522105434-nqmao3fyxy8on1rl
2013-05-22 12:54:34 +02:00
Thibault Delavallée
0d01d958fa
[MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143)
...
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
2013-05-22 12:26:05 +02:00
Thibault Delavallée
c1cb8bf765
[CLEAN] Removed debug code.
...
bzr revid: tde@openerp.com-20130521132924-cyb9y03tbkgvv6fl
2013-05-21 15:29:24 +02:00
Thibault Delavallée
a05b0bebbe
[FORWARD] Forward port of 7.0 branch until revision 9143.
...
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
Vidhin Mehta
f7bb48d3b1
[IMP] show button bottom of card.
...
bzr revid: vme@tinyerp.com-20130517093222-r62lgqhgx3xnryd9
2013-05-17 15:02:22 +05:30
Thibault Delavallée
fe6fd3de09
[REV] Followers widget: Invite people back to Add others of 7.0, because it was cool and clean.
...
bzr revid: tde@openerp.com-20130515164258-fs6ekiwf06v2x3n9
2013-05-15 18:42:58 +02:00
Thibault Delavallée
89896f32bb
[IMP] [CLEAN] [REF] mail, res_partner, res_users, hr: cleaned partner / employee profile following last specifications.
...
Partner profile is now classic, no more email-routing.
Writing on res.users, basically, begins a private discussion.
With HR, emails on res.users are private discussions, other
are post on employee profile.
Some cleaning in Chatter about Followers of ... , now talking about
partner or employee profile.
bzr revid: tde@openerp.com-20130515153159-cm52byvb7w6m1sxs
2013-05-15 17:31:59 +02:00
Thibault Delavallée
0525c965a9
[CLEAN] [REF] mail, hr: cleaned JS/CSS/XML code for suggestion widgets. Those are now 2 widgets extending web.Widget, included inside a Sidebar widget.
...
bzr revid: tde@openerp.com-20130515103518-2djzogjdtjh0n7rl
2013-05-15 12:35:18 +02:00
Martin Trigaux
c8c298c83c
[IMP] clean permissions and shebang in files
...
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
2013-05-14 12:31:13 +02:00
Martin Trigaux
182118eb8c
[MERGE] kill the executable bit on things that are clearly not executables or scripts
...
bzr revid: mat@openerp.com-20130508144521-bkvms15maji1ykpb
2013-05-08 16:45:21 +02:00
Thibault Delavallée
2a2a539be6
[FIX] chatter: yet another protection against reloading a non-existing menu
...
bzr revid: tde@openerp.com-20130508113952-29a1xk9holyvhc13
2013-05-08 13:39:52 +02:00
Christophe Simonis
01e2e03214
[MERGE] openerp.modules.migration: do not shadow AttributeError that may occure when executing the migrate() function
...
bzr revid: odo@openerp.com-20130508102347-5cnvli102hgrzxml
bzr revid: chs@openerp.com-20130508120951-0r17kb14yxr4r2l2
2013-05-08 14:09:51 +02:00
Olivier Dony
aa68659e47
[FIX] mail: locate current menu using a safer method + check `undefined` case
...
bzr revid: odo@openerp.com-20130506133915-punpieubdyu1nxgl
2013-05-06 15:39:15 +02:00
Dharmraj Zala (OpenERP Trainee)
f764168051
[FIX] line break in 'Follow' column by giving padding to left.
...
bzr revid: nco@tinyerp.com-20130501121234-u8gtjzccjw0h7dk1
2013-05-01 17:42:34 +05:30
Thibault Delavallée
5ab5c4b730
[FIX] mail: fixed a change introduced at revision 3911 that introduced a dependance between a revision in web and in addons: now addons revision is independant of the web revision.
...
bzr revid: tde@openerp.com-20130430100747-9fcrbdbso1v0prgg
2013-04-30 12:07:47 +02:00
Olivier Dony
9c08e12962
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
...
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
Thibault Delavallée
0dada27fcd
[MERGE] Revisions 8997 ... 8999 of 7.0 branch.
...
bzr revid: tde@openerp.com-20130426132721-02lkoc41fms9ve1k
2013-04-26 15:27:21 +02:00
Thibault Delavallée
90d82b9fa6
[MERGE] Sync with 7.0
...
bzr revid: tde@openerp.com-20130425143845-si7n2luxdqpixjlf
bzr revid: tde@openerp.com-20130426074536-sto6625nzcbtdbah
2013-04-26 09:45:36 +02:00
Thibault Delavallée
e0ea2dbdcb
[IMP] Chatter: first message is truncated after 100 characters, other messages after 300 characters; cleaned code about expan management.
...
bzr revid: tde@openerp.com-20130425104336-3xvdwgwanrutzinp
2013-04-25 12:43:36 +02:00
Vishmita Jadeja (openerp)
2178351145
[IMP]Improve code
...
bzr revid: vja@tinyerp.com-20130424131241-m9katp6tlbbnr9kd
2013-04-24 18:42:41 +05:30
Vishmita Jadeja (openerp)
e18a85f261
[IMP]False return when there is no email address in recipient in chatter
...
bzr revid: vja@tinyerp.com-20130424123425-jo6i7jg8albrbhi2
2013-04-24 18:04:25 +05:30
Thibault Delavallée
85a807a515
[REF] Chatter: refactored system for read more / read less, now based on html_email_clean instead of the expander library.
...
bzr revid: tde@openerp.com-20130423153645-k8vcb9hiuapzf7sg
2013-04-23 17:36:45 +02:00
Martin Trigaux
a965a8b5b8
[IMP] remove console.log
...
bzr revid: mat@openerp.com-20130419073438-qud2vnbh6zx85dcl
2013-04-19 09:34:38 +02:00
Martin Trigaux
fe8cfcceba
[IMP] use related field on author's image for mail messages
...
bzr revid: mat@openerp.com-20130418075349-l71lf8kdw1er2tzs
2013-04-18 09:53:49 +02:00
Vishmita Jadeja (openerp)
4847ba7997
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130418051753-az8hip1buttp1ykk
2013-04-18 10:47:53 +05:30
Martin Trigaux
67bffc62c4
[IMP] clean code
...
bzr revid: mat@openerp.com-20130417151721-fmwd143gazkldvu3
2013-04-17 17:17:21 +02:00
Christophe Matthieu
14493f56ce
[IMP] ir_ui_menu: trunk to 7.0 dynamic counters
...
bzr revid: chm@openerp.com-20130417133205-lx4lh53y6ak29cjc
2013-04-17 15:32:05 +02:00
Thibault Delavallée
a75cc23573
[REF] mail: refactored system to generate links in signatures. A new server action is used that choose to redirect to the document or to the Inbox (Portal or Classic Inbox, depending on the user).
...
bzr revid: tde@openerp.com-20130417122225-faf0bb5vyhbcx7ys
2013-04-17 14:22:25 +02:00
Martin Trigaux
cbeb793c57
[IMP] remove manual subscription and better css
...
bzr revid: mat@openerp.com-20130417080714-8taku42rc1eanz1q
2013-04-17 10:07:14 +02:00
Martin Trigaux
56a5a3280f
[MERGE] Latest trunk
...
bzr revid: mat@openerp.com-20130417072750-dp6pjn14vy6hitsp
2013-04-17 09:27:50 +02:00
Turkesh Patel (Open ERP)
9ea1b238bf
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130417062640-0b8at1f087grtiu3
2013-04-17 11:56:40 +05:30
Thibault Delavallée
c1a0489156
[FIX] Chatter: fixed calls to refactored methos.
...
bzr revid: tde@openerp.com-20130416134405-nxtwbvxbz77pxufx
2013-04-16 15:44:05 +02:00
Thibault Delavallée
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00