Commit Graph

118 Commits

Author SHA1 Message Date
Quentin (OpenERP) 1232812cc6 [MERGE] merged branch that corrects the decimal precision on fields. Courtesy of Akretion
bzr revid: qdp-launchpad@openerp.com-20120814141040-oaf7d56thhi2s9rm
2012-08-14 16:10:40 +02:00
Antonin Bourguignon 206252d606 [IMP] fix a first batch of typos and spelling mistakes (listed by UCO on the 2012-08-01)
bzr revid: abo@openerp.com-20120803172636-s23g6yturpb5chd6
2012-08-03 19:26:36 +02:00
Saurang Suthar(OpenERP) e85181b2ec [IMP] Improved warning messages for marketing campaign module
bzr revid: pso@tinyerp.com-20120722080539-i9uqjddn205ztvor
2012-07-22 13:35:39 +05:30
Hardik 05c4e54216 [IMP]marketing_campaign : Warning Messages are changed
bzr revid: hsa@tinyerp.com-20120713064436-xc6s90ybz0ik8h8t
2012-07-13 12:14:36 +05:30
Benoit Guillot dc3ae0488b [IMP] replace 'Price Unit name by 'Product Price'
bzr revid: benoit.guillot@akretion.com.br-20120711130615-25ascb8dfllo4r7j
2012-07-11 15:06:15 +02:00
Benoit Guillot 0c82624467 [REF] replace sale price precision by price unit precision
bzr revid: benoit.guillot@akretion.com.br-20120710123400-w634cm3p75v8gcxm
2012-07-10 14:34:00 +02:00
Kuldeep Joshi (OpenERP) e8d8218de6 [IMP]marketing_campaign: change text of field
bzr revid: kjo@tinyerp.com-20120629110019-jc3satr1ra66fqxe
2012-06-29 16:30:19 +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
Fabien Pinckaers 42b96c577a [FIX] bad merge
bzr revid: fp@openerp.com-20120522180936-tzzmbc7ypfd471o3
2012-05-22 20:09:36 +02:00
Fabien Pinckaers 58b4853c7e [FIX] bad merge
bzr revid: fp@tinyerp.com-20120522162809-ip04ohnzpz39omzz
2012-05-22 18:28:09 +02:00
Fabien Pinckaers 5c791531aa [IMP] improved typos
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Amit Patel (OpenERP) 70c7252b2c [IMP]
bzr revid: apa@tinyerp.com-20120502055006-yhsd5qwpc0asfn7b
2012-05-02 11:20:06 +05:30
Amit Patel (OpenERP) d1147c51e9 [IMP]
bzr revid: apa@tinyerp.com-20120501123446-kykbs2zi3pj0kq9u
2012-05-01 18:04:46 +05:30
Amit Patel (OpenERP) 13efdaf8a3 [MERGE]:set order while merging. lp:~openerp-dev/openobject-addons/trunk-marketing_campaign-topbar-tpa
bzr revid: apa@tinyerp.com-20120427112326-32tickb5k6rtoxck
2012-04-27 16:53:26 +05:30
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
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
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
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
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
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
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
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 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
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
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
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
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
Olivier Dony 599d655465 [FIX] marketing_campaign: workitem.process_all() must respect campaign states
bzr revid: odo@openerp.com-20110311104831-ewujjdgwg1jd5qhc
2011-03-11 11:48:31 +01:00
Olivier Dony 02a703770a [IMP] marketing_campaign: activity now passes workitem to server actions via context
bzr revid: odo@openerp.com-20110311104300-ka3616hqa8ad52qg
2011-03-11 11:43:00 +01:00
Harry (OpenERP) 53dc88ecaa [IMP+FIX] emails: menu name improvement for Incomming server and Outgoing Server and fix regression in markertin compain module
bzr revid: hmo@tinyerp.com-20110215073150-q3r9hyk41ryn1jjx
2011-02-15 13:01:50 +05:30
qdp-launchpad@tinyerp.com 9597d00cc6 [MERGE] merged the olt branch related to decimal precision
bzr revid: qdp-launchpad@tinyerp.com-20101230141937-xo00esnrjga0gdy0
2010-12-30 15:19:37 +01:00
qdp-launchpad@tinyerp.com fdc4490860 [IMP] crm, marketing_campaign: usability imp. + [REF] procurement: removed unused variable
bzr revid: qdp-launchpad@tinyerp.com-20101220113820-u9a2aewa4bshw9jx
2010-12-20 12:38:20 +01:00
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods.
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
2010-12-13 12:13:09 +05:30
uco (OpenERP) b1cf433ecc [MERGE]: Merged with trunk-addons.
bzr revid: uco@tinyerp.com-20101206131102-z2xzz8eshkswo00q
2010-12-06 18:41:02 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'.
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None.
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
2010-11-19 19:18:01 +05:30
Harry (OpenERP) 54f46060dc [MERGE]
bzr revid: hmo@tinyerp.com-20101028114019-5qkatqamaxhx6k0u
2010-10-28 17:10:19 +05:30
Harry (OpenERP) 214fddfc4c [MERGE]
bzr revid: hmo@tinyerp.com-20101028113641-vhuqs53ocp930zi5
2010-10-28 17:06:41 +05:30
rpa (Open ERP) d6ba50f386 [FIX]: Fixed translation of warning messages
lp bug: https://launchpad.net/bugs/660494 fixed

bzr revid: rpa@tinyerp.com-20101027133524-2mijip7zskzwevnh
2010-10-27 19:05:24 +05:30
olt@tinyerp.com aaa9f12702 [IMP] marketing: now uses decimal.precision
bzr revid: olt@tinyerp.com-20101005122935-qe6yghvx37itxwzw
2010-10-05 14:29:35 +02:00
Olivier Dony 61d7b4a083 [IMP] marketing_campaign: prevent deletion of a segment's ir_filter as it opens the segment completely
bzr revid: odo@openerp.com-20100916152624-1rgfgmarqna28ko8
2010-09-16 17:26:24 +02:00
Olivier Dony 33cb2c8c9a [IMP] marketing_campaign: another round of reviewing/improvements:
- better form/search views
- improved labels
- added next sync on segments
- added domain to prevent cross-campaign transitions on activities
- ...

bzr revid: odo@openerp.com-20100913004337-0cvl8qd0qaj3fomc
2010-09-13 02:43:37 +02:00