pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,041 Commits 1 Branch 0 Tags
8f2bbf73ae5943a0cd35de3f3f48482575f4fe2c
Commit Graph
1254 Commits
Author SHA1 Message Date
Thibault Delavallée 5ea15d56fb [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
 2014-04-14 11:04:28 +02:00
Cedric Snauwaert 89d665aa79 [FIX]some cosmetic of code 
bzr revid: csn@openerp.com-20140411122840-tv1mx2nu5p2is669
 2014-04-11 14:28:40 +02:00
Thibault Delavallée 94c580e933 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140411075551-xh4o3k3172cr7scz
 2014-04-11 09:55:51 +02:00
Cedric Snauwaert 3a4e264978 [FIX]use bootstrap modal windows. refactor and cleaned from trunk-ui-to-boostrap-modal 
bzr revid: csn@openerp.com-20140410155022-3cqys3zc55idc4vg
 2014-04-10 17:50:22 +02:00
Thibault Delavallée 7a1221c9f3 [MERGE] [IMP] mail: followers widget: Follow button + subtypes are now displayed 
like a button + a dropdown selection for subtypes, reducing the place this widget
takes in the form view.

bzr revid: tde@openerp.com-20140409074712-pn3nqpga1mxaa3ie
 2014-04-09 09:47:12 +02:00
Thibault Delavallée 1380f597a2 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140403122027-3w055e5olf23dzw9
 2014-04-03 14:20:27 +02:00
Fabien Pinckaers 0b539587b8 [IMP] kanban view for ir.attachments 
bzr revid: fp@tinyerp.com-20140401164322-fq3r0pt6idkoobxx
 2014-04-01 18:43:22 +02:00
Darshan Kalola (OpenERP) ad2984f564 [IMP]disabled dropdown button when there is no item in dropdown. 
bzr revid: dka@tinyerp.com-20140331073100-qexuumfnynssfto1
 2014-03-31 13:01:00 +05:30
Darshan Kalola (OpenERP) 92875602b4 [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140328131834-1bhu74vaihxvp0sb
 2014-03-28 18:48:34 +05:30
Thibault Delavallée 283ce860fc [REM] mail: removed dead code in mail.js 
bzr revid: tde@openerp.com-20140325142535-rptr14zfxf8ctx27
 2014-03-25 15:25:35 +01:00
Thibault Delavallée 7185a68775 [MERGE] Sync with trunk. 
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
 2014-03-25 10:02:09 +01:00
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
Chirag Dodiya (OpenERP) 9950cdde14 [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140320113507-d1mfk36e1ux6b7s0
 2014-03-20 17:05:07 +05:30
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
Thibault Delavallée d5a8905941 [IMP] mail_compose_message: added is_log boolean field for internal notes; + removed context hack that 
did the same thing. Fixed composer form view: internal note, only subject + body is
displayed.

bzr revid: tde@openerp.com-20140317122409-5fd5d5uwc35oq0hb
 2014-03-17 13:24:09 +01:00
Thibault Delavallée e6f6960d17 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140314162124-fn8f9ne80skha19h
 2014-03-14 17:21:24 +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
Darshan Kalola (OpenERP) 7dc413070c [IMP]mail_follower:closed dropdown when there is no child element in ul. 
bzr revid: dka@tinyerp.com-20140225045142-fg6qbnlvl4ylys0k
 2014-02-25 10:21:42 +05:30
Darshan Kalola (OpenERP) a2cbf7ee1b [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140224112504-3b0f36x0nw3rmj7e
 2014-02-24 16:55:04 +05:30
Darshan Kalola (OpenERP) dad39a22d6 [IMP]solved Error Cannot read property 'target' of undefined. 
bzr revid: dka@tinyerp.com-20140224105249-lr50s4x6bvhbl1tx
 2014-02-24 16:22:49 +05:30
Darshan Kalola (OpenERP) 068c1be14c [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140224101844-2k8p1j86ngybtvw4
 2014-02-24 15:48:44 +05:30
Darshan Kalola (OpenERP) 8bf832b259 [IMP]improved spacing. 
bzr revid: dka@tinyerp.com-20140224100758-ibz8u54u7sv68yqz
 2014-02-24 15:37:58 +05:30
Darshan Kalola (OpenERP) 37a119cbc8 [IMP]mail_follower:improved subtype selection event to keep dropdown list open untill click outside of dropdown or on the follow/unfollow button. 
bzr revid: dka@tinyerp.com-20140224094951-hixzix3ptl6f2g5e
 2014-02-24 15:19:51 +05:30
Thibault Delavallée 4a284821b4 [MERGE] Sync with trunnk 
bzr revid: tde@openerp.com-20140221145716-vkusdgd56rnc85rl
 2014-02-21 15:57:16 +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) b69271064b [MERGE]sync with trunk and resolve conflicts. 
bzr revid: dka@tinyerp.com-20140221045744-hopnxp3mj9z7vz0j
 2014-02-21 10:27:44 +05:30
Darshan Kalola (OpenERP) 1e16c40ab0 [IMP]mail_followers: remove li from dropdown and keep table as it is. 
bzr revid: dka@tinyerp.com-20140221045107-ete68out3asvjign
 2014-02-21 10:21:07 +05:30
Thibault Delavallée 1ac8e7cdfd [IMP] mail, email_template: mass mailing feature cleaning 
- now differentiates mass mailing and mass post.
- mass mailing is a true mass mailing
- using same_thread log a copy in the document, without using message_post
(using notification field, + model and res_id)
- improved form view of composer, adding a filed explaining a bit the various
recipients
- removed unnecessary fields coming from the template (partner_to, ...) because
they are confusing -> composer should be easier to understand and use
- removed some unnecessary code
- removed double body computation when using templates (one for tmeplate, then
the wizard -> not necessary)

This commit will be followed by other to try to improve the mass mailing
and mass post.

bzr revid: tde@openerp.com-20140220152945-ash0hfkzevzamihq
 2014-02-20 16:29:45 +01:00
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
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