a8e1fbcbd3
[FIX] correct a small typo in previous merge (addon crm)
...
bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
2014-05-02 15:22:58 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
8da3bb66ca
[FIX] crm: get_forwview_id, variable referenced before assignment
...
bzr revid: dle@openerp.com-20140430094601-4chke4890s55eb92
2014-04-30 11:46:01 +02:00
0ad1789736
[FIX] crm report revert the split of opportunity and leads
...
Partialy revert 9007 tde@openerp.com-20131205160029-1tljp52ovcavwxel , restoring
the default_search context instead of domain, restoring the analysis
encompassing both leads and opportunities lifecycle.
bzr revid: al@openerp.com-20140429233909-fy9y85tsnjs262tl
2014-04-30 01:39:09 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
c9e5d0e6a1
[IMP] crm: manifest layout
...
bzr revid: rim@openerp.com-20140429083104-i1amazz4o0cy6xkk
2014-04-29 10:31:04 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
2558b7ec01
[IMP] removes double groupby in row dimension, in opportunities analysis
...
bzr revid: ged@openerp.com-20140423091726-kgnqfqtqjqxvul45
2014-04-23 11:17:26 +02:00
b6255eb55d
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
...
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
b981f3f8ef
[FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
...
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name
bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
f917b1f998
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422133650-bi5lri33o5f0g3yj
2014-04-22 15:36:50 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
04c809e9f6
[MERGE] [IMP] crm: improved call / meeting buttons and behavior on lead and partner form view.
...
- improved behavior of schedule a meeting, for both opportunities and partner, with correct
attendees and options;
- removed wizard to schedule a cal, jumping to the list view with correct default values
is sufficient;
- scheduled calls is now accessible using a group, accessible through sales configuration;
bzr revid: tde@openerp.com-20140417145645-cpohfrfpqnskpok6
2014-04-17 16:56:45 +02:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
19fac75f42
[FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap
...
bzr revid: csn@openerp.com-20140417090515-l1ku2kdc0lzadjxg
2014-04-17 11:05:15 +02:00
0c24df7074
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
75850c8f95
[ADD] *: replace overriden methods get_formview_action by get_formview_id
...
Methods to override to specify the view/action to launch for many2one links
get_formview_action use get_formview_id to find the view to open. Therefore, it is simplier to override get_formview_id to tell which view should be opened
bzr revid: dle@openerp.com-20140416143755-07slguqn6zadqsg5
2014-04-16 16:37:55 +02:00
4336c64a7c
[IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute
...
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.
bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2
2014-04-16 10:28:51 +02:00
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
69af9ca3dc
[IMP] improves the layout of the three stat buttons (schedule call/meeting/convert to opp) in logged calls form view (addon crm)
...
bzr revid: ged@openerp.com-20140414124926-lggdqus1agzzr7dh
2014-04-14 14:49:26 +02:00
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
c9c2ed506a
[IMP] change the information displayed on the 'schedule calls' stat buttons in lead/opportunities form views (addon crm)
...
bzr revid: ged@openerp.com-20140414104819-7te5ilmmsvykdypy
2014-04-14 12:48:19 +02:00
0d7b0108ed
[IMP] crm, project_gtd : Improved the filter string.
...
bzr revid: mdi@tinyerp.com-20140414102123-j2bu0s4107hgh003
2014-04-14 15:51:23 +05:30
d8b2eab2d0
[FIX] correctly names a variable 'meeting_ids' instead of 'opportunity_ids' (addon crm)
...
bzr revid: ged@openerp.com-20140414100652-gwv5cwht6wl12ah9
2014-04-14 12:06:52 +02:00
2cb39d6162
[Merge] Merged with trunk.
...
bzr revid: mdi@tinyerp.com-20140414095348-cc9aos2vdv9y6azh
2014-04-14 15:23:48 +05:30
01d9ea6f64
[MERGE][IMP] crm/sale_crm: Terminology
...
Replacement of the term "category" by "tag", for the sake of consistency
bzr revid: rim@openerp.com-20140414083511-b5qvr4ek4mgxx17x
2014-04-14 10:35:11 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
5d177a9b10
[MERGE] Sync with trunk
...
bzr revid: rim@openerp.com-20140411142817-svp3hp2qfx1xw25k
2014-04-11 16:28:17 +02:00
85714eabb6
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
ac2f58ce68
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140410145022-7nyixn0v2gwkuaje
2014-04-10 16:50:22 +02:00
fc25f85b52
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140410064650-qqd9g5dsaf5dqm52
2014-04-10 06:46:50 +00:00
4bbada19b7
[Merge] Merged with trunk.
...
bzr revid: mdi@tinyerp.com-20140408042721-cc9ujr6abdpnwxqg
2014-04-08 09:57:21 +05:30
0fad8159f3
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
...
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
db6fb31870
[MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
...
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +02:00
4612b417af
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
1cdf8ac3f2
[FIX] crm.lead: missing index on stage_id/type/state
...
bzr revid: odo@openerp.com-20140402122023-detokob7c6a06rux
2014-04-02 14:20:23 +02:00
6cc255dd34
[IMP] crm : Improved the filter string of lead search view.
...
bzr revid: mdi@tinyerp.com-20140402092019-ra01ggdfi0s1bo3f
2014-04-02 14:50:19 +05:30
ada9e4e830
[IMP] crm : Improved the label and help string of lead search view.
...
bzr revid: mdi@tinyerp.com-20140402091553-vl4cn51ihng3qqjt
2014-04-02 14:45:53 +05:30
b854313fa8
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140402080422-52s9e10fu7br5847
2014-04-02 10:04:22 +02:00
16ce262c33
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
77ff3a69b8
[IMP] improve icons and views
...
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
d892a5b38e
[IMP] improve code
...
bzr revid: avo@tinyerp.com-20140328063012-mxvgudl5b3219j2i
2014-03-28 12:00:12 +05:30
d88835ed66
[MERGE] merge with main branch
...
bzr revid: avo@tinyerp.com-20140328050000-xmax3xa0dp4ltxxv
2014-03-28 10:30:00 +05:30
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Gery Debongnie
Antony Lesuisse
Denis Ledoux
Fabien Meghazi
Richard Mathot (OpenERP)
Christophe Simonis
Launchpad Translations on behalf of openerp
Amit Vora
Darshan Kalola (OpenERP)
Cedric Snauwaert
Thibault Delavallée
Randhir Mayatra rma-openerp
DJ Patel
Olivier Dony