[MERGE] merge with main view editor branch.

bzr revid: vme@tinyerp.com-20111012104225-yqx4xb5r0d0u3gzn

21 files changed, 11 insertions, 338 deletions

diff --git a/addons/web_default_home/__init__.py b/addons/web_default_home/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/addons/web_default_home/__init__.py
+++ /dev/null
diff --git a/addons/web_default_home/__openerp__.py b/addons/web_default_home/__openerp__.py
deleted file mode 100644
index 9d9d2f871af..00000000000
--- a/addons/web_default_home/__openerp__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "name" : "OpenERP Web installer home",
-    "category" : "Hidden",
-    "version" : "2.0",
-    "depends" : ['web'],
-    'active': True,
-    'js': ['static/src/js/home.js'],
-    'css': ['static/src/css/home.css']
-}
diff --git a/addons/web_default_home/po/nl_BE.po b/addons/web_default_home/po/da.po
index bdaaf18f475..a56583755e5 100644
--- a/addons/web_default_home/po/nl_BE.po
+++ b/addons/web_default_home/po/da.po
@@ -1,4 +1,4 @@
-# Dutch (Belgium) translation for openerp-web
+# Danish translation for openerp-web
 # Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
 # This file is distributed under the same license as the openerp-web package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-10-07 10:39+0200\n"
-"PO-Revision-Date: 2011-10-07 09:07+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"PO-Revision-Date: 2011-10-11 14:02+0000\n"
+"Last-Translator: Jonas Mortensen <Unknown>\n"
+"Language-Team: Danish <da@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: 2011-10-08 05:30+0000\n"
-"X-Generator: Launchpad (build 14110)\n"
+"X-Launchpad-Export-Date: 2011-10-12 04:44+0000\n"
+"X-Generator: Launchpad (build 14124)\n"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Welcome to your new OpenERP instance."
-msgstr "Welkom bij uw nieuwe OpenERP."
+msgstr "Velkommen til din nye OpenERP instans."
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Remember to bookmark this page."
-msgstr "Gelieve een bookmark voor deze pagina te maken."
+msgstr "Husk at tilføje denne side til dine favoritter."
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Remember your login:"
-msgstr "Vergeet je login niet:"
+msgstr "Husk dit log ind:"
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Choose the first OpenERP Application you want to install.."
-msgstr "Kies welke OpenERP Applicatie je wilt installeren..."
+msgstr "Vælg den første OpenERP Applikation som du ønsker at installere."
 
 #: addons/web_default_home/static/src/xml/web_default_home.xml:0
 msgid "Install"
-msgstr "Installeer"
+msgstr "Installér"
diff --git a/addons/web_default_home/po/es_EC.po b/addons/web_default_home/po/es_EC.po
deleted file mode 100644
index d4c90bb24f2..00000000000
--- a/addons/web_default_home/po/es_EC.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# Spanish (Ecuador) translation for openerp-web
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-10-07 10:39+0200\n"
-"PO-Revision-Date: 2011-10-07 16:00+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: Spanish (Ecuador) <es_EC@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: 2011-10-08 05:30+0000\n"
-"X-Generator: Launchpad (build 14110)\n"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Welcome to your new OpenERP instance."
-msgstr "Bienvenido a tu nueva instancia de OpenERP"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Remember to bookmark this page."
-msgstr "Recuerda marcar esta página"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Remember your login:"
-msgstr "Recordar tu inicio de sesión"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Choose the first OpenERP Application you want to install.."
-msgstr "Escoge la primea Aplicación OpenERP que deseas instalar..."
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Install"
-msgstr "Instalar"
diff --git a/addons/web_default_home/po/it.po b/addons/web_default_home/po/it.po
deleted file mode 100644
index ad80602546b..00000000000
--- a/addons/web_default_home/po/it.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# Italian translation for openerp-web
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openerp-web package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-web\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-10-07 10:39+0200\n"
-"PO-Revision-Date: 2011-10-08 13:41+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: Italian <it@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: 2011-10-09 05:22+0000\n"
-"X-Generator: Launchpad (build 14110)\n"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Welcome to your new OpenERP instance."
-msgstr "Benvenuto nella nuova istanza di OpenERP"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Remember to bookmark this page."
-msgstr "Ricordarsi di aggiungere ai preferiti questa pagina"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Remember your login:"
-msgstr "Ricordare il proprio login:"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Choose the first OpenERP Application you want to install.."
-msgstr "Scegliere la prima applicazione OpenERP che volete installare..."
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Install"
-msgstr "Installa"
diff --git a/addons/web_default_home/po/web_default_home.pot b/addons/web_default_home/po/web_default_home.pot
deleted file mode 100644
index 1c940aac5cc..00000000000
--- a/addons/web_default_home/po/web_default_home.pot
+++ /dev/null
@@ -1,39 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-10-07 10:39+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Welcome to your new OpenERP instance."
-msgstr ""
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Remember to bookmark this page."
-msgstr ""
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Remember your login:"
-msgstr ""
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Choose the first OpenERP Application you want to install.."
-msgstr ""
-
-#: addons/web_default_home/static/src/xml/web_default_home.xml:0
-msgid "Install"
-msgstr ""
-
diff --git a/addons/web_default_home/static/src/css/home.css b/addons/web_default_home/static/src/css/home.css
deleted file mode 100644
index bbf47f29cc4..00000000000
--- a/addons/web_default_home/static/src/css/home.css
+++ /dev/null
@@ -1,42 +0,0 @@
-.oe-static-home {
-    padding: 0.5em 0.5em;
-    text-align: center;
-}
-.oe-static-home h1 {
-    margin: 0 0 0.3em
-}
-.oe-static-home-banner {
-    display: inline-block;
-    margin:  auto 0;
-    padding: 0.5em 5em;
-    text-align: left;
-}
-.oe-static-home-banner li {
-    font-size: 150%;
-    font-weight: bold;
-}
-.oe-static-home address {
-    font-style: normal;
-    padding-left: 2em;
-}
-
-.oe-static-home-tiles {
-    text-align: left;
-}
-.oe-static-home-tiles td {
-    vertical-align: top;
-}
-.oe-static-home-tile {
-    margin: 0.5em;
-    padding: 0 1em;
-}
-.oe-static-home-tile-logo {
-    margin-right: 0.5em;
-}
-.oe-static-home-tile-text h2 {
-    margin-top: 0;
-    margin-bottom: 0.2em;
-}
-.oe-static-home-tile-text p {
-    margin: 0.5em 0;
-}
diff --git a/addons/web_default_home/static/src/img/account_voucher.png b/addons/web_default_home/static/src/img/account_voucher.png
deleted file mode 100644
index afad1331e2e..00000000000
--- a/addons/web_default_home/static/src/img/account_voucher.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/crm.png b/addons/web_default_home/static/src/img/crm.png
deleted file mode 100644
index 893bb23ab98..00000000000
--- a/addons/web_default_home/static/src/img/crm.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/hr.png b/addons/web_default_home/static/src/img/hr.png
deleted file mode 100644
index 742f3e53e67..00000000000
--- a/addons/web_default_home/static/src/img/hr.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/knowledge.png b/addons/web_default_home/static/src/img/knowledge.png
deleted file mode 100644
index 78864367df1..00000000000
--- a/addons/web_default_home/static/src/img/knowledge.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/marketing.png b/addons/web_default_home/static/src/img/marketing.png
deleted file mode 100644
index cfe890f31be..00000000000
--- a/addons/web_default_home/static/src/img/marketing.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/mrp.png b/addons/web_default_home/static/src/img/mrp.png
deleted file mode 100644
index 600104af507..00000000000
--- a/addons/web_default_home/static/src/img/mrp.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/point_of_sale.png b/addons/web_default_home/static/src/img/point_of_sale.png
deleted file mode 100644
index 9054576f2d5..00000000000
--- a/addons/web_default_home/static/src/img/point_of_sale.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/profile_tools.png b/addons/web_default_home/static/src/img/profile_tools.png
deleted file mode 100644
index d6ba0866777..00000000000
--- a/addons/web_default_home/static/src/img/profile_tools.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/project.png b/addons/web_default_home/static/src/img/project.png
deleted file mode 100644
index 20ba49f07c8..00000000000
--- a/addons/web_default_home/static/src/img/project.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/purchase.png b/addons/web_default_home/static/src/img/purchase.png
deleted file mode 100644
index 094705cecc3..00000000000
--- a/addons/web_default_home/static/src/img/purchase.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/sale.png b/addons/web_default_home/static/src/img/sale.png
deleted file mode 100644
index 072570bae38..00000000000
--- a/addons/web_default_home/static/src/img/sale.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/img/stock.png b/addons/web_default_home/static/src/img/stock.png
deleted file mode 100644
index a70ccfe18d5..00000000000
--- a/addons/web_default_home/static/src/img/stock.png
+++ /dev/null
diff --git a/addons/web_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js
deleted file mode 100644
index eff0567fd27..00000000000
--- a/addons/web_default_home/static/src/js/home.js
+++ /dev/null
@@ -1,127 +0,0 @@
-openerp.web_default_home = function (openerp) {
-    var QWeb = openerp.web.qweb;
-    QWeb.add_template('/web_default_home/static/src/xml/web_default_home.xml');
-
-    openerp.web_default_home = {
-        applications: [
-            [
-                {
-                    module: 'crm', name: 'CRM',
-                    help: "Acquire leads, follow opportunities, manage prospects and phone calls, \u2026"
-                }, {
-                    module: 'sale', name: 'Sales',
-                    help: "Do quotations, follow sales orders, invoice and control deliveries"
-                }, {
-                    module: 'account_voucher', name: 'Invoicing',
-                    help: "Send invoice, track payments and reminders"
-                }, {
-                    module: 'project', name: 'Projects',
-                    help: "Manage projects, track tasks, invoice task works, follow issues, \u2026"
-                }
-            ], [
-                {
-                    module: 'purchase', name: 'Purchase',
-                    help: "Do purchase orders, control invoices and reception, follow your suppliers, \u2026"
-                }, {
-                    module: 'stock', name: 'Warehouse',
-                    help: "Track your stocks, schedule product moves, manage incoming and outgoing shipments, \u2026"
-                }, {
-                    module: 'hr', name: 'Human Resources',
-                    help: "Manage employees and their contracts, follow laves, recruit people, \u2026"
-                }, {
-                    module: 'point_of_sale', name: 'Point of Sales',
-                    help: "Manage shop sales, use touch-screen POS"
-                }
-            ], [
-                {
-                    module: 'profile_tools', name: 'Extra Tools',
-                    help: "Track ideas, manage lunch, create surveys, share data"
-                }, {
-                    module: 'mrp', name: 'Manufacturing',
-                    help: "Manage your manufacturing, control your supply chain, personalize master data, \u2026"
-                }, {
-                    module: 'marketing', name: 'Marketing',
-                    help: "Manage campaigns, follow activities, automate emails, \u2026"
-                }, {
-                    module: 'knowledge', name: 'Knowledge',
-                    help: "Track your documents, browse your files, \u2026"
-                }
-            ]
-        ]
-    };
-
-    openerp.web.WebClient.include({
-        default_home: function () {
-            var self = this,
-                // resig class can't handle _super in async contexts, by the
-                // time async callback comes back, _super has already been
-                // reset to a baseline value of this.prototype (or something
-                // like that)
-                old_home = this._super;
-            var Installer = new openerp.web.DataSet(
-                    this, 'base.setup.installer');
-            Installer.call('already_installed', [], function (installed_modules) {
-                if (!_(installed_modules).isEmpty()) {
-                    return old_home.call(self);
-                }
-                self.action_manager.do_action({
-                    type: 'ir.actions.client',
-                    tag: 'home.default'
-                })
-            }, function (err, event) {
-                event.preventDefault();
-                return old_home.call(self);
-            });
-        }
-    });
-
-    openerp.web.client_actions.add(
-        'home.default', 'openerp.web_default_home.DefaultHome');
-    openerp.web_default_home.DefaultHome = openerp.web.View.extend({
-        template: 'StaticHome',
-        start: function () {
-            var r = this._super(), self = this;
-            this.$element.delegate('.oe-static-home-tile-text button', 'click', function () {
-                self.install_module($(this).val());
-            });
-            return r;
-        },
-        render: function () {
-            return this._super({
-                url: window.location.protocol + '//' + window.location.host + window.location.pathname,
-                session: this.session,
-                rows: openerp.web_default_home.applications
-            })
-        },
-        install_module: function (module_name) {
-            var self = this;
-            var Modules = new openerp.web.DataSetSearch(
-                this, 'ir.module.module', null,
-                [['name', '=', module_name], ['state', '=', 'uninstalled']]);
-            var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade');
-
-            $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
-            Modules.read_slice(['id'], {}, function (records) {
-                if (!(records.length === 1)) { $.unblockUI(); return; }
-                Modules.call('state_update',
-                    [_.pluck(records, 'id'), 'to install', ['uninstalled']],
-                    function () {
-                        Upgrade.call('upgrade_module', [[]], function () {
-                            self.run_configuration_wizards();
-                        });
-                    }
-                )
-            });
-        },
-        run_configuration_wizards: function () {
-            var self = this;
-            new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) {
-                $.unblockUI();
-                self.do_action(action, function () {
-                    // TODO: less brutal reloading
-                    window.location.reload(true);
-                });
-            });
-        }
-    });
-};
diff --git a/addons/web_default_home/static/src/xml/web_default_home.xml b/addons/web_default_home/static/src/xml/web_default_home.xml
deleted file mode 100644
index 5ee11387db9..00000000000
--- a/addons/web_default_home/static/src/xml/web_default_home.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-    <div t-name="StaticHome" class="oe-static-home">
-        <h1>Welcome to your new OpenERP instance.</h1>
-        <div class="oe-static-home-banner">
-            <li>Remember to bookmark this page.</li>
-            <li>Remember your login: <i><t t-esc="session.login"/></i></li>
-            <li>Choose the first OpenERP Application you want to install..</li>
-        </div>
-        <div class="oe-static-home-tiles">
-            <table width="100%">
-                <tr t-foreach="rows" t-as="row">
-                    <td t-foreach="row" t-as="application" width="25%">
-                        <table class="oe-static-home-tile">
-                            <tr>
-                                <td>
-                                    <div class="oe-static-home-tile-logo">
-                                        <img t-att-src="'/web_default_home/static/src/img/' + application.module + '.png'"/>
-                                    </div>
-                                </td>
-                                <td>
-                                    <div class="oe-static-home-tile-text">
-                                        <h2><t t-esc="application.name"/></h2>
-                                        <p><t t-esc="application.help"/></p>
-                                        <button type="button" t-att-value="application.module"> Install</button>
-                                    </div>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </div>
-</template>