[MERGE] merge with dev-addons3 branch

bzr revid: psi@tinyerp.co.in-20101112131955-v82ufccqmahye7bl

5 files changed, 76 insertions, 47 deletions

diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index eabeef61334..2c4f8f46323 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -23,7 +23,7 @@
         <group colspan="8" col="8">
           <separator string="" colspan="8"/>
           <label string="" colspan="6"/>
-          <button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/>
+          <button name="menu" icon="gtk-ok" type="object" string="Skip Configuration Wizards" help="Only for experimented users" colspan="1"/>
           <button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/>
         </group>
     </form>
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 02e81083ddc..a076998ac29 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2009-09-08 12:34+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-11-11 14:07+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -27,6 +27,8 @@ msgstr "Πόλη"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Το όνομα του Αντικειμένου(Object) θα πρέπει να ξεκινά με x_ και δεν θα "
+"πρέπει να περιέχει ειδικούς χαρακτήρες."
 
 #. module: base_setup
 #: constraint:ir.actions.act_window:0
@@ -36,7 +38,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Τιμολόγηση"
 
 #. module: base_setup
 #: field:base.setup.company,name:0
@@ -51,12 +53,12 @@ msgstr "E-mail"
 #. module: base_setup
 #: field:base.setup.company,account_no:0
 msgid "Bank Account No"
-msgstr ""
+msgstr "Αρ. Λογαριασμού Τραπέζης"
 
 #. module: base_setup
 #: field:base.setup.installer,profile_tools:0
 msgid "Extra Tools"
-msgstr ""
+msgstr "Επιπλέον Εργαλεία"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer1:0
@@ -69,26 +71,28 @@ msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
 msgstr ""
+"Βοηθά στην διαχείρηση των διαδικασιών παραγωγής και παράγει αναφορές γι' "
+"αυτές"
 
 #. module: base_setup
 #: help:base.setup.installer,marketing:0
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Βοηθά στην διαχείρηση των εξτρατειών μάρκετινγκ βήμα προς βήμα"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Your database is now created."
-msgstr ""
+msgstr "Η βάση σου έχει δημιουργηθεί"
 
 #. module: base_setup
 #: field:base.setup.installer,point_of_sale:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "Εντατική Λιανική"
 
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "Αντιστοιχήσεις"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -96,6 +100,8 @@ msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing "
 msgstr ""
+"Σε βοηθά να διαχειριστείς τις λογιστικές σου ανάγκες, εάν δεν είσαι "
+"λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση "
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -103,12 +109,14 @@ msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
 msgstr ""
+"Μπορείς να ξεκινήσεις την παραμετροποίηση του συστήματος ή να συνδεθείς "
+"απευθείας στην βάση ως διαχειριστής"
 
 #. module: base_setup
 #: field:base.setup.company,progress:0
 #: field:base.setup.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Πρόοδος Ρυθμίσεων"
 
 #. module: base_setup
 #: field:base.setup.company,rml_footer2:0
@@ -129,17 +137,17 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,marketing:0
 msgid "Marketing"
-msgstr ""
+msgstr "Μάρκετινγκ"
 
 #. module: base_setup
 #: field:base.setup.company,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρία"
 
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr ""
+msgstr "Διαχείρηση Πωλήσεων"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
@@ -151,7 +159,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "Προχωρημένες Αναφορές"
 
 #. module: base_setup
 #: field:base.setup.company,phone:0
@@ -166,7 +174,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "τίτλος"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -176,7 +184,7 @@ msgstr "Χρήση Απευθείας"
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Διαχείρηση Γνώσης"
 
 #. module: base_setup
 #: help:base.setup.installer,product_expiry:0
@@ -184,6 +192,8 @@ msgid ""
 "Installs a preselected set of OpenERP applications which will help you "
 "manage your industry."
 msgstr ""
+"Εγκαθίστανται μια σειρά από προεγκατεστημένες εφαρμογές του OpenERP που θα "
+"σε βοηθήσουν να διαχειριστείς την εταιρία σου"
 
 #. module: base_setup
 #: help:base.setup.installer,project:0
@@ -191,6 +201,7 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Βοηθά στην παρακολούθηση των έργων και εργασιών παράγωντας σχέδια , κλπ..."
 
 #. module: base_setup
 #: help:base.setup.installer,point_of_sale:0
@@ -206,6 +217,8 @@ msgid ""
 "Helps you manage your human resources by encoding your employees structure, "
 "generating work sheets, tracking attendance and more."
 msgstr ""
+"Σε βοηθά να διαχειριστείς τους ανθρώπινους πόρους καταγράφοντας τη δομή των "
+"υπαλήλων,δημιουργώντας φύλλα εργασιών, καταγραφή παρουσίας"
 
 #. module: base_setup
 #: help:base.setup.installer,account_voucher:0
@@ -213,6 +226,9 @@ msgid ""
 "Allows you to create your invoices and track the payments. It is an easier "
 "version of the accounting module for managers who are not accountants."
 msgstr ""
+"Επιτρέπει να δημιουργήσεις τιμολόγια και να παρακολουθήσεις τις πληρωμές. "
+"Είναι μια πρώιμη έκδοση του πρόσθετου της Λογιστικής για διαχειριστές που "
+"δεν είναι λογιστές."
 
 #. module: base_setup
 #: constraint:ir.ui.view:0
@@ -222,7 +238,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,hr:0
 msgid "Human Resources"
-msgstr ""
+msgstr "Διαχείρηση Ανθρώπινων Πόρων"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
@@ -245,7 +261,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "Οδός 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
@@ -265,7 +281,7 @@ msgstr "Εγκατάσταση"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Λογιστική &Οικονομικά"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
@@ -275,7 +291,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "Ταχυδρομικός Κώδικας"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -292,7 +308,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "Ρύθμιση Εταιρίας"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -302,37 +318,39 @@ msgstr "Logo"
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "Διαχείρηση Αγορών"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
 msgstr ""
+"Σε βοηθά να διαχειριστείς τις προσφορε΄ς, παραγγελίες πωλήσεων και την "
+"τιμολόγηση"
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Διαχείρηση Αποθήκης"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Διαχείρηση Έργων"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "Εγκατεστημένοι χρήστες"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "Νέα Βάση Δεδομένων"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "Διαχείρηση Πελατών"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -358,6 +376,8 @@ msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
 msgstr ""
+"Γίνεται εγκατάσταση εργαλείων για την απλοποίηση και την ενίσχυση των "
+"αναφορών του OpenERP"
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -367,24 +387,24 @@ msgstr "Κεφαλίδα Αναφοράς"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "Πληροφορίες σχετικά με την νέα βάση δεδομένων"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Εικόνα"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "Βιομηχανία Τροφίμων"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "Παραγωγή"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -405,12 +425,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "Ιστοσελίδα Εταιρίας"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "Εγκαθιστά Συγκεκριμένες Επιχειρησιακές Εφαρμογές"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -425,12 +445,12 @@ msgstr ""
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "Παράδειγμα:http://openerp.com"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "Εγκτάσταση Εφαρμογών"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -439,6 +459,9 @@ msgid ""
 "or issues. Can automatically send reminders, escalate requests or trigger "
 "business-specific actions based on standard events."
 msgstr ""
+"Σε βοηθά να καταγράψεις και και να διαχειριστείς τις σχέσεις με τους "
+"υποψήφιους πελάτες, αιτήσεις και θέματα. Μπορεί να στείλει υπενθυμίσεις "
+"αυτόματα, να κλημακώσει απαιτήσεις ή να ενεργήσει βάσει κάποιον γεγονότων."
 
 #. module: base_setup
 #: help:base.setup.installer,stock:0
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 174070ac863..b128b3be1e3 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-07 07:50+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-10 10:01+0000\n"
+"Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-08 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-11-11 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -146,7 +146,7 @@ msgstr "Company"
 #. module: base_setup
 #: field:base.setup.installer,sale:0
 msgid "Sales Management"
-msgstr "Gesione vendite"
+msgstr "Gestione Vendite"
 
 #. module: base_setup
 #: help:base.setup.installer,profile_tools:0
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 71adcee3dc5..480cd3c5753 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-28 09:29+0000\n"
+"PO-Revision-Date: 2010-11-11 08:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -436,7 +436,7 @@ msgstr "Website bedrijf"
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr "Installeer specifieke bedrijfstak appliacties"
+msgstr "Installeer specifieke bedrijfstak applicaties"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 8f16a491bc7..b30669382a5 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -49,12 +49,16 @@ class base_setup_company(osv.osv_memory):
     def _get_all_countries(self, cr, uid, context=None):
         return self._get_all(cr, uid, 'res.country', context=context)
 
+    def _show_company_data(self, cr, uid, context=None):
+        # We only want to show the default company data in demo mode, otherwise users tend to forget
+        # to fill in the real company data in their production databases
+        return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'module_meta_information').demo
+
+
     def default_get(self, cr, uid, fields_list=None, context=None):
         """ get default company if any, and the various other fields
         from the company's fields
         """
-        base_mod = self.pool.get('ir.module.module').search(cr, uid, [('name','ilike','base')])
-        base_mod_rec = self.pool.get('ir.module.module').browse(cr, uid, base_mod)[0]
         defaults = super(base_setup_company, self)\
               .default_get(cr, uid, fields_list=fields_list, context=context)
         companies = self.pool.get('res.company')
@@ -63,8 +67,10 @@ class base_setup_company(osv.osv_memory):
             return defaults
         company = companies.browse(cr, uid, company_id[0])
         defaults['company_id'] = company.id
-        if not base_mod_rec.demo:
+
+        if not self._show_company_data(cr, uid, context=context):
             return defaults
+
         defaults['currency'] = company.currency_id.id
         for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
             defaults[field] = company[field]