Commit Graph

310 Commits

Author SHA1 Message Date
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
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
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
Hardik Ansodariy (OpenERP) 1f5aa0643f [IMP]: module is defined by its complexity
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Launchpad Translations on behalf of openerp 5a823350e0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110702050634-xl59j3cyqucb2xbr
bzr revid: launchpad_translations_on_behalf_of_openerp-20110703044707-mjrlbh7l81jm56z7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110705043321-ij8r6auabm4cptt6
2011-07-05 04:33:21 +00:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
2011-07-02 01:41:24 +02:00
Launchpad Translations on behalf of openerp f1ea42e230 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110701045457-prq3cv67drfa19xt
2011-07-01 04:54:57 +00:00
Launchpad Translations on behalf of openerp f08cf2f85f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045323-azozpfkhj7vaix3f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045352-2mjk93fx426eijy4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110508043753-3bcytaz1rrn2vvbh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110509043658-oyhxuwreey6yc4r1
2011-05-09 04:36:58 +00:00
Launchpad Translations on behalf of openerp d553615695 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Harry (OpenERP) 0577796333 [MERGE] merged addons trunk development branch after resolving conflicts
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Thibault Francois b11a71fd87 [MERGE] improvement project-issue
bzr revid: tfr@openerp.com-20110407114145-xvr27pjquxwk9ff0
2011-04-07 13:41:45 +02:00
Thibault Francois 1a45ff614d [MERGE] crm improvement
bzr revid: tfr@openerp.com-20110407092730-bjm0pwq9mewpvzc0
2011-04-07 11:27:30 +02:00
Rifakat Haradwala (Open ERP) 63de8740bc [FIX] csv file semicolon error
bzr revid: rha@tinyerp.com-20110405061713-b9qmkeqqg64er6lf
2011-04-05 11:47:13 +05:30
Rifakat Haradwala (Open ERP) 47a85e9f8f [IMP] mail: rename module email to mail because of parsing error
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
Harry (OpenERP) cf7c73310d [MERGE] merged with trunk addods development branch
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
niv-openerp 1b7854503d [IMP] Improvements to the screenshots for some modules.
bzr revid: nicolas.vanhoren@openerp.com-20110322131214-g4h9rzpam67k2ym9
2011-03-22 14:12:14 +01:00
niv-openerp cf07e58016 [MERGE] Other improvements of descriptions in module manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
vro 437ed909c2 [IMP]: Module descriptions.
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
niv-openerp a898038b47 [MERGE] Merged module screenshots and improvements to module descriptions.
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
niv-openerp edbb2d7168 [MERGE] Improvements to manifests.
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
Rucha (Open ERP) 117d3f75a0 [MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
Olivier Dony f74b1bafe0 [IMP] marketing_campaign: added unique field for duplicate prevention on the campaign form
bzr revid: odo@openerp.com-20110316182903-9qh08k4wu2wb14hr
2011-03-16 19:29:03 +01:00
Olivier Dony 0045ab984c [IMP] marketing_campaign: duplicate prevention for segments can now use a unique field set on the campaign
bzr revid: odo@openerp.com-20110316182356-r7xqcmz42se6n4ms
2011-03-16 19:23:56 +01:00
vro d4672f80ac [ADD]: Images: lunch, mail_gateway, marketing, marketing_campaign
bzr revid: vro@tinyerp.com-20110316074733-rlpnvdspeguh3fnc
2011-03-16 13:17:33 +05:30
Xavier Morel 4e6a9ea55c [REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
Xavier Morel 8141573dee [REM] attribute 'select' on field elements in search views, this attributes makes no sense
bzr revid: xmo@openerp.com-20110315124111-c79fxotsc0tk011q
2011-03-15 13:41:11 +01:00
Olivier Dony 488200e0c9 [FIX] marketing_campaign: avoid exception when resource linked to workitem was deleted
bzr revid: odo@openerp.com-20110312011401-qy5lmffp4owfsxf6
2011-03-12 02:14:01 +01:00
Olivier Dony cbb98b719b [FIX] marketing_campaign: fixed search on res_name on workitems + minor tweaks
bzr revid: odo@openerp.com-20110312000705-rbjet1wg30y79v12
2011-03-12 01:07:05 +01:00