Commit Graph

52769 Commits

Author SHA1 Message Date
niv-openerp 52f6f0bd04 [IMP] Changed some "Cancel" buttons to links
bzr revid: nicolas.vanhoren@openerp.com-20120720124430-gbhow8qcipsrieb4
2012-07-20 14:44:30 +02:00
niv-openerp 5759d97daa [IMP] changed place of buttons in relation popups
bzr revid: nicolas.vanhoren@openerp.com-20120720123528-fpskc2r42d06z28r
2012-07-20 14:35:28 +02:00
Thibault Delavallée cd09b04273 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120720122418-yhiyx1c13dnpn1jj
2012-07-20 14:24:18 +02:00
Thibault Delavallée ab403357fe [MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-20120720082037-0dsd0ado0e1ogft4
bzr revid: tde@openerp.com-20120720122354-a0y7xcjfqnxu4u8x
2012-07-20 14:23:54 +02:00
Stephane Wirtel a4067e70af [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue-stw
bzr revid: stw@openerp.com-20120720121411-qhxmzb66vht2m8ls
2012-07-20 14:14:11 +02:00
Stephane Wirtel ae8b2f65ed [FIX] merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix
bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13
2012-07-20 14:12:46 +02:00
Thibault Delavallée 284e793936 [IMP] cleditor: removed source link. Updated get_value to be more consistent.
bzr revid: tde@openerp.com-20120720115046-fp0do72zy3cs2p2w
2012-07-20 13:50:46 +02:00
Purnendu Singh (OpenERP) d5ec4a6535 [IMP] update pot files
bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r
2012-07-20 17:14:02 +05:30
Thibault Delavallée 28b3d3eac4 [IMP] text_html widget: cleaned a bit the code.
bzr revid: tde@openerp.com-20120720113358-y5mt98w1ug9ljbvo
2012-07-20 13:33:58 +02:00
Thibault Delavallée f4baf23f07 [REM] [ADD] Removed old unused icons; added icons for composer.
bzr revid: tde@openerp.com-20120720102904-jkwhlt1fgvf1ywja
2012-07-20 12:29:04 +02:00
Thibault Delavallée 10e64ed7eb [IMP] res.users, res.partner: chatter in correct 'footer' style.
bzr revid: tde@openerp.com-20120720102435-v20b8jnwum6uvm84
2012-07-20 12:24:35 +02:00
Thibault Delavallée 49acfe6978 [MOV] mail_demo moved to data/mail_demo.
bzr revid: tde@openerp.com-20120720102103-4ls3yb0s7z27m4t6
2012-07-20 12:21:03 +02:00
Thibault Delavallée 150b0fccd1 [REM] mail.message: schedule with attach: removed type=email, because this is the default value.
bzr revid: tde@openerp.com-20120720101756-slv9kd6r5a3d9qrw
2012-07-20 12:17:56 +02:00
Raphael Collet 75abad6a61 [MERGE] trunk-module-summary (add field 'summary' on modules)
bzr revid: rco@openerp.com-20120720100339-sk3mx0qucujeqsxe
2012-07-20 12:03:39 +02:00
Raphael Collet 5a210edad4 [MERGE] trunk-module-summary (add field 'summary' on modules)
bzr revid: rco@openerp.com-20120720100253-ulll8tu221v14x1t
2012-07-20 12:02:53 +02:00
Thibault Delavallée a5648e75d8 [IMP] mail.mesage: scheduler: try to send only outgoing emails.
bzr revid: tde@openerp.com-20120720095719-0qmigezuv7r6gr3d
2012-07-20 11:57:19 +02:00
Thibault Delavallée 7ab67eb72d [IMP] mail.message view: cleaned short view for feeds.
bzr revid: tde@openerp.com-20120720094929-wite8l21xa60v33n
2012-07-20 11:49:29 +02:00
Raphael Collet dee772d423 [FIX] in summary of modules: typos
bzr revid: rco@openerp.com-20120720093046-92l51ts5aaee9etq
2012-07-20 11:30:46 +02:00
Thibault Delavallée 58da4f7688 [REF] mail: res.partner inheritance: removed unnecessary 'emails' column, as this is managed by Chatter. Also updated partner_id -> partner_ids.
bzr revid: tde@openerp.com-20120720092620-o94cxdi2hxthd5y1
2012-07-20 11:26:20 +02:00
Thibault Delavallée bb64a121e7 [CLEAN] mail.message: cleaned comments and formatting, added parent_id and child_ids to mail.message model; mail.message.common only have a parent_id field now.
bzr revid: tde@openerp.com-20120720092545-gouxtlg9b6frehm1
2012-07-20 11:25:45 +02:00
Raphael Collet 86e5835728 [IMP] module kanban: remove unnecessary line break
bzr revid: rco@openerp.com-20120720092327-1j9777ss4n85c4og
2012-07-20 11:23:27 +02:00
Raphael Collet 9bbd6236d9 [IMP] base: add partner categories in partner kanban view
bzr revid: rco@openerp.com-20120720083059-q1bdcupzuge088jf
2012-07-20 10:30:59 +02:00
Thibault Delavallée 9cfa2908b8 [FIX] mail_compose_message: lost '{'.
bzr revid: tde@openerp.com-20120720082549-2z2feyuk37xrlqtw
2012-07-20 10:25:49 +02:00
Thibault Delavallée 956011bc09 [MERGE] Merged with web/trunk.
bzr revid: tde@openerp.com-20120720082055-p04uzdmt8fm0xqne
2012-07-20 10:20:55 +02:00
Thibault Delavallée 4488c359d9 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120720082047-5i1r9sslqqh0a9s8
2012-07-20 10:20:47 +02:00
Stephane Wirtel 7eb49260d1 [REVERT] previous merge of lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha
bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka
2012-07-20 09:34:59 +02:00
Purnendu Singh (OpenERP) e284d3b4dc [IMP, MERGE] merge rpa branch with few misc changes
bzr revid: psi@tinyerp.com-20120720073038-i5gv23jwkj3555wh
2012-07-20 13:00:38 +05:30
Stephane Wirtel 653987c638 [MERGE]
bzr revid: stw@openerp.com-20120720063054-0hnrk6674r91rxpc
2012-07-20 08:30:54 +02:00
Stephane Wirtel b00d0d5c82 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha
bzr revid: stw@openerp.com-20120720061634-yxo5y929pdmd1q2w
2012-07-20 08:16:34 +02:00
Rajesh Prajapati (OpenERP) 0c1dc06331 [MERGE] merge with parent branch
bzr revid: rpr@tinyerp.com-20120720055401-hu537f6dua4px1d3
2012-07-20 11:24:01 +05:30
Purnendu Singh (OpenERP) ca7aa2f05c [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120720054317-murmvmuya3hqsgpc
2012-07-20 11:13:17 +05:30
Launchpad Translations on behalf of openerp ad9f16238d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120720043734-rqxoubj45utde2nb
bzr revid: launchpad_translations_on_behalf_of_openerp-20120720044532-0x70lsjeu7dcpj56
2012-07-20 04:45:32 +00:00
Antonin Bourguignon a39d676890 [MERGE] improve top level menu items numerotation
bzr revid: abo@openerp.com-20120719181357-xblz0ovyoqsopvxk
2012-07-19 20:13:57 +02:00
Antonin Bourguignon 7df568d138 [MERGE] improve top level menu items numerotation
also remove deprecated attributes 'icon', 'web_icon' and 'web_icon_hover' from menuitem elements

bzr revid: abo@openerp.com-20120719181352-e5l3aob4cqb3yv9w
2012-07-19 20:13:52 +02:00
Antonin Bourguignon a4fba2145b [MERGE] latest trunk
bzr revid: abo@openerp.com-20120718131530-a90b062c769y0u0e
bzr revid: abo@openerp.com-20120719164208-xj75h0socxc3p6jb
2012-07-19 18:42:08 +02:00
Antonin Bourguignon 6cd6a4b9ef [MERGE] latest trunk
bzr revid: abo@openerp.com-20120719163916-sejnns28zt2rmxud
2012-07-19 18:39:16 +02:00
Thibault Delavallée 642fc05be5 [CLEAN] mail.message: cleaned comments before merge. Also made an auto update of email_to field, based on partner_ids.
bzr revid: tde@openerp.com-20120719163809-3c6cex32rg0qo8y1
2012-07-19 18:38:09 +02:00
Thibault Delavallée fab43d4140 [REM] Removed a print statement.
bzr revid: tde@openerp.com-20120719155641-a2ant2472swb3fhp
2012-07-19 17:56:41 +02:00
Thibault Delavallée b3c5d4361b [REM] Removed js library, moved into web decades ago.
bzr revid: tde@openerp.com-20120719154300-x1za0g4srxogt45k
2012-07-19 17:43:00 +02:00
Thibault Delavallée 8a56b182a8 [CLEAN] Removed some unnecessary code and comments.
bzr revid: tde@openerp.com-20120719151154-2u1rni4pxwik21o9
2012-07-19 17:11:54 +02:00
Thibault Delavallée 81e6449e57 [IMP] res_partner regex: added more support to the name.
bzr revid: tde@openerp.com-20120719150725-sas4xjbj492hv3pb
2012-07-19 17:07:25 +02:00
Thibault Delavallée 06fdb65695 [IMP] res_partner: improved regex used to find the email and name.
bzr revid: tde@openerp.com-20120719150349-6nkkq6h576tc6hyp
2012-07-19 17:03:49 +02:00
Thibault Delavallée fa4653aecc [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120719143402-c1960p3gt863u07s
2012-07-19 16:34:02 +02:00
Thibault Delavallée 667f3bc229 [DOC] res_partner: cleaned comments.
bzr revid: tde@openerp.com-20120719142759-uskridc98l3q7d1f
2012-07-19 16:27:59 +02:00
Stephane Wirtel 4259367638 [MERGE] lp:~openerp-dev/openobject-addons/trunk-invoicing-mdi
bzr revid: stw@openerp.com-20120719141908-dai95svgd4q7wh7l
2012-07-19 16:19:08 +02:00
Thibault Delavallée ec99e0ec44 [MERGE] Merged with server/trunk, for last fixes.
bzr revid: tde@openerp.com-20120716082515-y0v4b2t6c2gyzxwe
bzr revid: tde@openerp.com-20120717075741-ugokyzaq3pd5en29
bzr revid: tde@openerp.com-20120717103402-cirgbljc86wva046
bzr revid: tde@openerp.com-20120718110851-kfjubjf2bpra9uxp
bzr revid: tde@openerp.com-20120719083307-rmjeo1pcu2k02ouf
bzr revid: tde@openerp.com-20120719141330-sxuq5x2f7oz2w0sb
2012-07-19 16:13:30 +02:00
Thibault Delavallée 4b5bf16065 [IMP] mail: chatter: html messages displayed as html.
bzr revid: tde@openerp.com-20120719141214-m5yyj74q65yoiruu
2012-07-19 16:12:14 +02:00
Thibault Delavallée 7e748858cd [FIX] mail compose message: fixed body_html on quotation, fixed reference and header computation.
bzr revid: tde@openerp.com-20120719141201-32rl7t40qhzu0ylj
2012-07-19 16:12:01 +02:00
Antonin Bourguignon 37f391a564 [FIX] Feeds header's layout
bzr revid: abo@openerp.com-20120719141019-p6ugjbsnt7wrfb03
2012-07-19 16:10:19 +02:00
Thibault Delavallée 6b9783629b [IMP] mail: composition form: added partner form email templates; when sending an email, email_to is composed based on partner_ids also.
bzr revid: tde@openerp.com-20120719135745-b9ksd2adtrfdb2bm
2012-07-19 15:57:45 +02:00