diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 03885f541d0..0b6391501e4 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -100,13 +100,13 @@ Dashboard for CRM will include: 'res_config_view.xml', - ], - 'demo': [ 'crm_demo.xml', 'crm_lead_demo.xml', 'crm_phonecall_demo.xml', 'crm_action_rule_demo.xml', ], + 'demo': [ + ], 'test': [ 'test/process/communication_with_customer.yml', 'test/process/lead2opportunity2win.yml', diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index 1a2dd26f691..a1996b3f2c4 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -1,6 +1,7 @@ - + + @@ -324,8 +325,8 @@ Andrew opportunity - Plan to buy a Laptop - + Plan to buy RedHat servers + 69 rue de Chimay @@ -412,7 +413,7 @@ Andrew Call to define real needs about training - + @@ -553,14 +554,19 @@ Andrew - + - + + + bWlncmF0aW9uIHRlc3Q= + YourCompany2012.doc + YourCompany2012.doc + - Plan to buy a Laptop + Plan to buy RedHat servers crm.lead @@ -573,48 +579,81 @@ Andrew - Re: Plan to buy a Laptop + Re: Plan to buy RedHat servers crm.lead comment - Dear Customer,
-Thanks for showing interest in our products.
-We have attached the catalogue.
-We would like to know your interests, so let us know when we can call you for more details.
-Best regards,

]]> + Dear customer,
+ Thanks for showing interest in our products! As requested, I send to you our products catalog.
+ To be able to finely tune the solution, we would like to know precise needs. This way we wil be able to help you choosing the right infrastructure according to your requirements.
+ Best regards,

]]> + - Re: Plan to buy a Laptop + Re: Plan to buy RedHat servers crm.lead - Thanks for the information!
I will visit the store as soon as possible.

]]> - comment + Thanks for the information!
I asked a precise specification to our technical expert. Here is what we precisely need:

+
    +
  • weekly backups, every Monday
    • +
  • backup time is not a blocking point for us, as we are closed all Monday, leaving time enough to perform the backup
    • +
  • reliability is very important; we need redundant servers and rollback capacity
    • +
  • a total capacity of about 2 TB
    • +
+

Best regards,

]]> + email - + virginie@agrolait.fr + - Re: Plan to buy a Laptop + Re: Plan to buy RedHat servers crm.lead - Could you please tell me if the store is open at 9:00 PM?

]]> - comment - - - - - - Re: Plan to buy a Laptop - crm.lead - - Yes, its open till 10:00 PM. You are welcome!

]]> + Hello

+

After our phonecall and discussion with our technical experts, here is the offer of YourCompany. We believe it will meet every requirement you had in mind. Please feel free to contact me for any detail or technical detail that is not clear enough for you.

+

Notice that as agreed on phone, we offer you a 10% discount on the hardware!

+

Best regards,

]]> email + + Catalog to send + crm.lead + + They just want pricing information about our services. I think sending our catalog should be sufficient.

]]> + comment + + + + + Inquiry + crm.lead + + Hello!
+ I am Leland Martinez, from the Delta PC. Maybe you remember, we talked a bit last month at this international conference.
+ We would like to attend a training, but we are not quite sure about what we can ask. Maybe we should meet and talk about that?
+ Best regards,

]]> + comment + + + + + + crm.lead + + It seems very interesting. As you say, first of all we will have to define precisely what the training will be about, and your precise needs.

]]> + comment + + + + + Inquiry crm.lead @@ -631,36 +670,6 @@ Best regards,

]]> Want to know features and benefits to use the new software. comment - - Inquiry - crm.lead - - Hello!
- I am Leland Martinez, from the Delta PC. Maybe you remember, we talked a bit last month at this international conference.
- We would like to attend a training, but we are not quite sure about what we can ask. Maybe we should meet and talk about that?
- Best regards,

]]> - comment - - - - - crm.lead - - It seems very interesting. As you say, first of all we will have to define precisely what the training will be about, and your precise needs.

]]> - comment - - - - - - Need Details - crm.lead - - They just want pricing information about our services. I think sending our catalog should be sufficient.

]]> - comment - - - diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index c535e3f7024..18d4500f2a4 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -64,11 +64,11 @@ Main Features 'security/ir.model.access.csv', 'mail_alias_view.xml', 'res_users_view.xml', - ], - 'demo': [ 'data/mail_demo.xml', 'data/mail_group_demo_data.xml', ], + 'demo': [ + ], 'installable': True, 'auto_install': False, 'application': True, diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml index 5ae2debbe7e..ab21c488a4b 100644 --- a/addons/mail/data/mail_demo.xml +++ b/addons/mail/data/mail_demo.xml @@ -1,6 +1,7 @@ - + + @@ -76,86 +77,53 @@ none - - + + bWlncmF0aW9uIHRlc3Q= - my_attachment.xls - my_attachment.xls + RedHat_spec.doc + RedHat_spec.doc - - mail.thread - Comment with attachment - Demo data with attachment and others messages - comment - - - - - - - mail.thread - MESSAGE

]]> - comment - - - - - - - mail.thread - MESSAGE

]]> - comment - - - - - - - mail.thread - MESSAGE

]]> - comment - - - - - - - mail.thread - MESSAGE

]]> - comment - - - - - - + bWlncmF0aW9uIHRlc3Q= - my_other_attachment.ai - my_other_attachment.ai + RedHat_spec_draft_v3.doc + RedHat_spec_draft_v3.doc - - mail.thread - MESSAGE

]]> + + RedHat server updated spec + Hello Demo

+

We have a lot of inquiries about our now solution using RedHat servers. However I do not have the updated specification ready at hand.

+

Could you please send me the last version of the file asap?

+

Thanks,

]]> comment - - - + + - - mail.thread - MESSAGE

]]> + + Sure, here it is. Have a nice day!

]]> comment - - - + + + + + + + + I just found a newer draft of the spec. Jon did some cleaning in the specifications. Could you merge the two documents to have an updated one?

When it's done, put it on the internal document management system.

Thanks,

]]> + comment + + + + + + - - Plan to install servers + + Plan to install backup servers Hello,

We need to deploy new backup servers, with the following requirements:

    @@ -172,41 +140,19 @@ email virginie@agrolait.fr + - - - - + ir.attachment bWlncmF0aW9uIHRlc3Q= catalog.doc catalog.doc - + ir.attachment activity_graph_2012.jpg activity_graph_2012 @@ -276,10 +222,11 @@ kxzLdwM111ZhJXPm0ixn3/rQxvK6Vd4vn//Z - - Hi,
    The next version of products and price list catalog is scheduled for next month.
    -You will find in attachment the catalog, as well as a comparative benchmark of the different solutions existing on the market.
    Have a nice reading!
    -Sincerely,

    ]]>     + + Hi Demo,

    +

    The next version of our products catalog is scheduled for next month. Our product team send me their updated info about the prices and costs, and I updated our catalog.

    +

    You will find it in attachment, as well as a comparative benchmark of the different solutions currently existing on the market.
    Have a nice reading!
    + Sincerely,

    ]]>     comment @@ -287,19 +234,18 @@ Sincerely,

    ]]>         - - Thank you!
    Could you send me the updated pricelist as negociated beginning of this year?
    Sincerely,

    ]]>     - + + Thank you!
    Could you send me the updated pricelists as negociated beginning of this year?
    Sincerely,

    ]]>     comment - + - - + +     - + Hello,

    I have a friend working at Epic Technologies. He told me they plan to upgrade their backup servers within the next 3 months.

    I think that someone should contact them and check if there is an opportunity.

    ]]>     comment @@ -307,19 +253,9 @@ Sincerely,

    ]]>         - - -Ok, I'll contact them today. Thanks for the info.

    ]]>     - - comment - - - - -     - + - + comment @@ -327,12 +263,12 @@ Ok, I'll contact them today. Thanks for the info.

    ]]>         - - + + Information meeting - Hello,

    Epic Technologies is a small company specialized in big data software.

    I saw you have interesting solutions to manage our backups. Could we meet each other as soon as possible to discuss our need:

    + Hello,

    Epic Technologies is a small company specialized in software managing huge volume of data. Having an efficient and reliable backup system is very important to us, and critical for our customers. I eared you have some interesting solutions to manage our backups. Could we meet each other as soon as possible to discuss our need? Here is a first list of requirements:

      -
    • 25 backup servers, running on Redhat Linux
      • +
    • about 25 backup servers, running on Redhat Linux
    • minimum 200Gb of storage per server
    • setup a VPN between all our servers in New York and Chicago
    @@ -342,67 +278,79 @@ Ok, I'll contact them today. Thanks for the info.

    ]]>     - +     - + RE: Information meeting - Hello
    Of course, I am glad you are interested in our products. I propose to have a meeting tomorrow at 2 PM. Does it seem suitable for you ?
    Best regards,

    ]]>     - + Hello Epic!

    +

    I am glad you are interested in our products. Indeed, we are have several backup solutions that should meet your requirements. In order to prepare a detailed offer, we will have to discuss several technical points about your needs and the context of your data management.

    +

    I propose to have a meeting tomorrow at 2 PM. Does it seem suitable for you ?
    Best regards,

    ]]>     + comment - +     - + RE: Information meeting - It is not possible for me to come at 2 PM. However it is ok at 3 PM.

    ]]>     - + It is not possible for me to come tomorrow at 2 PM. Maybe at 4 PM?

    ]]>     + comment - - +     - + RE: Information meeting - Fine then. See you tomorrow at 3 PM!
    Best regards,

    ]]>     - + 4 PM is fine! See you tomorrow!
    Best regards,

    ]]>     + comment - +     - + RE: Information meeting Ok! See you tomorrow.

    ]]>     - + comment - +     - - - Feedback on our service - Hi,
    I come to you about our On Site Assistance Service that we delivered to you last week. Do you have any feedback about our service? I noticed you requested new IP phones, is it for new employees or did you had any issue with the ones we sent you?
    Best regards,

    ]]>     + + + Feedback about our On Site Assistance + Hi Virginie,
    I writing to you about our On Site Assistance Service that we delivered to Agrolait last week. Do you have any feedback or remark about our service? I noticed you requested new IP phones. Will it be used for new employees, or did you have any issue with the ones we provided?
    Best regards,

    ]]>     comment - +     - - RE: Feedback on our service - Hello
    Glad to hearing from you! Everything is perfect, I ordered two phones for two new employees.

    ]]>     - + + RE: Feedback about our On Site Assistance + Hello Administrator,
    Glad to hearing from you! Everything is perfect, thanks for asking. Concerning the order of 2 IP phones, I ordered them for new employees. We are satisfied with the products of YourCompany, and we plan to fit out each new employee with one of your phone this year.
    Regards,

    ]]>     + comment + +     + + + + FWD: Meeting with Demo + Hello Administrator,
    A small email to inform you that we will have a meeting with Mr Demo next Tuesday. Everything is under control!
    Regards,

    ]]>     + comment + + +     diff --git a/addons/mail/data/mail_group_demo_data.xml b/addons/mail/data/mail_group_demo_data.xml index 535948a2337..21e10e278df 100644 --- a/addons/mail/data/mail_group_demo_data.xml +++ b/addons/mail/data/mail_group_demo_data.xml @@ -1,6 +1,7 @@ - + +