Commit Graph

5538 Commits

Author SHA1 Message Date
jke-openerp 46b0c7aa00 [REF] Rename model crm.meeting into calendar.event
Remove 2 unsused field from calendar.event model (dir,sequence)

bzr revid: jke@openerp.com-20140115093805-1g1j1oymyxsb6kgh
2014-01-15 10:38:05 +01:00
jke-openerp ecca2f99c3 [Merge] Merge With Trunk
bzr revid: jke@openerp.com-20140106082030-e0auqh3l9b2cpuyi
2014-01-06 09:20:30 +01:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
jke-openerp 4ca6502d5e [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131219193521-gs6ty1p0uju8cc21
2013-12-19 20:35:21 +01:00
jke-openerp dd285d23af [TYPO] Rename base_calendar into calendar
bzr revid: jke@openerp.com-20131219144739-9ic700ycef8uklbc
2013-12-19 15:47:39 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
jke-openerp f60e279f1c [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131210165643-q9y3um1wkik52aam
bzr revid: jke@openerp.com-20131211085000-k34jnv099p667is4
2013-12-11 09:50:00 +01:00
Denis Ledoux 469cea2805 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9686 rev-id: dle@openerp.com-20131210160505-xdeeyooj07im8vz3
bzr revid: dle@openerp.com-20131210160657-c88vzssdkvfi6n96
2013-12-10 17:06:57 +01:00
Xavier ALT a3b8c3aa4e [FIX] crm: use email widget for email_from field in Opportunities form view
bzr revid: xal@openerp.com-20131210110007-v1bdkrxadwr661yv
2013-12-10 12:00:07 +01:00
Cecile Tonglet 025657653c [FIX] field email_from in crm.lead form view should have a widget email
bzr revid: cto@openerp.com-20131206102051-cls1gh78ze2olst9
2013-12-06 11:20:51 +01:00
Thibault Delavallée f44b3126f6 [IMP] crm: sales team kanban view: added suffix on opportunity sparkline + fixed the one on leads
bzr revid: tde@openerp.com-20131205151424-kctwivphai3kspkz
2013-12-05 16:14:24 +01:00
Thibault Delavallée 5b6b273c1c [CLEAN] crm: effectively removed commented code
bzr revid: tde@openerp.com-20131205145344-y7ierj85glu439l7
2013-12-05 15:53:44 +01:00
Thibault Delavallée ea62cbacf8 [FIX] crm: sales team kanban view: added an oe_clear beceause of alignment issues when adding things below item_list.
bzr revid: tde@openerp.com-20131205144344-d8616y18n2lvnkgu
2013-12-05 15:43:44 +01:00
Thibault Delavallée 73f663eed0 [CLEAN] crm: cleaned modifications before merging :
- moved css into sass file to standardize the process
- commented some records added in the xml file of crm.case.section that do not seem necessary

bzr revid: tde@openerp.com-20131205124749-3a1quhetgxq2d224
2013-12-05 13:47:49 +01:00
Thibault Delavallée f28d5f47b8 [MERGE] Sync with trunk, notably for bootstrap that landed in trunk
bzr revid: tde@openerp.com-20131205102352-ncx6whb8r0fejgcc
2013-12-05 11:23:52 +01:00
Launchpad Translations on behalf of openerp 379dc8bf98 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
Launchpad Translations on behalf of openerp 4fd98907ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
jke-openerp c66444b2b1 [Merge] Mergie with trunk
bzr revid: jke@openerp.com-20131202144019-f6zu5ciyirorsjp6
2013-12-02 15:40:19 +01:00
Antony Lesuisse 57ef91409a [MERGE] bootstrap3
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Christophe Simonis 289023d92f [MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
It’s over NINE THOUSAAAAAAAND!

bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
Christophe Simonis 0ac4a8f696 [MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
Thibault Delavallée d7af813044 [MERGE] [FIX] crm: fixed lead to opportunity wizard customer creation policy (opw 596231).
When choosing to link to an existing customer, then changing the action to create
a new customer or to avoid linking, the newly created opportunity was linked
to the previously chosen customer, due to the partner_id field not being
reset and used in the conversion process.

This field is not reset when changing the conversion action, leading to the action
being correctly taken into account.

lp bug: https://launchpad.net/bugs/1208436 fixed

bzr revid: tde@openerp.com-20131129101706-ccsn5u60sw8isroy
2013-11-29 11:17:06 +01:00
Launchpad Translations on behalf of openerp 1fedbc18f5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
jke-openerp 74d698f42f [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131127175136-3qvs367ud509462n
2013-11-27 18:51:36 +01:00
Thibault Delavallée f0bf946b12 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131129094610-qlrd1h502szo0b61
2013-11-29 10:46:10 +01:00
Christophe Simonis 0521d1aab3 [MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
Thibault Delavallée a8beece158 [IMP] [REV] crm, addons: still stage/state tweaking
- crm: Mark Won / Lost buttons are back
- crm: now using the new 'fold_field' option to fold some stages on the fold
field of stages. Back to saas-1 bebavhior.
- project, project_issue: task and issue also use the fold_field option.
- project: fixed 'X Tasks' display on the project vignette: now always displaying
'X Tasks at plural form to simplify the view.

bzr revid: tde@openerp.com-20131127095300-9onzlt5pl9u82zt6
2013-11-27 10:53:00 +01:00
Launchpad Translations on behalf of openerp 6fd5575930 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
2013-11-27 05:39:57 +00:00
Turkesh Patel (Open ERP) a68dbfe286 [RMV] remove all currecny related stuff as per the comments of fp sir.
bzr revid: tpa@tinyerp.com-20131126064238-odztahk0kofak3vh
2013-11-26 12:12:38 +05:30
Turkesh Patel (Open ERP) b08503e373 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131126052924-xn4qn67lehe6x2pj
2013-11-26 10:59:24 +05:30
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
Launchpad Translations on behalf of openerp 5f21b4bff9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
Christophe Simonis 3fb6b2965c [FIX] {crm,crm_partner_assign}: server actions does need to be restricted by group
bzr revid: chs@openerp.com-20131124202723-qd4ep1q2w3pn4453
2013-11-24 21:27:23 +01:00
Christophe Simonis 7c5994958d [IMP] crm: TransientModel does not need access rules
bzr revid: chs@openerp.com-20131124182419-nn1m2prno6fk0iez
2013-11-24 19:24:19 +01:00
jke-openerp cd4f71cf36 [REF] rb r2g
bzr revid: jke@openerp.com-20131124130241-s1hjdl08y5dcsnxs
2013-11-24 14:02:41 +01:00
Christophe Simonis fb44c859e2 [FIX] {crm,crm_partner_assign}: email.template: filter the whole expression instead of only the last part
bzr revid: chs@openerp.com-20131122194415-9ho9vf6f1b0qkmhd
2013-11-22 20:44:15 +01:00
Christophe Simonis c6d0006d26 [FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping.
followup of commit mat@openerp.com-20131121151305-t5je12s4w5uctu0k

bzr revid: chs@openerp.com-20131121170949-5rzr7qovzzkzyvvw
2013-11-21 18:09:49 +01:00
Denis Ledoux 93973114dd [FIX]crm: change typo of opportunities searchview to be consistent to leads searchview
bzr revid: dle@openerp.com-20131120170719-oenzvh67a2t5281n
2013-11-20 18:07:19 +01:00
Denis Ledoux b5f2233381 [FIX]crm: change typo to be more consistent. Assigned to me > My leads, Assigned to My Team(s) > My Team(s)
bzr revid: dle@openerp.com-20131120165825-e2xvhl3ualpezwuy
2013-11-20 17:58:25 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00: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
Turkesh Patel (Open ERP) a254e5fca9 [ADD] added record rules for analysis report objects.
bzr revid: tpa@tinyerp.com-20131115104909-izjhuoy3eyy1vfjk
2013-11-15 16:19:09 +05:30
Turkesh Patel (Open ERP) 559d534631 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20131115072236-oqmd6bpe2oetvldy
2013-11-15 12:52:36 +05:30
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
ima-openerp 1098f7021e [IMP]improved css for sales team kanban, sale order payment_acquirers and attach file button.
bzr revid: ima@tinyerp.com-20131114120529-5ltoe9aoglsx92vv
2013-11-14 17:35:29 +05:30
Launchpad Translations on behalf of openerp 08abc4345a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054140-gta82n1b3iww6qy5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131031051733-nnutbi7hidixsxsb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102055746-d0emb2aocq3sq1d1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103052149-y4usleohxatdgczx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105052928-1izkptj5zusflrvb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108054204-hrtuxxze2u1ivvez
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110055420-zl5ang9w8lbcvt9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111051738-smtttsszytn06ld4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112054158-7ewd3oxiyxg8s4zw
2013-11-12 05:41:58 +00:00
Martin Trigaux 363d81e5f0 [IMP] crm: match on contact name while searching for customer for leads (opw 591923)
bzr revid: mat@openerp.com-20131118100324-9s3xwmbk9xrxjm5a
2013-11-18 11:03:24 +01:00
Launchpad Translations on behalf of openerp 2160342cea Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00: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