pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,206 Commits 1 Branch 0 Tags
72700a2cf97243da609fffcbc6c9e8fa834701cc
Commit Graph
1228 Commits
Author SHA1 Message Date
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k 
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
 2014-03-24 14:38:11 +01:00
Kersten Jeremy 758d467982 [FIX] In mail text2Html, replace url (http or ftp) before the replacement of return line, else some return line was sometimes considered as the link. 
Eg : <a href="http://www.google.com<br/><br/>Puis">http://www.google.com<br/><br/><br/>Puis</a>

bzr revid: jke@openerp.com-20140318203051-lk92fjgwltkwbk68
 2014-03-18 21:30:51 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6 
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
 2014-03-11 15:52:05 +01:00
Christophe Simonis 47c4728f43 [FIX] mail,website_sale: rename file_type to file_type_icon to avoid name conflict with file_type field added by document module 
bzr revid: chs@openerp.com-20140228142233-i0mm9lav0czbydkk
 2014-02-28 15:22:33 +01:00
Thibault Delavallée fc7f21e4bf [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140221102322-oi7wa2sc3867g81d
 2014-02-21 11:23:22 +01:00
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
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
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