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
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
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
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