From 79c275c0ca7c1425c0496ec877484c5237eaf366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 19 Nov 2012 10:24:57 +0100 Subject: [PATCH] [CLEAN] mail: cleaned demo data about files and noupdate: fixed some typos. bzr revid: tde@openerp.com-20121119092457-lgiijzl4c6c90nuk --- addons/crm/__openerp__.py | 5 +-- addons/crm/crm_lead_demo.xml | 3 +- addons/mail/__openerp__.py | 4 +- addons/mail/data/mail_demo.xml | 3 +- addons/mail/data/mail_group_data.xml | 9 ++--- addons/mail/data/mail_group_demo_data.xml | 49 +++++++++++------------ 6 files changed, 34 insertions(+), 39 deletions(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 0b6391501e4..63d5d3da84b 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -99,14 +99,13 @@ Dashboard for CRM will include: 'board_crm_view.xml', '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 a1996b3f2c4..913ce9fc612 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -1,7 +1,6 @@ - - + diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 18d4500f2a4..c535e3f7024 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -64,10 +64,10 @@ Main Features 'security/ir.model.access.csv', 'mail_alias_view.xml', 'res_users_view.xml', - 'data/mail_demo.xml', - 'data/mail_group_demo_data.xml', ], 'demo': [ + 'data/mail_demo.xml', + 'data/mail_group_demo_data.xml', ], 'installable': True, 'auto_install': False, diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml index 471063aead2..8cc91bd4d65 100644 --- a/addons/mail/data/mail_demo.xml +++ b/addons/mail/data/mail_demo.xml @@ -1,7 +1,6 @@ - - + diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index bc3912329a5..84258d619ba 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -1,7 +1,6 @@ - - + Whole Company @@ -16,9 +15,9 @@ notification Welcome to OpenERP! - Your homepage is a summary of messages you received and key information about documents you follow.

-The top menu bar contains all applications you installed. You can use the Settings menu to install more applications, activate others features or give access to new users.

-To setup your preferences (name, email signature, avatar), click on the top right corner.

]]> + Your homepage is a summary of messages you received and key information about documents you follow.

+

The top menu bar contains all applications you installed. You can use the Settings menu to install more applications, activate others features or give access to new users.

+

To setup your preferences (name, email signature, avatar), click on the top right corner.

]]> diff --git a/addons/mail/data/mail_group_demo_data.xml b/addons/mail/data/mail_group_demo_data.xml index 21e10e278df..a6879c52a1a 100644 --- a/addons/mail/data/mail_group_demo_data.xml +++ b/addons/mail/data/mail_group_demo_data.xml @@ -1,7 +1,6 @@ - - + @@ -22,13 +21,13 @@ R&D Research and development discussion group - - - - + HR Policies Company cars, holidays and other advantages + + + Support Support team @@ -78,7 +77,7 @@ mail.group - + Your monthly meal vouchers arrived. You can get them at the HR's office.

]]> comment @@ -86,7 +85,7 @@ mail.group - + Oh, I had forgotten. This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.

]]> comment @@ -95,7 +94,7 @@ mail.group - + Thanks! Could you please remind me where is Christine's office, if I may ask? I'm new here!

]]> comment @@ -104,7 +103,7 @@ mail.group - + Building B3, second floor on the right :-).

]]> comment @@ -112,7 +111,8 @@ - + + mail.group

- The main events of the month of october are: + The main events of the month of October are:

Sales:

    -
  • Invoicing is respectively of 442k€ for our european company (66% of the budget) and $404k for the U.S. office (75% of the budget). Despite these numbers that are far bellow our initial expectations, the growth of the month of october is 51% compared to last year.
    • -
  • The month of september having been better than our initial forecasts, the consolidated yearly revenue is only of $20k bellow our forecast made during the board of september.
    • +
  • Invoicing is respectively of 442k€ for our European company (66% of the budget) and $404k for the U.S. office (75% of the budget). Despite these numbers that are far bellow our initial expectations, the growth of the month of October is 51% compared to last year.
    • +
  • The month of September having been better than our initial forecasts, the consolidated yearly revenue is only of $20k bellow our forecast made during the board of September.
  • The consolidated forecast for the end of the year is $6.749k, which is a growth of 76% compared to last year and an achievement of 87% of the budget.
  • The recruitment of new resellers has been very good, especially in Europe, where we signed 30 new resellers this month.
@@ -137,30 +137,30 @@
  • The profit and loss has been negatively impacted this month by revenues that are far beyond the budget and charges that are 15% above the budget. The main extra we had in our charges this month is due to the provisioning of the salaries for the holidays period, $50k.
  • We also got the payment of our long awaited subsidies, the cash level has increased of 300K€ which gives a current balance of 963 K€ without including the straight loan of 350 K€.
    • -
  • The aged customer balance has been similar to the one of the last month with a small decrease of the DSO. We have recruited a new accountant assistant for the credit collection. She is mostly doing phone calls for all invoices that are due since 30 days, so we should get improvements of the DSO in november. The sum of the invoicing on which we have a risk in the aged customer balance is 100K€.
    • +
  • The aged customer balance has been similar to the one of the last month with a small decrease of the DSO. We have recruited a new accountant assistant for the credit collection. She is mostly doing phone calls for all invoices that are due since 30 days, so we should get improvements of the DSO in November. The sum of the invoicing on which we have a risk in the aged customer balance is 100K€.

Resellers and Customers:

    -
  • The total number of resellers is 429, accross 87 countries.
    • -
  • The total number of installations of our software increased to 37K, against 33K for the month of september but we still did not reached the highest level we reached during this year (44K in march and may)
    • -
  • We have passed the 10000th customer in production with 10271 customers at the end of october. The paying customer ratio is 6,6%.
    • +
  • The total number of resellers is 429, across 87 countries.
    • +
  • The total number of installations of our software increased to 37K, against 33K for the month of September but we still did not reached the highest level we reached during this year (44K in march and may)
    • +
  • We have passed the 10000th customer in production with 10271 customers at the end of October. The paying customer ratio is 6,6%.

Launch of the new release:

- We are working actively on the new release which is scheduled for the end of november. + We are working actively on the new release which is scheduled for the end of November.

  • We will publish the release note this week
    • -
  • The whole sales team will be trained on the new version this friday
    • -
  • We will do a public announce to our resellers the 21th of november. We plan to show them: a description of the new features, the new distribution strategy, the new pricing and the communication plan.
    • +
  • The whole sales team will be trained on the new version this Friday
    • +
  • We will do a public announce to our resellers the 21th of November. We plan to show them: a description of the new features, the new distribution strategy, the new pricing and the communication plan.

- Nicolas, can you book a meeting room for our meeting of friday 2pm? + Nicolas, can you book a meeting room for our meeting of Friday 2pm?

Regards. @@ -174,13 +174,13 @@ + mail.group - Great news. -
+ Great news!
Our company has received the Deloitte Fast 50 award. We are the fastest growing company of the country, with a growth of 1549% over the past 5 years. You can get more information on our blog. @@ -191,7 +191,6 @@ -