Commit Graph

335 Commits

Author SHA1 Message Date
Launchpad Translations on behalf of openerp a6c649dd4e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223054503-il515335tdfkghbw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111223073609-mpe8e232ykba47y0
2011-12-23 07:36:09 +00:00
Olivier Dony cb28f8de07 [I18N] all: update translation templates
bzr revid: odo@openerp.com-20111222185539-9gn06tu38ynoc416
2011-12-22 19:55:39 +01:00
Launchpad Translations on behalf of openerp 8e2457efe8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111220045056-kxmsczkxkgf5ffe1
bzr revid: launchpad_translations_on_behalf_of_openerp-20111220045629-sx3btepqeei2nq1k
2011-12-20 04:56:29 +00:00
Fabien Pinckaers 5cfeb7ddba [FIX] bug 902131 close instead of done
bzr revid: fp@tinyerp.com-20111219215028-5ukoagwjnpo0x48k
2011-12-19 22:50:28 +01:00
Raphael Collet 68ff6cb98a [MERGE] marketing_campaign: improve tests
bzr revid: rco@openerp.com-20111215103225-8rlbof75uxnqjkrw
2011-12-15 11:32:25 +01:00
Turkesh Patel (Open ERP) fbea42e45e [IMP] changed the name of button from Close to Done.
bzr revid: tpa@tinyerp.com-20111213091854-vc8z7catofgklmbw
2011-12-13 14:48:54 +05:30
Harry (OpenERP) 82e232fc4e [MERGE] merged
bzr revid: hmo@tinyerp.com-20111213074305-0x72r6vv7fuvnok0
2011-12-13 13:13:05 +05:30
Harry (OpenERP) 359f0b42e2 [MERGE] merged with trunk development branch.
bzr revid: hmo@tinyerp.com-20111213074129-0frej7vvaefubybe
2011-12-13 13:11:29 +05:30
Turkesh Patel (Open ERP) f9524f5dba [IMP] improvement in YML test cases in marketing_campaign module
bzr revid: tpa@tinyerp.com-20111213052238-kuk13vidnoa3fwhq
2011-12-13 10:52:38 +05:30
Fabien Pinckaers f27318c8af [IMP] Security Rule: removed duplicates due to inheritancies of groups
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
Turkesh Patel (Open ERP) 5030f3e6d1 [IMP] solved the error in yml test case
bzr revid: tpa@tinyerp.com-20111212062225-pjqkhlz7nbg1k09h
2011-12-12 11:52:25 +05:30
Fabien Pinckaers 5bb0bf0441 [IMP] Core applciations update
bzr revid: fp@tinyerp.com-20111211212510-d61afdy0nyw74j6c
2011-12-11 22:25:10 +01:00
Turkesh Patel (Open ERP) 3f74a7f2c8 [FIX] Fix issue of button in marketing_campaign module
bzr revid: tpa@tinyerp.com-20111209132555-gjh7a5d33d98l7q0
2011-12-09 18:55:55 +05:30
Ujjvala Collins (OpenERP) eb4c08585d [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20111209110252-u2ai6i63icpwblhc
2011-12-09 16:32:52 +05:30
Turkesh Patel (Open ERP) 9e6a6b6d28 [MRG]
bzr revid: tpa@tinyerp.com-20111209104836-kp4jy0pl60vakmc3
2011-12-09 16:18:36 +05:30
Antony Lesuisse 69f685f386 [IMP] rename is_application to application
bzr revid: al@openerp.com-20111208222543-avte2h9qit5zfvht
2011-12-08 23:25:43 +01:00
Christophe Simonis 1831cddc7e [FIX] core -> is_application
bzr revid: chs@openerp.com-20111208151455-d7pffuiwxdns76ec
2011-12-08 16:14:55 +01:00
Fabien Pinckaers 0eab577b40 [IMP] Core modules for apps
bzr revid: fp@tinyerp.com-20111206112127-5lir7aovygx4a4oi
2011-12-06 12:21:27 +01:00
Harry (OpenERP) 82753bfc6a [IMP] marketing_campaign: clenup yml again
bzr revid: hmo@tinyerp.com-20111202111524-wk0wnrki1b0bm3po
2011-12-02 16:45:24 +05:30
Harry (OpenERP) 370e0c6510 [IMP] marketing_campaign: cleanup demo and yml to test process of compaign
bzr revid: hmo@tinyerp.com-20111202110118-3w1h2z38d844f04i
2011-12-02 16:31:18 +05:30
Harry (OpenERP) 4e99a743b3 [MERGE] merged with trunk development branch: lp:~openobject-addons
bzr revid: hmo@tinyerp.com-20111202084648-mhvwmmu2k83fg2vd
2011-12-02 14:16:48 +05:30
Harry (OpenERP) 0a28852979 [IMP] marketing_campaign: improve yml to test process of campaign segmentation, add new demo data for partner channel in marketing_campaign module
bzr revid: hmo@tinyerp.com-20111130113652-uqxjdy7icybq2h4g
2011-11-30 17:06:52 +05:30
Numerigraphe - Lionel Sausin 779fa653c1 [IMP] Added missing vim mode lines
lp bug: https://launchpad.net/bugs/524279 fixed

bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
2011-11-22 09:51:38 +01:00
Fabien Pinckaers c465e9c3f7 merge: better year/month OR separations
bzr revid: fp@tinyerp.com-20111111151839-3dai448l29o0gwov
2011-11-11 16:18:39 +01:00
Fabien Pinckaers 6cbf19d815 [Merge] es_MX from Vauxoo
bzr revid: fp@tinyerp.com-20111111144930-5o37idpxdvyhtfri
2011-11-11 15:49:30 +01:00
ron@tinyerp.com afe2cdb3c7 [MERGE] Merged with lp:addons
bzr revid: ron@tinyerp.com-20111111110356-gas4sfpm9knt104h
2011-11-11 16:33:56 +05:30
ron@tinyerp.com 02cfa857f5 [REF] marketing_campaign: Used get_object_reference instead of _get_id from data got from ir.model
bzr revid: ron@tinyerp.com-20111111094142-r50oajp8fhe3nzjl
2011-11-11 15:11:42 +05:30
Khushboo Bhatt (Open ERP) 20a06c35ca [IMP]marketing:improvement analysis report
bzr revid: kbh@tinyerp.com-20111111084358-6xxzvw3x1bfmreo8
2011-11-11 14:13:58 +05:30
Khushboo Bhatt (Open ERP) 207e964b2b [IMP]marketing:improvement analysis report
bzr revid: kbh@tinyerp.com-20111110102059-oijxnmbsfxk1uz42
2011-11-10 15:50:59 +05:30
ron@tinyerp.com fd9ec559cb [IMP] marketing_campaign, marketing_campaign_crm_demo: Traceback generate when processing workitem, and Improved demo data of Email template
bzr revid: ron@tinyerp.com-20111108112023-1fwd5vdez50lmiiw
2011-11-08 16:50:23 +05:30
Launchpad Translations on behalf of openerp 2393cbcaab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108054936-o85vdc79709844pf
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108061220-ayp19sctv6uvxl1u
2011-11-08 06:12:20 +00:00
Launchpad Translations on behalf of openerp 6f77ce98c7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
Launchpad Translations on behalf of openerp e3ffcd94d6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019044609-vzsrc1a6nn17ahbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019055343-7s4rmkn8lpxvyt4n
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019060521-3smagczfoys4j5wl
2011-10-19 06:05:21 +00:00
Israel Fermin Montilla 52b23d7040 [ADD] added es_MX.po translation files for each module
bzr revid: israel@openerp.com.ve-20111007201144-kap9ou7w8g92ai02
2011-10-07 16:11:44 -04:00
Israel Fermin Montilla 9b189d5a90 [ADD] added the es_VE.po translation files for each module
bzr revid: israel@openerp.com.ve-20111007193500-i7k8h9t28nhxioap
2011-10-07 15:35:00 -04:00
Stephane Wirtel 3dc8168974 [FIX] Set the categories
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
Stephane Wirtel 7c93366eab [FIX] Update the categories of some modules
bzr revid: stw@openerp.com-20110930154646-9tr60seb389nw3yd
2011-09-30 17:46:46 +02:00
Stephane Wirtel 1ba826a4ea [REF] Rename the categories
bzr revid: stw@openerp.com-20110928141258-9hfn5rfhboar2e5z
2011-09-28 16:12:58 +02:00
Rucha (Open ERP) 0e861ae34a [MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
Mayur Maheshwari (OpenERP) 1be371c851 [IMP]account_voucher,crm_claim,crm_fundraising,marketing_campaign,stock,purchase_requisition:removed a quote from statusbar_colour as per suggestion
bzr revid: mma@tinyerp.com-20110921051720-ag458lyz42o64bhb
2011-09-21 10:47:20 +05:30
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
Mayur Maheshwari (OpenERP) 364f9aefa9 [IMP]stock,purchase_requisition,crm:statusbar Improvement is Done
bzr revid: mma@tinyerp.com-20110914131111-3o0jykg61r5eq98c
2011-09-14 18:41:11 +05:30
Olivier Dony d22c3043aa [FIX] marketing_campaign: typos and cleanup
bzr revid: odo@openerp.com-20110912180025-scdjvcnquo07zcha
2011-09-12 20:00:25 +02:00
Olivier Dony 983a7d2fd2 [MERGE] latest trunk
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Xavier Morel 178fec5c64 [FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Olivier Dony f42126df0e [MERGE] latest trunk
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
Launchpad Translations on behalf of openerp 752df5acbd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Olivier Dony b0bed63351 [IMP] mail.thread: renaming methods to avoid collisions with objects that use the mixin
bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
2011-08-23 19:58:09 +02:00
Olivier Dony 50507512cb [MERGE] latest trunk
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Raphael Collet 292b4683b6 [MERGE] add field 'complexity' in modules
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00