Commit Graph

761 Commits

Author SHA1 Message Date
Martin Trigaux b2fa77fd31 [MERGE] [FIX] crm: post message for logged/scheduled call in use timezone instead of utc (opw #600751).
Use <time> html element containing UTC time.
Updated POT to contains new translation value

bzr revid: mat@openerp.com-20140107154942-w3xx5914yzej4jb3
2014-01-07 23:49:42 +08:00
Mahendra Barad (OpenERP) 8eb7fb82de [IMP]added the legend widget for priority and kanban state
bzr revid: mba@tinyerp.com-20140107131134-fho22izhbw86w1w5
2014-01-07 18:41:34 +05:30
Rifakat 9e8be4175b [FIX] crm: when loggin a phonecall from Opportunity, note added to the opportunity(message) having time as UTC and not in user's timezone
bzr revid: rha@tinyerp.com-20140106053039-83domwm1bvrimq8l
2014-01-06 11:00:39 +05:30
Turkesh Patel (Open ERP) 6a2a2e75c5 [IMP] improved create msg.
bzr revid: tpa@tinyerp.com-20140103070303-nec0nb3l1ivzq90g
2014-01-03 12:33:03 +05:30
Turkesh Patel (Open ERP) f273f35650 [ADD] added default alias for leads
bzr revid: tpa@tinyerp.com-20131220110045-kpny4indr16ais8n
2013-12-20 16:30:45 +05:30
jke-openerp dd285d23af [TYPO] Rename base_calendar into calendar
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
Christophe Simonis bb1e256f5b [MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Denis Ledoux 7c1cb42e17 [FIX]crm: case_mark_lost and case_mark_won only were only setting the stage of the first lead passed, instead of the whole list.
bzr revid: dle@openerp.com-20131114131313-bml9m0ejsp82thjn
2013-11-14 14:13:13 +01:00
Denis Ledoux 8711954c1c [FIX]crm: duplicating lead/opp duplicated the stage and put to false date_open if it was an opp. Now put stage to 'new' stage and set date_open to today if it is an opp
bzr revid: dle@openerp.com-20131114204550-wavibpj1memdx60c
2013-11-14 21:45:50 +01:00
Denis Ledoux 8be0a5a8e1 [FIX]crm: several calls to _get_id for external id 'categ_phone2' which were not surrounded by try except ValueError
bzr revid: dle@openerp.com-20131114095721-v22dl5yc8bzhvevf
2013-11-14 10:57:21 +01:00
Thibault Delavallée 61c97c56de [FIX] crm_lead: cleaned and uniformized won/lost
stage conditions.

bzr revid: tde@openerp.com-20131104115735-4bsv2l2n1c6q8jte
2013-11-04 12:57:35 +01:00
Atul Patel (OpenERP) 89c428bd84 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20131029133906-xrxccq8zm285m2zw
2013-10-29 19:09:06 +05:30
Thibault Delavallée 8ce54029cf [REV] crm: reverted most changes about stages for this branch.
We keep fold, because it has a meaning in kanban view, and is kind of
'drop' stage, for won / lost / cancel / dead.

New stage is now the stage with the lower sequence, not necessarily the
stage with sequence 1. Note that this could break the _track because it
checks for stages with sequence <= 1; however with OpenERP values it
works fine. In some specific stage configuration, some subtypes could
not be tracked precisely.

bzr revid: tde@openerp.com-20131023100429-a3vfxi5zkn18v6qq
2013-10-23 12:04:29 +02:00
Thibault Delavallée 2cb3b0f382 [FIX] sale_crm: fixed view inheritance
TODO: re-add the button in invisible

bzr revid: tde@openerp.com-20131018144448-hpbds5oobcqpr1uv
2013-10-18 16:44:48 +02:00
niv-openerp 67a9fee553 [MERGE] saas2
bzr revid: nicolas.vanhoren@openerp.com-20131018103820-a0sklx6hyx3hx93e
2013-10-18 12:38:20 +02:00
Denis Ledoux bbeb6e60aa [FIX]crm: leads/opps merge order, condition was not correct: lead/opp with stage sequence = 1 where regarded as canceled, or they are acutally regarded as new.
bzr revid: dle@openerp.com-20131016153457-42a235ks80226b8o
2013-10-16 17:34:57 +02:00
Denis Ledoux b95f5443db [FIX]crm: leads/opps merge order, was not the same as before the state removal from the stages
bzr revid: dle@openerp.com-20131016144849-yueclv7xqmk806nz
2013-10-16 16:48:49 +02:00
Thibault Delavallée 08770d83c1 [FIX] crm: fixed stage_find method. This method receives a domain
for searching stages. However it adds a condition on the type of the stages
independently of the received domain.

It now creates a term for stage types only if not found in the domain
given in parameter.

bzr revid: tde@openerp.com-20131016105855-isq9frwp1fnquw4x
2013-10-16 12:58:55 +02:00
Antony Lesuisse 9757c08872 use referencable models instead of _get_links
bzr revid: al@openerp.com-20131006115808-etkyq34ar1pqh2pb
2013-10-06 13:58:08 +02:00
Thibault Delavallée c17ecb54ec [FIX] addons: fixed various calls to fields.datetime.now in defaults
bzr revid: tde@openerp.com-20130919142338-v2ygkid2abw2j3wl
2013-09-19 16:23:38 +02:00
Thibault Delavallée 9825eef774 [FIX] crm: fixed a bug in opportunities merge.
_merge_notify was called with a browse record but was waiting for an ID.

bzr revid: tde@openerp.com-20130827162036-v7yhfijgpdhcyte5
2013-08-27 18:20:36 +02:00
Thibault Delavallée 0dfe3a2e67 [FIX] crm: fixed regression in merge_notify, due to a cleaning in opportunities merging a few months ago
bzr revid: tde@openerp.com-20130827161801-d8i11n5uq7n4v9r8
2013-08-27 18:18:01 +02:00
Thibault Delavallée 21d57f5e9d [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130826085410-qngwkw6eyxol4192
2013-08-26 10:54:10 +02:00
Atul Patel (OpenERP) 4ccbbba7c8 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20130826045058-4ipsemxtca1rdagy
2013-08-26 10:20:58 +05:30
Thibault Delavallée c147dd4975 [IMP] crm, hr_recruitment, project_issue: removed message put in description in message_new
bzr revid: tde@openerp.com-20130822094613-os846v2g3t2dloo5
2013-08-22 11:46:13 +02:00
Jaydeep Barot (OpenERP Trainee) 7ae5c7b0d3 [MERGE]: Merged with lp:openobject-addons
bzr revid: jaydeep.gvp@gmail.com-20130821054438-oaaui32s2t230aru
2013-08-21 11:14:38 +05:30
Thibault Delavallée bab789e7a0 [REF] crm_phonecall: refactored case management (directly in write + clickable statusbar widget) + deleted some tests not applicable anymore
bzr revid: tde@openerp.com-20130813092042-1r0yfqdacv894v21
2013-08-13 11:20:42 +02:00
Thibault Delavallée 38a534dee0 [IMP] mail: first implementation of tracking and bounce management.
Added 2 fields on mail_mail to count read/bounce.
Added bounce alias bounce-mail_id-model-res_id.
Added message_receive_bounce method that try to incremetn message_bounce field.

bzr revid: tde@openerp.com-20130806151143-7dw6xlj8n7mh0nqe
2013-08-06 17:11:43 +02:00
Thibault Delavallée 199b3e96bc [REM] crm_lead: removed _check, because should use base action rule
bzr revid: tde@openerp.com-20130805141905-watnhgi6z29w3l1q
2013-08-05 16:19:05 +02:00
Thibault Delavallée dce673c6b5 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130805132618-ewjjxjfwnkeg8hue
2013-08-05 15:26:18 +02:00
Nimesh Contractor (OpenERP) 713dacbf67 [MERGE] with trunk.
bzr revid: nco@tinyerp.com-20130726102829-8bk3emz89si0ffwb
2013-07-26 15:58:29 +05:30
Thibault Delavallée a3c546a600 [REM] crm: removed new_email_send, now unused and deprecated with chatter / templates.
bzr revid: tde@openerp.com-20130726091305-8lsmidcxyau3shw0
2013-07-26 11:13:05 +02:00
Nimesh Contractor (OpenERP) da70124909 [MERGE] with trunk.
bzr revid: nco@tinyerp.com-20130722055239-i7n2usc9bzf4b7uq
2013-07-22 11:22:39 +05:30
Thibault Delavallée 163d88ea32 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130719100119-ohpzxw4r1fxta93k
2013-07-19 12:01:19 +02:00
Christophe Simonis 24ea151a37 merge upstream
bzr revid: chs@openerp.com-20130717142947-de40mn3234gt5044
2013-07-17 16:29:47 +02:00
Thibault Delavallée b49d94408f [FIX] crm: added date_last_stage_update in crm + report
bzr revid: tde@openerp.com-20130717141336-ul8xwlveh3c1w9y9
2013-07-17 16:13:36 +02:00
Thibault Delavallée 707373ec9e [FIX] crm modules: various fixes about state removal.
bzr revid: tde@openerp.com-20130716153818-7ag1nrjyylj6ze8n
2013-07-16 17:38:18 +02:00
Thibault Delavallée 0e9fd3d5d5 [IMP] crm: removed state field. Refactored code according to the new guidelines.
bzr revid: tde@openerp.com-20130716151003-c2df3nzgo1by0hyi
2013-07-16 17:10:03 +02:00
Nimesh Contractor (OpenERP) 06f490605b [MERGE] with trunk.
bzr revid: nco@tinyerp.com-20130710112035-dwr0eovf9uysrsch
2013-07-10 16:50:35 +05:30
Thibault Delavallée 0aac1c7cb0 [REF] crm: removed references to base_stage in crm_lead / crm_claim + various pre-cleaning before removing state.
bzr revid: tde@openerp.com-20130708103011-53t1fllmrz0hdq8u
2013-07-08 12:30:11 +02:00
Nimesh Contractor (OpenERP) de640e1eb3 [MERGE] with trunk.
bzr revid: nco@tinyerp.com-20130703124233-buziafuxc12mnznl
2013-07-03 18:12:33 +05:30
Martin Trigaux d2d72d8416 [MERGE] forward port of saas-1 up to revision 8749 (mat@openerp.com-20130702135856-kmg7d8anw17nkbd8)
bzr revid: mat@openerp.com-20130702144646-y1wqs5mz4rzoh50g
2013-07-02 16:46:46 +02:00
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Thibault Delavallée bf4ada34b4 [REF] mail_thread: message_track now uses browse records instead of read results.
Updated addons accordingly.
Updated tests to test corner cases using False / null browse records.

bzr revid: tde@openerp.com-20130627144647-swbj77i84vo9ii0v
2013-06-27 16:46:47 +02:00
Denis Ledoux d144d320ec [FIX]crm_channel: view and typo imp
bzr revid: dle@openerp.com-20130620152007-v8yt5kwdkgeh1w8i
2013-06-20 17:20:07 +02:00
Thibault Delavallée 9005541f99 [FIX] crm, project.task, project.issue, hr_recruitment: fixed quick create in kanban, simplified a bit the code in the various create overrides.
bzr revid: tde@openerp.com-20130619114633-pb0rtz0kivlrabcx
2013-06-19 13:46:33 +02:00
Atul Patel (OpenERP) a003381647 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20130612115836-cvsgd903an5szcy1
2013-06-12 17:28:36 +05:30
Martin Trigaux ccb38117ee [MERGE] Forward porting of saas-1 until rev 8739
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
Martin Trigaux 45c3fd063b [MERGE] Forward porting of latest 7.0 bugfixes, up to rev. 9193
bzr revid: mat@openerp.com-20130604110041-yemgrfsi02uboe8m
2013-06-04 13:00:41 +02:00
Quentin (OpenERP) fe7866ccec [FIX] crm: after a merge of several leads/opportunities, delete the old records as the SUPERUSER to avoid security issues.
bzr revid: qdp-launchpad@openerp.com-20130531123414-ezx9ixg9ggame1g6
2013-05-31 14:34:14 +02:00
Pinakin Nayi (OpenERP) b430036c7f [FIX]crm : delete with super user to avoid access rules because if there is any user (not have delete access of lead) than also merge opportunity
bzr revid: pna@tinyerp.com-20130531114716-5as9flbu2506reh0
2013-05-31 17:17:16 +05:30
Martin Trigaux d626d3cb61 [MERGE] backport saas-1 rev 8728
[FIX] mail, project, project_issue, crm_lead: fixed 'XX Created' subtype not triggered because of condition
based on state=new and not state=draft.
For tasks, issues and leads, no generic 'Document created' message is posted anymore
because of the 'XX Created' message with subtype automatically logged.
Generic creation message is logged before automatic subscription to enable
message pushing to responsibles.

bzr revid: mat@openerp.com-20130529143022-wy76srwb2nwkspe3
2013-05-29 16:30:22 +02:00
Thibault Delavallée d4dbd3524c [FIX] mail, project, project_issue, crm_lead: fixed 'XX Created' subtype not triggered because of condition
based on state=new and not state=draft.
For tasks, issues and leads, no generic 'Document created' message is posted anymore
because of the 'XX Created' message with subtype automatically logged.
Generic creation message is logged before automatic subscription to enable
message pushing to responsibles.

bzr revid: tde@openerp.com-20130529131458-9709ffrsy479hwy3
2013-05-29 15:14:58 +02:00
Christophe Matthieu 096962342a [MERGE] from trunk
bzr revid: chm@openerp.com-20130522145042-3ril2zvogqs55ako
bzr revid: chm@openerp.com-20130524100533-fc0c7l47hb8j4xib
2013-05-24 12:05:33 +02:00
Thibault Delavallée cd278d83ab [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
2013-05-22 13:42:36 +02:00
Christophe Matthieu aed639f6d1 [MERGE] from trunk
bzr revid: chm@openerp.com-20130522100239-sbkwtitaxy8hj1cx
2013-05-22 12:02:39 +02:00
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +02:00
Thibault Delavallée b1e0f9f6f2 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130521123624-u6cqs144rbuzrmpo
2013-05-21 14:36:24 +02:00
Christophe Matthieu c810905bdf [IMP] crm_lead: on_change_user don't change section_id if they is a default_section_id context value
bzr revid: chm@openerp.com-20130521122242-53eu1fi506465o6c
2013-05-21 14:22:42 +02:00
Olivier Dony 9c08e12962 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld

bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
Thibault Delavallée 0691000b61 [IMP] account_invoice: now have its _get_formview_action method. _get_formview_action is the renaming of _get_document_action, by the way.
bzr revid: tde@openerp.com-20130426144019-w4tq4of7rdkyqbah
2013-04-26 16:40:19 +02:00
Thibault Delavallée b61c12d28e [MERGE] Revisions 9000 ... 9002 of 7.0 branch
bzr revid: tde@openerp.com-20130426132847-mr8e0yuxao582bs6
2013-04-26 15:28:47 +02:00
Christophe Matthieu 300a2aaeee [MERGE] from trunk
bzr revid: chm@openerp.com-20130423152943-8qbm6nhc9ubds5td
2013-04-23 17:29:43 +02:00
Quentin (OpenERP) 429ef87172 [MERGE] accounts* modules: forward port of revision 9033 of addons v7 that was passing 'account_period_prefer_normal=True' in the context in each and every call to account_period.find(). The behaviour is modified in order to search only on normal periods by default
bzr revid: qdp-launchpad@openerp.com-20130418094147-q2ks4w47sn4fxdv2
bzr revid: qdp-launchpad@openerp.com-20130418103907-0qom5yfcq8osnovp
2013-04-18 12:39:07 +02:00
dle@openerp.com 9d2cf73253 [FIX]crm: lead/opp convert/opp wizard: Add salesperson and salesteam in wizard form
bzr revid: dle@openerp.com-20130417161703-z3id6hb20c9pceho
2013-04-17 18:17:03 +02:00
Quentin (OpenERP) ec55a58c45 [IMP] crm: log a meeting now calls message_post and writes the meeting information in the chatter
bzr revid: qdp-launchpad@openerp.com-20130417090925-l6pdm9v5lq6ify14
2013-04-17 11:09:25 +02:00
Thibault Delavallée c2f02f6798 [FIX] mail, crm: fixed some access rights issues when using chatter on a document without access rights with portal users.
bzr revid: tde@openerp.com-20130417085927-wg07siehk2uhrkpu
2013-04-17 10:59:27 +02:00
Cedric Snauwaert 6ca0770257 [REF]crm_lead, crm_meeting: minor changes to follow pep8 standard
bzr revid: csn@openerp.com-20130416074335-qx8c6f4fjueknjk9
2013-04-16 09:43:35 +02:00
Cedric Snauwaert e38a28a2b7 [FIX]crm_lead, crm_meeting: when creating a meeting from an opportunity, add a message in open chatter
bzr revid: csn@openerp.com-20130415141507-m5arvgjcaf587a09
2013-04-15 16:15:07 +02:00
Thibault Delavallée 4da68cbc22 [FORWARD] Forward port of addons 7.0 until revision 9008
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Thibault Delavallée ee844c0ac6 [FIX] crm: fixed on_change_user that was crashing because
refers to a default_section_id field that is added in sale_crm bridge module.
New behavior is : one of the team user_id is a member (crm), or
default_section_id if defined or default behavior (sale_crm)

bzr revid: tde@openerp.com-20130411123356-kc8ty16i71nwgzsm
2013-04-11 14:33:56 +02:00
Thibault Delavallée d50b159f81 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130405111048-kqxll4mdwnsq2r8o
2013-04-05 13:10:48 +02:00
Josse Colpaert 5585f21aa5 [FIX] On cchange for sales person to change sales team in opportunity
bzr revid: jco@openerp.com-20130404155437-a4d6mdi2y0r5nvc6
2013-04-04 17:54:37 +02:00
Quentin (OpenERP) 3bb51ac696 [MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Thibault Delavallée ba9412cb5d [CLEAN] addons: various linkt cleanup (indentation, spaces, ...).
bzr revid: tde@openerp.com-20130403081009-jy35sm7dl4pq7eyu
2013-04-03 10:10:09 +02:00
dle@openerp.com 3d58511f89 [FIX]crm: crm lead/merge keystroke mistake, revert remove of minus
bzr revid: dle@openerp.com-20130402131434-jkap5399rrfq8rm5
2013-04-02 15:14:34 +02:00
dle@openerp.com 6f3ba2a572 [FIX]crm: crm lead/opp merge, if merged stage not in sales team and same type (lead/opp)n choose first stage of the sales team with the same type
bzr revid: dle@openerp.com-20130402125809-4qzwe1nm0nkrx283
2013-04-02 14:58:09 +02:00
dle@openerp.com 9c1b0f6164 [FIX]crm: crm lead/opp merge, when opp has stage with state cancel, then it is less important than leads with stage which are not in state cancel
bzr revid: dle@openerp.com-20130402101331-12skhykfzrv35nno
2013-04-02 12:13:31 +02:00
Thibault Delavallée bdd8a38121 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130402081312-v4pmhvv25gopey9y
2013-04-02 10:13:12 +02:00
dle@openerp.com 2d925d5c27 [FIX]crm: crm merge tests testing new merge behaviour (opps before leads)
bzr revid: dle@openerp.com-20130329130615-gbjqw0x2ybeekext
2013-03-29 14:06:15 +01:00
dle@openerp.com 58a31f00d8 [FIX]crm: crm lead merge, add create_date in argument for sorting
bzr revid: dle@openerp.com-20130329115908-gjia2se2kgnkaahh
2013-03-29 12:59:08 +01:00
dle@openerp.com 3679b0c44c [FIX]crm: convert lead to opportunity, opportunity always win vs lead, even if lead.stage > opp.lead
bzr revid: dle@openerp.com-20130329111609-7v516rnid2ytk836
2013-03-29 12:16:09 +01:00
Christophe Matthieu ee348877ad [MERGE] sync with visibility
bzr revid: chm@openerp.com-20130325153341-1rzlwyr1m37vpec3
2013-03-25 16:33:41 +01:00
Christophe Matthieu 2a2929b91c [FIX] salesteams: create leads with default section_id
bzr revid: chm@openerp.com-20130325153240-jppxhjv27f7zpngn
2013-03-25 16:32:40 +01:00
Christophe Matthieu 5b3b35cd7c [MERGE] from visibility and alias
bzr revid: chm@openerp.com-20130325104314-sx1hpm5bdzoyh92b
2013-03-25 11:43:14 +01:00
Christophe Matthieu 9845f41c09 [IMP] project, project_issue: improve get_empty_list_help
bzr revid: chm@openerp.com-20130325104012-h5ryupgzglia4twg
2013-03-25 11:40:12 +01:00
Christophe Matthieu a4d3976caf [IMP] sales teams: in progress
bzr revid: chm@openerp.com-20130325102555-5q3j1y5dapohgax5
2013-03-25 11:25:55 +01:00
Christophe Matthieu 05a9270e47 [IMP] crm.case.section,salesteams: kanban
bzr revid: chm@openerp.com-20130322160934-3mekvjm9hxaiwp4b
2013-03-22 17:09:34 +01:00
Christophe Matthieu e4cffe267e [FIX] crm_lead
bzr revid: chm@openerp.com-20130322150110-mdgra3ppqui5eanj
2013-03-22 16:01:10 +01:00
Christophe Matthieu a45ad6ec82 [IMP] crm: clean code
bzr revid: chm@openerp.com-20130322123803-43mz918j3ez9muvg
2013-03-22 13:38:03 +01:00
Christophe Matthieu 9d45f9ad82 [IMP] code cleaning for get_empty_list_help
bzr revid: chm@openerp.com-20130321133139-k6ycur34ojw2qhjq
2013-03-21 14:31:39 +01:00
Christophe Matthieu 809ec6e49f [IMP] view_form: statusbar with folded selection, remove fold = false
bzr revid: chm@openerp.com-20130321125626-83cckp5vdb14t18u
2013-03-21 13:56:26 +01:00
Turkesh Patel (Open ERP) 7175b3e3fb [IMP] make strings translatable
bzr revid: tpa@tinyerp.com-20130321053855-2cg08qtcsjrouo35
2013-03-21 11:08:55 +05:30
Turkesh Patel (Open ERP) cd90ed025a [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130321045350-wrm8yh6p0zywlhbb
2013-03-21 10:23:50 +05:30
Christophe Matthieu ae30f8fff3 [MERGE] from trunk
bzr revid: chm@openerp.com-20130320125517-jv2ot85iypncoesj
2013-03-20 13:55:17 +01:00
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Christophe Matthieu b255703166 [MERGE] from trunk
bzr revid: chm@openerp.com-20130313141718-dw76m7fvy0co3rfi
2013-03-13 15:17:18 +01:00
Thibault Delavallée 3dc1a58ed5 [FIX] crm, email_template: fixed help messages talking about partners and leads instead of leads and partners... well, I think this comment is not very understandable, but at least there is a commit message. Horray.
bzr revid: tde@openerp.com-20130313121221-lo0kmkt2lltyr94e
2013-03-13 13:12:21 +01:00
Thibault Delavallée 2f4a59fd06 [IMP] email_template, crm: added forgotten filters for opt-out; cleaned help of opt-out; email body is back into internal note as it has been decided that it was too much change for 7.0, especially that email content parsing is not robust enough.
bzr revid: tde@openerp.com-20130313112013-veqzplextey1300p
2013-03-13 12:20:13 +01:00