Commit Graph

494 Commits

Author SHA1 Message Date
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Launchpad Translations on behalf of openerp 997fe404b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120628044101-cehvpv9yfm3xfsr3
2012-06-28 04:41:01 +00:00
Antony Lesuisse f17b0eea00 [MERGE] Use Email everywhere
bzr revid: al@openerp.com-20120627131528-u97jw0m7cq2825ll
2012-06-27 15:15:28 +02:00
Jigar Amin - OpenERP d9db3c44df [REN] renamed e-mail, E-mail, E-Mail to email, Email
bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
2012-06-25 19:12:53 +05:30
Sbh (Openerp) 9eb877fee5 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622084051-mu5wvb8ubinul6gb
bzr revid: sbh@tinyerp.com-20120625090342-b149ncajdnl4a3i6
2012-06-25 14:33:42 +05:30
Quentin (OpenERP) c9ef276770 [REF] search views: removed filter_domain if only one element was inside + made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
2012-06-22 12:29:59 +02:00
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Launchpad Translations on behalf of openerp 6e30c1323d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621052527-r3t1oxcolviiii4x
2012-06-21 05:25:27 +00:00
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
Purnendu Singh (OpenERP) 8e80119ac5 [MERGE] email_template: Merge a branch to update email template search view
bzr revid: psi@tinyerp.com-20120618071427-7uotdeqffegt32jx
2012-06-18 12:44:27 +05:30
Divyesh Makwana (Open ERP) dafb1992d7 [IMP] email_template : Improved the Search View.
bzr revid: mdi@tinyerp.com-20120618063739-8lc5v1qtpa0dr6fu
2012-06-18 12:07:39 +05:30
Divyesh Makwana (Open ERP) 7e1bbf696e [IMP] email_template : Improved the Search View.
bzr revid: mdi@tinyerp.com-20120618045341-dadyvs5qx233rye7
2012-06-18 10:23:41 +05:30
Atul Patel (OpenERP) f505fe0f63 [MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-page-sheet-improvement-atp-sales_management_pos_crm_page_sheet_improve-pja
bzr revid: atp@tinyerp.com-20120615072926-o94hhqvlnvohfhq7
2012-06-15 12:59:26 +05:30
Fabien Pinckaers 3c8643ce4c [IMP] better form views, new guidelines
bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
2012-06-09 16:39:04 +02:00
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Amit Patel (OpenERP) 7d382f34d7 [IMP]:email_template:solved inheritance problem
bzr revid: apa@tinyerp.com-20120605073234-xtdjpdfwlcxpqk5v
2012-06-05 13:02:34 +05:30
Ajay Chauhan (OpenERP) bdeb623399 [IMP]: resolved all conflicts
bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
2012-05-30 19:00:24 +05:30
Launchpad Translations on behalf of openerp 1227741b5a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120526050749-nakl3x59zsy0e3ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120527044006-4kmo9posveuumgsz
2012-05-27 04:40:06 +00:00
Ajay Chauhan (OpenERP) 47cc03c954 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
Ajay Chauhan (OpenERP) 7418558d1d [IMP] : removed button from tree
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
Mayur Maheshwari (OpenERP) ea859f54c8 [IMP]all: remove a complexity in openerp and move asset management and Payroll in extra modules
bzr revid: mma@tinyerp.com-20120518052605-e6sdmicwtb4kcoq0
2012-05-18 10:56:05 +05:30
Launchpad Translations on behalf of openerp 420e45e139 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120511051518-305vmplvaiu2zncy
bzr revid: launchpad_translations_on_behalf_of_openerp-20120512054219-7jxlr0c1whe4vrob
bzr revid: launchpad_translations_on_behalf_of_openerp-20120513044345-ujj9bgbnd64gpfnz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120514044358-vu4410a564766u5f
2012-05-14 04:43:58 +00:00
Raphael Collet d08ad3bab3 [MERGE] trunk-some_typo (fix capitalization and typos in labels)
bzr revid: rco@openerp.com-20120510151939-fdadjh0rgll6uihr
2012-05-10 17:19:39 +02:00
Raphael Collet a327b7aed5 [IMP] adapt po files to label changes, to ease translations
bzr revid: rco@openerp.com-20120510130751-3vhhfbsmo45zitzx
2012-05-10 15:07:51 +02:00
Raphael Collet 1dcd32ec5e [IMP] email_template: fix capitalization in po files
bzr revid: rco@openerp.com-20120510075314-u9977nneo4rtad3t
2012-05-10 09:53:14 +02:00
Raphael Collet f8a6776092 [FIX] crm: rename fields optin, optout to opt_in, opt_out, to make them consistent with opt_out in res.partner (module email_template)
lp bug: https://launchpad.net/bugs/995986 fixed

bzr revid: rco@openerp.com-20120508074338-2dcayog3ebybfi22
2012-05-08 09:43:38 +02:00
Mayur Maheshwari (OpenERP) c71446957f [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120426091833-ocminkwzjkntdkde
2012-04-26 14:48:33 +05:30
Raphael Collet ac94300f0f [IMP] base_*, email_template, fetchmail, mail, import_*: remove group_extended
bzr revid: rco@openerp.com-20120425144258-jpb9xey20h7fq4tx
2012-04-25 16:42:58 +02:00
Mayur Maheshwari (OpenERP) 9e59ce8812 [IMP]all: Improve all typos
bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
2012-04-24 11:35:32 +05:30
Launchpad Translations on behalf of openerp 869d9375d9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120421050113-mihw3po15423nlen
bzr revid: launchpad_translations_on_behalf_of_openerp-20120422044519-ij0it02kxvl7jm52
bzr revid: launchpad_translations_on_behalf_of_openerp-20120423044629-8fb2zo9nmi3e8grt
2012-04-23 04:46:29 +00:00
Olivier Dony ee77b351b4 [MERGE] Latest fixes from 6.1
bzr revid: odo@openerp.com-20120322143654-w7etvdnq4z5tg6bt
2012-03-22 15:36:54 +01:00
Rucha Patel b3f2abec46 [FIX] email_template: ensure non-empty context when rendering template'
bzr revid: odo@openerp.com-20120322141153-8u3kia3k125et6b5
2012-03-22 15:11:53 +01:00
Rucha Patel cbef5ce396 [FIX] email_template: don't re-encode attachments copied from template'
bzr revid: odo@openerp.com-20120322141104-rw5i4dedy01wjmjf
2012-03-22 15:11:04 +01:00
Launchpad Translations on behalf of openerp dc6161c889 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120322062352-syfsimh3ol3vje45
2012-03-22 06:23:52 +00:00
Olivier Dony 5615911303 [MERGE] Latest bugfixes from 6.1
bzr revid: odo@openerp.com-20120320182912-g2ylze2qsqv93y4i
2012-03-20 19:29:12 +01:00
Christophe Simonis b7bad83c21 [FIX] email_template: report_name must be rendered
bzr revid: chs@openerp.com-20120316091517-e2hc8ydzd3vnnv3j
2012-03-16 10:15:17 +01:00
Olivier Dony 3e0279ac4a [FIX] email_template: attachments were not being sent due to programming error
bzr revid: odo@openerp.com-20120315155512-s76y2u3gz3awfy74
2012-03-15 16:55:12 +01:00
Launchpad Translations on behalf of openerp 5ebc07237a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052625-78n2341gtv2zrgwg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050634-9ftgr94cy2tvp9y5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051214-q1f14seqal4j8rn5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120310052733-s24jj1qyoxy2j8lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20120311050659-0ky4089nbil85weg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120312051227-90mlbjgzqjyj8a8a
2012-03-12 05:12:27 +00:00
Olivier Dony d55eff4218 [FIX] email.template: body_html should be translatable
bzr revid: odo@openerp.com-20120309160625-kwp4pof4vm7aci2g
2012-03-09 17:06:25 +01:00
Olivier Dony eefbb2ac5c [FIX] email_template: care for missing context
bzr revid: odo@openerp.com-20120309011156-q53pc4h6stlz3kq2
2012-03-09 02:11:56 +01:00
Launchpad Translations on behalf of openerp f6c3cd9bb7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120306052805-zlaw3c4skc81oj8z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120307060413-fvlney19la4wjhqn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120307060421-haf4qy1x6vu5xdrx
2012-03-07 06:04:21 +00:00
Launchpad Translations on behalf of openerp 79ff7b620a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120306044843-9a70e0z9fqoy4v3f
2012-03-06 04:48:43 +00:00
Launchpad Translations on behalf of openerp f210e73f21 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120225055251-o6ajm1k0ya17sd2j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120226052201-liykx2ue4jufkcwc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120227055617-7bb3evbppqedlx8p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120228063037-0nhyn4iid36dorfs
2012-02-28 06:30:37 +00:00
Launchpad Translations on behalf of openerp a3ac698fe8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218071328-fl3yjw2gawigfooh
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219063344-7w5y8nkweukg0f88
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220061321-0z254064e8vsx286
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063558-wc526qfv4ko5s6q0
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221063603-medp0cjt2z5vy70x
2012-02-21 06:36:03 +00:00
Launchpad Translations on behalf of openerp 88c25488a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120218050004-fsjgcm68ejwkyila
bzr revid: launchpad_translations_on_behalf_of_openerp-20120219054401-1933r0e5ukykqh0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120220054126-hug47vk8c43pxbqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120221055612-pdqteum51dyapu2e
2012-02-21 05:56:12 +00:00
Launchpad Translations on behalf of openerp 9f65e1565e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217050201-xlguleciidhnkxln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120217051344-6opxazcgg875mypq
2012-02-17 05:13:44 +00:00
Launchpad Translations on behalf of openerp 2094148de5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050419-fgzhvlogc71u42qe
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216050718-lf9hgvr1p33jpm2h
bzr revid: launchpad_translations_on_behalf_of_openerp-20120216052148-ta5bwtqg3bzmvp3i
2012-02-16 05:21:48 +00:00
Launchpad Translations on behalf of openerp 74b3b0bc69 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054303-2gawtr1s4zulhhhs
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214054630-925y7kotw7axa7z4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120214061906-2g5kxwe0xle5u54c
2012-02-14 06:19:06 +00:00
Olivier Dony 16a8811930 [IMP] mail,email_template: improved views, assert missing email_from
- add missing colspans for notebooks
- remove some buttons from mail.message form view,
  namely because send button can cause record deletion
  possibly causing some weird UI result.. better used
  from the list view for now (web was fixed anyway)
- better domain on Message action, to ease debugging
- added assert for email_from in email_template.send_email()
  to catch errors earlier

bzr revid: odo@openerp.com-20120213143531-eiuhulo46bv059pl
2012-02-13 15:35:31 +01:00