Commit Graph

508 Commits

Author SHA1 Message Date
Sanjay Gohel (Open ERP) b81c51c73c [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c
2012-07-16 12:27:03 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Quentin (OpenERP) 413d44c915 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120712153040-tglxx3gc7gjlry72
2012-07-12 17:30:40 +02:00
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Sanjay Gohel (Open ERP) 12bae0d8f9 [IMP]improve company form view as per review. improve email_template,user form and all action window and also remove sheets from configuration
bzr revid: sgo@tinyerp.com-20120706123413-1n615yx09cw2kq36
2012-07-06 18:04:13 +05:30
Launchpad Translations on behalf of openerp c449d53f0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120703053613-vs3ebaffu079mlld
bzr revid: launchpad_translations_on_behalf_of_openerp-20120703055544-8hfe2zf9x5g8muvi
2012-07-03 05:55:44 +00:00
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
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 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
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
Jigar Amin - OpenERP dfdbf8cf17 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +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
Jigar Amin - OpenERP 21650f9790 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120619093157-ay1hdzmp8yh8bfgz
2012-06-19 15:01:57 +05:30
Jigar Amin - OpenERP 1f54be8182 [MERGE] lp:~openerp-dev/openobject-addons/trunk-wiz-remove-btn-tools-tpa
bzr revid: jam@tinyerp.com-20120619090140-90laxckmkq19h9us
2012-06-19 14:31:40 +05:30
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
ajay javiya (OpenERP) 25bcae09f8 [REM] : Remove cancel button from wizard
bzr revid: aja@tinyerp.com-20120618124511-362td1pd82io8sxr
2012-06-18 18:15:11 +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
Turkesh Patel (Open ERP) 1a2735c7b2 [IMP] mail: remove cancel button and improved view of wizard.
bzr revid: tpa@tinyerp.com-20120615111732-pzquodtezhyfpakp
2012-06-15 16:47:32 +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