Commit Graph

374 Commits

Author SHA1 Message Date
Raphael Collet 549e2f5064 [IMP] association, auction, event, idea, marketing, membership, subscription, survey: remove group_extended
bzr revid: rco@openerp.com-20120425143528-gat2f4cdotqv1x06
2012-04-25 16:35:28 +02:00
Launchpad Translations on behalf of openerp e9f015e217 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120424045336-z7vvlldbzqcxlzbg
bzr revid: launchpad_translations_on_behalf_of_openerp-20120425044636-947k9ddma8u81o50
2012-04-25 04:46:36 +00:00
Sbh (Openerp) e17dee3a5e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120323052530-l9fsd06fbma1l3gz
2012-03-23 10:55:30 +05:30
Jagdish Panchal (Open ERP) a4a2696fb3 [MERGE] branch merged with lp:openobject-addons
bzr revid: jap@tinyerp.com-20120321065621-rr4ehnehog9aq4d2
2012-03-21 12:26:21 +05:30
Olivier Dony 5615911303 [MERGE] Latest bugfixes from 6.1
bzr revid: odo@openerp.com-20120320182912-g2ylze2qsqv93y4i
2012-03-20 19:29:12 +01:00
Bhumika (OpenERP) 79ff0e3424 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120321065319-pj7o5oz8pdr0v2jm
2012-03-21 12:23:19 +05:30
Olivier Dony dd16fb2819 [FIX] marketing_campaign: correct search view, today should not be OR'ed with states
In 6.1 a group of filters in a search view are
OR'ed together if toggled when they are contained
within the same 'separator' group.

bzr revid: odo@openerp.com-20120309011312-zcn29o4r3uqjxiow
2012-03-09 02:13:12 +01:00
Jigar Amin - OpenERP bfe0f1a489 [IMP] markeeting_campaign removed the address_id in rer
bzr revid: jam@tinyerp.com-20120307064650-9u0y0w9wt60pucqi
2012-03-07 12:16:50 +05:30
Meera Trambadia (OpenERP) b26fdadccc [MERGE] branch merged with trunk-menus-improvements-reporting-mtr
bzr revid: mtr@tinyerp.com-20120305095729-33g12fp1jqajhgbr
2012-03-05 15:27:29 +05:30
Jagdish Panchal (Open ERP) 5c0a90f410 [IMP] marketing_campaign: remove default filter on list view
bzr revid: jap@tinyerp.com-20120229133318-vwubk2qp7cl1eh8v
2012-02-29 19:03:18 +05:30
Jagdish Panchal (Open ERP) 609b704c9f [IMP] marketing: renamed menu Events Organisation => Events and change the sequence of Campaign Followup and Campaigns
bzr revid: jap@tinyerp.com-20120229132135-qjvwh8utbd3ndoap
2012-02-29 18:51:35 +05:30
Launchpad Translations on behalf of openerp fefba7d11e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120229052746-lhfn0qjqmzuqz1js
2012-02-29 05:27:46 +00:00
Meera Trambadia (OpenERP) 3d0cc26eb0 [IMP] association, marketing_campaign:-changed menu sequence for reporting
bzr revid: mtr@tinyerp.com-20120228095158-82f6s0qoo9lh396a
2012-02-28 15:21:58 +05:30
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
Meera Trambadia (OpenERP) ab9ee8c656 [IMP] marketing_campaign:- reorganise menu
bzr revid: mtr@tinyerp.com-20120228052847-cvzip3xp1oi4n7ju
2012-02-28 10:58:47 +05:30
Launchpad Translations on behalf of openerp 9b0c341975 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120222065619-wdj17h21k8iuy3w6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120222065704-3l8az0alwzd2mrmk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120222065707-hp0u1vljdfgyjqxf
2012-02-22 06:57:07 +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 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
Launchpad Translations on behalf of openerp 2aa2378015 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120211050953-f8t9zos3qjzmnj3t
bzr revid: launchpad_translations_on_behalf_of_openerp-20120212044319-nxuw0h7g5aqrqy4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120213045042-jyku2inv3wkcae91
2012-02-13 04:50:42 +00:00
Launchpad Translations on behalf of openerp 0e2e9ddd78 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209055558-qfwy9bg1km791dys
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209071015-0jykfhbo8iamzpzk
bzr revid: launchpad_translations_on_behalf_of_openerp-20120209072746-stmwycdircyzrxn4
2012-02-09 07:27:46 +00:00
Carlos Vásquez 3afecc7604 [ADD] es_CR.po: added po to all modules, copy from es.po or from pot
bzr revid: carlos.vasquez@clearcorp.co.cr-20120208145917-aaai0irh68omlzmb
2012-02-08 08:59:17 -06:00
Launchpad Translations on behalf of openerp 320b2d2e2e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208060921-wir47e717rh04xxn
bzr revid: launchpad_translations_on_behalf_of_openerp-20120208063913-vg9qdu30tx09ojrl
2012-02-08 06:39:13 +00:00
Olivier Dony 0a63ecb0cf [I18N] all: updated translation template
This should be the last major template sync
before the final release of 6.1.

bzr revid: odo@openerp.com-20120208010830-zchnkg48u7s40nw2
2012-02-08 02:08:30 +01:00
Vo Minh Thu ad4b6fcc21 [IMP] manifest: renamed active to auto_install.
bzr revid: vmt@openerp.com-20120130101837-zyebtyhfjypg2b4w
2012-01-30 11:18:37 +01:00
Launchpad Translations on behalf of openerp ffbff476df Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050312-sep3uryazw4j1xz6
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052156-67wqllfafijp6h1m
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044112-h04p0g5ne16y1nav
bzr revid: launchpad_translations_on_behalf_of_openerp-20120128050513-ncpdbsqyyk18pc67
bzr revid: launchpad_translations_on_behalf_of_openerp-20120129052226-dfcf7sm2r00y1s3s
bzr revid: launchpad_translations_on_behalf_of_openerp-20120130044131-sdsyvt62gvyzo0e3
2012-01-30 04:41:31 +00:00
Launchpad Translations on behalf of openerp 7dfe3e3413 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120126052824-8ja030g3lhanp8g7
2012-01-26 05:28:24 +00:00
Launchpad Translations on behalf of openerp d49c7de24d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120119045114-1uzft0w0d45gb143
2012-01-19 04:51:14 +00:00
Launchpad Translations on behalf of openerp a61762c71f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120114051310-6sj2xkv5gwq8cr0p
2012-01-14 05:13:10 +00:00
Launchpad Translations on behalf of openerp 1ba5e0ae7c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120113044029-g5gennaovbmjxfut
bzr revid: launchpad_translations_on_behalf_of_openerp-20120113050144-no4194ciwerac0dr
2012-01-13 05:01:44 +00:00
Thibault Delavallée ed8233ed22 [FIX] marketing_campaign: readded required attribute because of model violations it could generate
bzr revid: tde@openerp.com-20120110110418-miw9pgwcyhfhzdfx
2012-01-10 12:04:18 +01:00
Thibault Delavallée 5e9d022fcb [MERGE] marketing_campaign: fixed bug 911769: removed required attribute of campaign activity to be able to create activities when creating a campaign
bzr revid: tde@openerp.com-20120110103130-7v7t5b2pz6s7k7pq
2012-01-10 11:31:30 +01:00
Raphael Collet e813a62b29 [MERGE] lp:908739 (marketing_campaign: improve activity view)
bzr revid: rco@openerp.com-20120110095743-nd5p8spvvl27bgj2
2012-01-10 10:57:43 +01:00
Serpent Consulting Services 1b9f78308b [IMP] marketing_campaign :- improve view in marketing.campaign.activity object.
bzr revid: support@serpentcs.com-20120110082549-9p0as341u3ijl4he
2012-01-10 13:55:49 +05:30
Serpent Consulting Services 717b59c00c [FIX] marketing_campaign :- fix view related problem change col 1 to 2.
lp bug: https://launchpad.net/bugs/908739 fixed

bzr revid: support@serpentcs.com-20120107072731-bzk1ub5dk36z31s9
2012-01-07 12:57:31 +05:30
Nimesh (Open ERP) dd2f75849e [FIX] remove the required attribute from m2o compaign_id of marketing.campaign.activity .
bzr revid: nco@tinyerp.com-20120106113353-o3to6e2kos0acdxn
2012-01-06 17:03:53 +05:30
fp 8aff5209ea [IMP] improved error message, constraints must allways propose a solution
bzr revid: fp@fp-laptop-20111231075720-4kak7o320td4wxqc
2011-12-31 08:57:20 +01:00
Launchpad Translations on behalf of openerp 55446d0097 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111230054000-0ygl1bapby2gy0pt
2011-12-30 05:40:00 +00:00
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