From b5833591dcf7e65cc829e080c289400b0926f2a1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 27 May 2014 12:05:41 +0200
Subject: [PATCH 01/20] [IMP] website_sale: add vat field on checkout

---
 addons/website_sale/controllers/main.py | 2 +-
 addons/website_sale/views/templates.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ff4761a848c..20900110fcf 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -310,7 +310,7 @@ class website_sale(http.Controller):
         return values
 
     mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-    optional_billing_fields = ["street2", "state_id"]
+    optional_billing_fields = ["street2", "state_id", "vat"]
     mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
     optional_shipping_fields = ["state_id"]
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 495e540c57a..95eb089a663 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -704,6 +704,11 @@
                       <label class="control-label" for="street2" style="font-weight: normal">Company Name</label>
                       <input type="text" name="street2" class="form-control" t-att-value="checkout.get('street2')"/>
                   </div>
+                  <div class="col-lg-6"> </div>
+                  <div t-attf-class="form-group #{error.get('vat') and 'has-error' or ''} col-lg-6">
+                      <label class="control-label" for="vat" style="font-weight: normal">VAT Number</label>
+                      <input type="text" name="vat" class="form-control" t-att-value="checkout.get('vat')"/>
+                  </div>
                   <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
                       <label class="control-label" for="contact_name">Email</label>
                       <input type="email" name="email" class="form-control" t-att-value="checkout.get('email')"/>

From 59be055c3718aede3f1d2262483a5279f52c84ba Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 27 May 2014 12:49:16 +0200
Subject: [PATCH 02/20] [IMP] website_sale: if base_vat is installed, when the
 use try to validate checkout, the vat is checked (VAT Information Exchange
 System)

---
 addons/website_sale/controllers/main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 20900110fcf..c645943917b 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -355,6 +355,11 @@ class website_sale(http.Controller):
             if not data.get(field_name):
                 error[field_name] = 'missing'
 
+        if data.get("vat") and hasattr(registry["res.partner"], "check_vat"):
+            vat_country, vat_number = registry["res.partner"]._split_vat(data.get("vat"))
+            if not registry["res.partner"].vies_vat_check(cr, uid, vat_country, vat_number, context=None): # simple_vat_check
+                error["vat"] = 'error'
+
         if data.get("shipping_different"):
             for field_name in self.mandatory_shipping_fields:
                 field_name = 'shipping_' + field_name

From 2efb07473326d6fb1eefae00e6ebaac40cce3f5f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 27 May 2014 14:35:07 +0200
Subject: [PATCH 03/20] [IMP] website_sale: use company vat_check_vies field to
 select the method to check the vat id base_vat is installed

---
 addons/website_sale/controllers/main.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index c645943917b..2ef442a4e3b 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -356,8 +356,14 @@ class website_sale(http.Controller):
                 error[field_name] = 'missing'
 
         if data.get("vat") and hasattr(registry["res.partner"], "check_vat"):
+            if request.website.company_id.vat_check_vies:
+                # force full VIES online check
+                check_func = registry["res.partner"].vies_vat_check
+            else:
+                # quick and partial off-line checksum validation
+                check_func = registry["res.partner"].simple_vat_check
             vat_country, vat_number = registry["res.partner"]._split_vat(data.get("vat"))
-            if not registry["res.partner"].vies_vat_check(cr, uid, vat_country, vat_number, context=None): # simple_vat_check
+            if not check_func(cr, uid, vat_country, vat_number, context=None): # simple_vat_check
                 error["vat"] = 'error'
 
         if data.get("shipping_different"):

From fe74741594cb653483fb37133e853595893a7a24 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Tue, 27 May 2014 15:13:44 +0200
Subject: [PATCH 04/20] [FIX] ir_qweb: contact field must add 'http://' if the
 website url value has not any protocol

---
 openerp/addons/base/ir/ir_qweb.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_qweb.xml b/openerp/addons/base/ir/ir_qweb.xml
index d021d496fdc..c69dc17c851 100644
--- a/openerp/addons/base/ir/ir_qweb.xml
+++ b/openerp/addons/base/ir/ir_qweb.xml
@@ -20,7 +20,7 @@
             <div t-if="fax and 'fax' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-file-text-o'/> <span itemprop="faxNumber" t-esc="fax"/></div>
             <div t-if="website and 'website' in fields" class='css_editable_mode_hidden'>
                 <i t-if="not options.get('no_marker')" class='fa fa-globe'/>
-                <a t-att-href="website"><span itemprop="website" t-esc="website"/></a>
+                <a t-att-href="website and '%s%s' % ('http://' if '://' not in website else '',website)"><span itemprop="website" t-esc="website"/></a>
             </div>
             <div t-if="email and 'email' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-envelope'/> <span itemprop="email" t-esc="email"/></div>
         </div>

From cadf582d783a0bfb14dd2535f457bc2959185a9b Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 27 May 2014 18:39:00 +0200
Subject: [PATCH 05/20] [FIX] event_sale, website_event_sale: ACLs for
 event.event.ticket

event.event.ticket were set in website_event_sale, while this model is set in event_sale module
Manager acl moved from website_event_sale to event_sale
Created a new acl for event user in event_sale
Left the acl for everyone in website_event_sale, meaning that when this module is installed, everyone can read tickets, event those who aren't event user
---
 addons/event_sale/__openerp__.py                       | 1 +
 addons/event_sale/security/ir.model.access.csv         | 3 +++
 addons/website_event_sale/security/ir.model.access.csv | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 addons/event_sale/security/ir.model.access.csv

diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index 88e27fd9a3d..35d2f51aacc 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -42,6 +42,7 @@ this event.
     'data': [
         'event_sale_view.xml',
         'event_sale_data.xml',
+        'security/ir.model.access.csv',
     ],
     'demo': ['event_demo.xml'],
     'test': ['test/confirm.yml'],
diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
new file mode 100644
index 00000000000..410458d4b0f
--- /dev/null
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_event_ticket_user,event.event.ticket.user,event_sale.model_event_event_ticket,event.group_event_user,1,0,0,0
+access_event_event_ticket_admin,event.event.ticket.admin,event_sale.model_event_event_ticket,event.group_event_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/website_event_sale/security/ir.model.access.csv b/addons/website_event_sale/security/ir.model.access.csv
index 0538dbe8cc3..ec5ea43cd7d 100644
--- a/addons/website_event_sale/security/ir.model.access.csv
+++ b/addons/website_event_sale/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event_event_ticket_public,event.event.ticket.public,event_sale.model_event_event_ticket,,1,0,0,0
-access_event_event_ticket_admin,event.event.ticket.admin,event_sale.model_event_event_ticket,event.group_event_manager,1,1,1,1
 access_event_product_product_public,event.product.product.public,product.model_product_product,base.group_public,1,0,0,0
 access_event_product_template_public,event.product.template.public,product.model_product_template,base.group_public,1,0,0,0
\ No newline at end of file

From 02018563b3e9b805eaee5d1d9672e6cc5eb240c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 28 May 2014 09:59:31 +0200
Subject: [PATCH 06/20] [FIX] website_mail: fixed is_follower controller, that
 could leak data about records. Added instead a controller to get alias data.
 This controller is called by the discussion group snippet to have the info
 about the alias.

---
 addons/website_mail/controllers/main.py       | 21 +++++++++++--
 .../static/src/js/website_mail.js             | 30 ++++++++++++-------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 49caf20f7ff..8cdb73030a8 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -83,6 +83,7 @@ class WebsiteMail(http.Controller):
             'is_user': uid != public_id,
             'email': email,
             'is_follower': False,
+            'alias_name': False,
         }
 
         if not obj:
@@ -97,8 +98,22 @@ class WebsiteMail(http.Controller):
                             ('res_id', '=', obj_ids[0]),
                             ('partner_id', '=', partner_id.id)
                         ], context=context)) == 1
-            if post.get('fields'):
-                record = obj.read(cr, SUPERUSER_ID, obj_ids[0], fields=post.get('fields'), context=context)
-                values.update(record)
+
+        return values
+
+    @http.route(['/website_mail/get_alias_info'], type='json', auth='public', website=True)
+    def get_alias_info(self, model, id, **post):
+        id = int(id)
+        cr, uid, context = request.cr, request.uid, request.context
+        obj = request.registry.get(model)
+
+        values = {'alias_name': False}
+
+        if not obj:
+            return values
+        obj_ids = obj.exists(cr, SUPERUSER_ID, [id], context=context)
+        if obj_ids and 'alias_id' in obj._all_columns:
+            alias_id = obj.browse(cr, SUPERUSER_ID, obj_ids[0], context=context).alias_id
+            values['alias_name'] = alias_id and alias_id.alias_domain and '%s@%s' % (alias_id.alias_name, alias_id.alias_domain) or False
 
         return values
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index d069f88ea45..2a79bccccc5 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -12,15 +12,12 @@
             openerp.jsonRpc('/website_mail/is_follower', 'call', {
                 model: this.$target.data('object'),
                 id: this.$target.data('id'),
-                fields: ['name', 'alias_id'],
+                get_alias_info: true,
             }).always(function (data) {
                 self.is_user = data.is_user;
-                self.$target.find('.js_mg_email').attr('href', 'mailto:' + data.alias_id[1]);
-                self.$target.find('.js_mg_link').attr('href', '/groups/' + data.id);
-                self.toggle_subscription(data.is_follower);
-                self.$target.find('input.js_follow_email')
-                    .val(data.email ? data.email : "")
-                    .attr("disabled", data.is_follower || (data.email.length && self.is_user) ? "disabled" : false);
+                self.email = data.email;
+                self.$target.find('.js_mg_link').attr('href', '/groups/' + self.$target.data('id'));
+                self.toggle_subscription(data.is_follower, data.email);
                 self.$target.removeClass("hidden");
             });
 
@@ -51,10 +48,11 @@
                 'message_is_follower': this.$target.attr("data-follow") || "off",
                 'email': $email.length ? $email.val() : false,
             }).then(function (follow) {
-                self.toggle_subscription(follow);
+                self.toggle_subscription(follow, self.email);
             });
         },
-        toggle_subscription: function(follow) {
+        toggle_subscription: function(follow, email) {
+            var alias_done = this.get_alias_info();
             if (follow) {
                 this.$target.find(".js_mg_follow_form").addClass("hidden");
                 this.$target.find(".js_mg_details").removeClass("hidden");
@@ -63,9 +61,21 @@
                 this.$target.find(".js_mg_follow_form").removeClass("hidden");
                 this.$target.find(".js_mg_details").addClass("hidden");
             }
-            this.$target.find('input.js_follow_email').attr("disabled", follow || this.is_user ? "disabled" : false);
+            this.$target.find('input.js_follow_email')
+                .val(email ? email : "")
+                .attr("disabled", follow || (email.length && this.is_user) ? "disabled" : false);
             this.$target.attr("data-follow", follow ? 'on' : 'off');
+            return $.when(alias_done);
         },
+        get_alias_info: function() {
+            var self = this;
+            return openerp.jsonRpc('/website_mail/get_alias_info', 'call', {
+                model: this.$target.data('object'),
+                id: this.$target.data('id'),
+            }).then(function (data) {
+                self.$target.find('.js_mg_email').attr('href', 'mailto:' + data.alias_name);
+            });
+        }
     });
 
     $(document).ready(function () {

From 5f94504c0872f734a9c106c7dc63b4e06499cc07 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Wed, 28 May 2014 10:06:42 +0200
Subject: [PATCH 07/20] [TYPO] in crm_partner_assign

---
 addons/crm_partner_assign/crm_partner_assign.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 046babccf73..31a042d8685 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -65,7 +65,7 @@ class res_partner(osv.osv):
         'date_review_next' : fields.date('Next Partner Review'),
         # customer implementation
         'assigned_partner_id': fields.many2one(
-            'res.partner', 'Implementedy by',
+            'res.partner', 'Implemented by',
         ),
         'implemented_partner_ids': fields.one2many(
             'res.partner', 'assigned_partner_id',

From 57e1cc4edd298cc6af94decabc72f98136be4d69 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Wed, 28 May 2014 10:35:58 +0200
Subject: [PATCH 08/20] [ADD] website_crm_partner_assign: display demo data on
 website

---
 .../website_crm_partner_assign/__openerp__.py   |  3 +++
 .../data/res_partner_grade_demo.xml             | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 addons/website_crm_partner_assign/data/res_partner_grade_demo.xml

diff --git a/addons/website_crm_partner_assign/__openerp__.py b/addons/website_crm_partner_assign/__openerp__.py
index 06b6dc9410e..649537ffb2e 100644
--- a/addons/website_crm_partner_assign/__openerp__.py
+++ b/addons/website_crm_partner_assign/__openerp__.py
@@ -13,6 +13,9 @@ Publish and Assign Partner
         'views/partner_grade.xml',
         'views/website_crm_partner_assign.xml',
     ],
+    'demo': [
+        'data/res_partner_grade_demo.xml',
+    ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
 }
diff --git a/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml b/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
new file mode 100644
index 00000000000..19c48c2d93d
--- /dev/null
+++ b/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="crm_partner_assign.res_partner_grade_platinium" model="res.partner.grade">
+            <field name="website_published" eval="True" />
+        </record>
+        <record id="crm_partner_assign.res_partner_grade_gold" model="res.partner.grade">
+            <field name="website_published" eval="True" />
+        </record>
+        <record id="crm_partner_assign.res_partner_grade_silver" model="res.partner.grade">
+            <field name="website_published" eval="True" />
+        </record>
+        <record id="crm_partner_assign.res_partner_grade_bronze" model="res.partner.grade">
+            <field name="website_published" eval="True" />
+        </record>
+    </data>
+</openerp>

From 0c89ca0f8f2d96e37353348fe33591da8142368b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 28 May 2014 11:12:33 +0200
Subject: [PATCH 09/20] [FIX] website_mail, websit_mail_group: moved discussion
 group snippet to the right module; it should not be available when the
 mailing list archives module is not installed. Also fixed get_alias_info
 route to be mail_group specific and to avoid allowing people to browse the
 database.

---
 addons/website_mail/controllers/main.py       | 17 ------
 addons/website_mail/views/snippets.xml        | 48 -----------------
 addons/website_mail/views/website_mail.xml    |  2 -
 addons/website_mail_group/__openerp__.py      |  3 +-
 addons/website_mail_group/controllers/main.py |  6 +++
 .../src/js/website_mail_group.editor.js}      |  0
 .../src/js/website_mail_group.snippet.js}     | 17 ++++--
 addons/website_mail_group/views/snippets.xml  | 53 +++++++++++++++++++
 .../views/website_mail_group.xml              | 17 ++++--
 9 files changed, 86 insertions(+), 77 deletions(-)
 rename addons/{website_mail/static/src/js/website_mail.editor.js => website_mail_group/static/src/js/website_mail_group.editor.js} (100%)
 rename addons/{website_mail/static/src/js/website_mail.js => website_mail_group/static/src/js/website_mail_group.snippet.js} (84%)
 create mode 100644 addons/website_mail_group/views/snippets.xml

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 8cdb73030a8..081ba93b8b4 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -100,20 +100,3 @@ class WebsiteMail(http.Controller):
                         ], context=context)) == 1
 
         return values
-
-    @http.route(['/website_mail/get_alias_info'], type='json', auth='public', website=True)
-    def get_alias_info(self, model, id, **post):
-        id = int(id)
-        cr, uid, context = request.cr, request.uid, request.context
-        obj = request.registry.get(model)
-
-        values = {'alias_name': False}
-
-        if not obj:
-            return values
-        obj_ids = obj.exists(cr, SUPERUSER_ID, [id], context=context)
-        if obj_ids and 'alias_id' in obj._all_columns:
-            alias_id = obj.browse(cr, SUPERUSER_ID, obj_ids[0], context=context).alias_id
-            values['alias_name'] = alias_id and alias_id.alias_domain and '%s@%s' % (alias_id.alias_name, alias_id.alias_domain) or False
-
-        return values
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 8a737b98927..ebbcf6d4a70 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -493,53 +493,5 @@
 
 </template>
 
-
-<template id="subscribe" inherit_id="website.snippets" name="Snippet Subscribe">
-
-    <xpath expr="//div[@id='snippet_content']" position="inside">
-        <div>
-            <div class="oe_snippet_thumbnail">
-                <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/button_group_subscribe.png"/>
-                <span class="oe_snippet_thumbnail_title">Discussion Group</span>
-            </div>
-
-            <div class="oe_snippet_body js_follow"
-                      data-id="0"
-                      data-object="mail.group"
-                      data-follow="off">
-                <div class="input-group js_mg_follow_form">
-                    <input
-                          type="email"
-                          name="email"
-                          class="js_follow_email form-control"
-                          placeholder="your email..."/>
-                    <span class="input-group-btn">
-                        <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
-                    </span>
-                </div>
-                <p class="js_mg_details hidden well well-sm">
-                    <i class="fa fa-envelope-o"/><a href="#" class="js_mg_email"> send mail</a> -
-                    <i class="fa fa-file-o"/><a href="#" class="js_mg_link"> archives</a> -
-                    <i class="fa fa-times"/><a href="#" class="js_unfollow_btn"> unsubscribe</a>
-                </p>
-            </div>
-
-        </div>
-    </xpath>
-
-
-    <xpath expr="//div[@id='snippet_options']" position="inside">
-        <div data-snippet-option-id='subscribe'
-            data-selector=".js_follow"
-            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-           >
-            <li>
-                <a href="#" class="button js_mailing_list">Change Discussion List</a>
-            </li>
-        </div>
-    </xpath>
-
-</template>
-
 </data>
 </openerp>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 2882125de67..6202e00342b 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -21,8 +21,6 @@
 
 <template id="head" inherit_id="website.layout" name="Mail customization">
     <xpath expr="//head" position="inside">
-        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
-        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index f83fc38ce7c..768e7f27156 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -11,7 +11,8 @@ OpenERP Mail Group : Mailing List Archives
     'author': 'OpenERP SA',
     'depends': ['website_mail'],
     'data': [
-        'views/website_mail_group.xml'
+        'views/website_mail_group.xml',
+        'views/snippets.xml',
     ],
     'qweb': [],
     'installable': True,
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 7320ebc6548..a28b808d9f2 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -129,3 +129,9 @@ class MailGroup(http.Controller):
             'replies_per_page': self._replies_per_page,
         }
         return request.registry['ir.ui.view'].render(request.cr, request.uid, 'website_mail_group.messages_short', values, engine='ir.qweb', context=request.context)
+
+    @http.route("/groups/<model('mail.group'):group>/get_alias_info", type='json', auth='public', website=True)
+    def get_alias_info(self, group, **post):
+        return {
+            'alias_name': group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain and '%s@%s' % (group.alias_id.alias_name, group.alias_id.alias_domain) or False
+        }
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail_group/static/src/js/website_mail_group.editor.js
similarity index 100%
rename from addons/website_mail/static/src/js/website_mail.editor.js
rename to addons/website_mail_group/static/src/js/website_mail_group.editor.js
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
similarity index 84%
rename from addons/website_mail/static/src/js/website_mail.js
rename to addons/website_mail_group/static/src/js/website_mail_group.snippet.js
index 2a79bccccc5..fc0e2bb864f 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
@@ -33,6 +33,7 @@
             return;
         },
         on_click: function () {
+            event.preventDefault();
             var self = this;
             var $email = this.$target.find(".js_follow_email");
 
@@ -69,11 +70,17 @@
         },
         get_alias_info: function() {
             var self = this;
-            return openerp.jsonRpc('/website_mail/get_alias_info', 'call', {
-                model: this.$target.data('object'),
-                id: this.$target.data('id'),
-            }).then(function (data) {
-                self.$target.find('.js_mg_email').attr('href', 'mailto:' + data.alias_name);
+            if (! this.$target.data('id')) {
+                return $.Deferred().resolve();
+            }
+            return openerp.jsonRpc('/groups/' + this.$target.data('id') + '/get_alias_info', 'call', {}).then(function (data) {
+                if (data.alias_name) {
+                    self.$target.find('.js_mg_email').attr('href', 'mailto:' + data.alias_name);
+                    self.$target.find('.js_mg_email').removeClass('hidden');
+                }
+                else {
+                    self.$target.find('.js_mg_email').addClass('hidden');
+                }
             });
         }
     });
diff --git a/addons/website_mail_group/views/snippets.xml b/addons/website_mail_group/views/snippets.xml
new file mode 100644
index 00000000000..56ba81d81b3
--- /dev/null
+++ b/addons/website_mail_group/views/snippets.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<template id="subscribe" inherit_id="website.snippets" name="Snippet Subscribe">
+
+    <xpath expr="//div[@id='snippet_content']" position="inside">
+        <div>
+            <div class="oe_snippet_thumbnail">
+                <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/button_group_subscribe.png"/>
+                <span class="oe_snippet_thumbnail_title">Discussion Group</span>
+            </div>
+
+            <div class="oe_snippet_body js_follow"
+                      data-id="0"
+                      data-object="mail.group"
+                      data-follow="off">
+                <div class="input-group js_mg_follow_form">
+                    <input
+                          type="email"
+                          name="email"
+                          class="js_follow_email form-control"
+                          placeholder="your email..."/>
+                    <span class="input-group-btn">
+                        <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
+                    </span>
+                </div>
+                <p class="js_mg_details hidden well well-sm">
+                    <span class="js_mg_email hidden"><i class="fa fa-envelope-o"/><a href="#" class="js_mg_email"> send mail</a> - </span>
+                    <i class="fa fa-file-o"/><a href="#" class="js_mg_link"> archives</a> -
+                    <i class="fa fa-times"/><a href="#" class="js_unfollow_btn"> unsubscribe</a>
+                </p>
+            </div>
+
+        </div>
+    </xpath>
+
+
+    <xpath expr="//div[@id='snippet_options']" position="inside">
+        <div data-snippet-option-id='subscribe'
+            data-selector=".js_follow"
+            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+           >
+            <li>
+                <a href="#" class="button js_mailing_list">Change Discussion List</a>
+            </li>
+        </div>
+    </xpath>
+
+</template>
+
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 76edd524753..1c0ee08edd4 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -8,6 +8,13 @@
     </xpath>
 </template>
 
+<template id="head" inherit_id="website.layout" name="Mail Group Customization">
+    <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js" groups="base.group_website_publisher"></script>
+        <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.snippet.js"></script>
+    </xpath>
+</template>
+
 <template id="mail_groups" name="Mailing Lists">
     <t t-call="website.layout">
         <div id="wrap" class="oe_structure oe_empty">
@@ -23,8 +30,10 @@
                 <div class="col-md-3">
                     <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                     <strong><a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/></strong><br />
-                    <i class='fa fa-envelope-o'/>
-                    <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
+                    <t t-if="group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain">
+                        <i class='fa fa-envelope-o'/>
+                        <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
+                    </t>
                 </div>
                 <div class="col-md-4">
                     <div t-esc="group.description" class="text-muted"/>
@@ -59,7 +68,7 @@
             <div class="row">
                 <h1 class="text-center">
                     <t t-esc="group.name"/> mailing list archives
-                </h1><h4 class="text-center text-muted">
+                </h1><h4 class="text-center text-muted" t-if="group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain">
                     <i class='fa fa-envelope-o'/>
                     <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
                 </h4>
@@ -123,7 +132,7 @@
             <div class="row">
                 <h1 class="text-center">
                     <t t-esc="group.name"/> mailing list archives
-                </h1><h4 class="text-center text-muted">
+                </h1><h4 class="text-center text-muted" t-if="group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain">
                     <i class='fa fa-envelope-o'/>
                     <a t-attf-href="mailto:#{group.alias_id.alias_name}@#{group.alias_id.alias_domain}"><span t-field="group.alias_id"/></a>
                 </h4>

From 00dc3a59dfd89af848f959fabf01157c80c9bfe2 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 28 May 2014 12:04:41 +0200
Subject: [PATCH 10/20] [FIX] website_sale: force changing pricelist on
 different account signin

opw-607517
---
 addons/website_sale/models/website.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 6d07c59970e..b471935f2f0 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -22,7 +22,7 @@ class Website(orm.Model):
     # ***********************************************************
 
     def ecommerce_get_pricelist_id(self, cr, uid, ids, context=None):
-        if not request.httprequest.session.get('ecommerce_pricelist'):
+        if not request.httprequest.session.get('ecommerce_pricelist') or request.httprequest.session.get('ecommerce_pricelist_uid') != uid:
             self._ecommerce_change_pricelist(cr, uid, None, context=context)
         return request.httprequest.session.get('ecommerce_pricelist')
 
@@ -41,6 +41,7 @@ class Website(orm.Model):
             pricelist_id = self.pool.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value']['pricelist_id']
 
         request.httprequest.session['ecommerce_pricelist'] = pricelist_id
+        request.httprequest.session['ecommerce_pricelist_uid'] = uid
 
         order = self.ecommerce_get_current_order(cr, uid, context=context)
         if order:

From df0ae7e4d155a180f5e49e85f18ce52bf503c22c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 28 May 2014 14:02:56 +0200
Subject: [PATCH 11/20] [FIX] payment_paypal: wrong handling fees computation
 formula

---
 addons/payment_paypal/models/paypal.py     | 7 +++++--
 addons/payment_paypal/tests/test_paypal.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py
index a5e31e9571c..ffa5de1bf7a 100644
--- a/addons/payment_paypal/models/paypal.py
+++ b/addons/payment_paypal/models/paypal.py
@@ -90,9 +90,12 @@ class AcquirerPaypal(osv.Model):
             return 0.0
         country = self.pool['res.country'].browse(cr, uid, country_id, context=context)
         if country and acquirer.company_id.country_id.id == country.id:
-            fees = amount * (1 + acquirer.fees_dom_var / 100.0) + acquirer.fees_dom_fixed - amount
+            percentage = acquirer.fees_dom_var
+            fixed = acquirer.fees_dom_fixed
         else:
-            fees = amount * (1 + acquirer.fees_int_var / 100.0) + acquirer.fees_int_fixed - amount
+            percentage = acquirer.fees_int_var
+            fixed = acquirer.fees_int_fixed
+        fees = (percentage / 100.0 * amount + fixed ) / (1 - percentage / 100.0)
         return fees
 
     def paypal_form_generate_values(self, cr, uid, id, partner_values, tx_values, context=None):
diff --git a/addons/payment_paypal/tests/test_paypal.py b/addons/payment_paypal/tests/test_paypal.py
index 01f40ddd094..5638c5cd602 100644
--- a/addons/payment_paypal/tests/test_paypal.py
+++ b/addons/payment_paypal/tests/test_paypal.py
@@ -148,7 +148,7 @@ class PaypalForm(PaypalCommon):
         for form_input in tree.input:
             if form_input.get('name') in ['handling']:
                 handling_found = True
-                self.assertEqual(form_input.get('value'), '1.56', 'paypal: wrong computed fees')
+                self.assertEqual(form_input.get('value'), '1.57', 'paypal: wrong computed fees')
         self.assertTrue(handling_found, 'paypal: fees_active did not add handling input in rendered form')
 
     @mute_logger('openerp.addons.payment_paypal.models.paypal', 'ValidationError')

From 6ed774de614a2977a8d186a14ef2cd45a76e7a2e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 28 May 2014 15:50:02 +0200
Subject: [PATCH 12/20] [FIX] web: on new ir actions act_window target current,
 change the active* params from context for the dataset only

This fix is related to a37bad205b13cec4f19f8e84e28801278e3e36ca
This previous fix did solved the issue of its purpose, but had a side effect for actions using these active* params, e.g. search views
For instance, Go to Project > Projects, click on any project, you are than redirected to tasks/issues of this project
If you reload the page, an error pops up, complaining that active_id cannot be found
---
 addons/web/static/src/js/views.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 228a0b3e8f2..196e8a18f38 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -436,16 +436,6 @@ instance.web.ActionManager = instance.web.Widget.extend({
     ir_actions_act_window: function (action, options) {
         var self = this;
 
-        if (action.target === 'current'){
-            action.context['active_model'] = action.res_model;
-            if (action.res_id){
-                action.context['active_id'] = action.res_id;
-                action.context['active_ids'] = [action.res_id];
-            } else{
-                delete action.context['active_id'];
-                delete action.context['active_ids'];
-            }
-        }
         return this.ir_actions_common({
             widget: function () { return new instance.web.ViewManagerAction(self, action); },
             action: action,
@@ -892,7 +882,20 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
         this._super(parent, null, action.views, flags);
         this.session = parent.session;
         this.action = action;
-        var dataset = new instance.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+        var context = action.context;
+        if (action.target === 'current'){
+            var active_context = {
+                active_model: action.res_model,
+            };
+            context = new instance.web.CompoundContext(context, active_context).eval();
+            delete context['active_id'];
+            delete context['active_ids'];
+            if (action.res_id){
+                context['active_id'] = action.res_id;
+                context['active_ids'] = [action.res_id];
+            }
+        }
+        var dataset = new instance.web.DataSetSearch(this, action.res_model, context, action.domain);
         if (action.res_id) {
             dataset.ids.push(action.res_id);
             dataset.index = 0;

From bf135ad05798abaff0acc87fc19092cde5fd5c36 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Wed, 28 May 2014 17:23:28 +0200
Subject: [PATCH 13/20] [FIX] website_blog: display properly (very) long words
 in comments

---
 addons/website_blog/static/src/css/website_blog.css           | 4 ++++
 addons/website_blog/static/src/css/website_blog.sass          | 3 +++
 .../static/src/xml/website_blog.inline.discussion.xml         | 2 +-
 addons/website_blog/views/website_blog_templates.xml          | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css
index 9097e3af31f..9317ba32321 100644
--- a/addons/website_blog/static/src/css/website_blog.css
+++ b/addons/website_blog/static/src/css/website_blog.css
@@ -150,3 +150,7 @@ div#blog_angle_down a:hover {
 mark + .popover {
   cursor: pointer;
 }
+
+.discussion_scroll_post {
+  overflow-x: auto;
+}
diff --git a/addons/website_blog/static/src/css/website_blog.sass b/addons/website_blog/static/src/css/website_blog.sass
index 6342c6b99a2..f1fd0e59a5a 100644
--- a/addons/website_blog/static/src/css/website_blog.sass
+++ b/addons/website_blog/static/src/css/website_blog.sass
@@ -134,3 +134,6 @@ div#blog_angle_down
 
 mark + .popover
     cursor: pointer
+
+.discussion_scroll_post
+    overflow-x: auto
diff --git a/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml b/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml
index 8c1cda26265..1acf085f147 100644
--- a/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml
+++ b/addons/website_blog/static/src/xml/website_blog.inline.discussion.xml
@@ -9,7 +9,7 @@
                 <button class="btn btn-danger btn-xs js_publish_btn">Not Published</button>
                 <button class="btn btn-success btn-xs js_publish_btn">Published</button>
             </div>
-            <div class="media-body">
+            <div class="media-body discussion_scroll_post">
                 <div t-esc='res.body'/>
                 <small class="text-muted">
                     by
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 20d042830e7..d2868c50380 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -236,7 +236,7 @@
                             "fields": ["name"]
                         }'/>
                     <span class="text-muted">on <span t-field="message.date"/></span>
-                    <div t-field="message.body"/>
+                    <div t-field="message.body" class="discussion_scroll_post"/>
                 </div>
             </li>
         </ul>

From c9e12161c90783410f9a3307c7706b144654bdd5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 28 May 2014 23:13:38 +0200
Subject: [PATCH 14/20] [FIX] website_mail.editor.js moved but still referenced

Commit 0c89ca0f8f2d96e37353348fe33591da8142368b moves
website_mail.editor.js but is still referenced in website_mail.xml
---
 addons/website_mail/views/website_mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 367bf352d64..9cf5f998c83 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -26,7 +26,7 @@
 </template>
 <template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
     <xpath expr="/t" position="inside">
-        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js"></script>
+        <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js"></script>
     </xpath>
 </template>
 

From 248107d11aa695cc4945fa2decb792562e0de7e2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 29 May 2014 01:59:47 +0200
Subject: [PATCH 15/20] [FIX] website_mail*: fix + bundlify changes of 0c89ca:
 move subscription widget from website_mail to website_mail_group

---
 addons/website_mail/views/website_mail.xml            |  5 -----
 .../website_mail_group/views/website_mail_group.xml   | 11 ++++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 9cf5f998c83..2b2bbea7e5f 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -24,11 +24,6 @@
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
-<template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
-    <xpath expr="/t" position="inside">
-        <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js"></script>
-    </xpath>
-</template>
 
 </data>
 </openerp>
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 1c0ee08edd4..d52c34513b8 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -8,13 +8,18 @@
     </xpath>
 </template>
 
-<template id="head" inherit_id="website.layout" name="Mail Group Customization">
-    <xpath expr="//head" position="inside">
-        <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js" groups="base.group_website_publisher"></script>
+<template id="head" inherit_id="website.assets_frontend" name="Mail Group Snippet">
+    <xpath expr="/t" position="inside">
         <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.snippet.js"></script>
     </xpath>
 </template>
 
+<template id="editor" inherit_id="website.assets_editor" name="Mail Group Editor">
+    <xpath expr="/t" position="inside">
+        <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.editor.js" groups="base.group_website_publisher"></script>
+    </xpath>
+</template>
+
 <template id="mail_groups" name="Mailing Lists">
     <t t-call="website.layout">
         <div id="wrap" class="oe_structure oe_empty">

From 045ecc603e67911a5390c812cb6b5b123d9c190e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 29 May 2014 02:07:18 +0200
Subject: [PATCH 16/20] [FIX] website_mail_group: restore missing snippet icon

The file was originally added in website_mail at 59b934
in saas-4 but was lost in master since.
---
 .../src/img/blocks/button_group_subscribe.png    | Bin 0 -> 2726 bytes
 addons/website_mail_group/views/snippets.xml     |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 addons/website_mail_group/static/src/img/blocks/button_group_subscribe.png

diff --git a/addons/website_mail_group/static/src/img/blocks/button_group_subscribe.png b/addons/website_mail_group/static/src/img/blocks/button_group_subscribe.png
new file mode 100644
index 0000000000000000000000000000000000000000..204239a8e0c50a79c13c4accc0f12e769dd2a31a
GIT binary patch
literal 2726
zcmV;X3R(4uP)<h;3K|Lk000e1NJLTq003kF002-31^@s6?+MWF00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-vm2M9C-1A_)&000U_Nkl<Zc-rk<NoW+$7yhccdnTQX
zzhp*<QBhoQxwr)v6cv@Yg{X)p^&p7x648U8pm<PFaS1AT(2Ig7ilT@cDA9|GLR=73
z6x@}GBrar(onETC|A#+SzZu6QlT1wV%hZErpkaEd>#O(P_uh1UO@bf@(8=}}F4^OZ
z5F+oB5YlPa)jJaaLI^nLojSmt49MRwy`vNV``|p!gJoH;EDMaWUJr`z`yhlMFE0<K
zX(AGdbUh%9F;GfD2mz%O_4W0*a^(tc-n@y|uV16Sz8=2s%fa?m3xWWI5cs~2P$-0=
zq9PO&6kyJrIha3xK4#CJ4bC|zrE+m<ng-wZp=ny{o|kD334#DY5P)+I#u&D3+lH%G
zucA+%J|Kk1A9Y<9x~?M^Oe{Rdagd*%56(F(%R(#`!>(PsFmvWi2?Ap*qj_l;AcPP+
zc<=yg)~rD!5&<CuwrxY#b(udXr8$$-MPe79lv3!r4$e8gefx%riV7S&co2*+ghC;3
z&a?Lr&+}xMI)3~(4jedu!oor@#^l9?_XrO%45L?r5d;A=O_K}H_x-dSE5cPQ7Q^}T
z=TTT#C_&5$5P|BA8#ho@RfSkAmgWJ;D@E6J*tVS$NnPZHWTNx?r2D>)VZ(;u{Q2`4
z%}JYp1VMm!JdU!mGDM?MIF2J%K=M~9rQn>Sxw%;mvNwB(VHof{54x@+6biKnh^A?9
z90#*z&BEcshdU>SEMLAHA3l5l=Nx%?d9ZC8hGEFKX;~IVjvR^7(o&2bJsQzyG$-<i
z@B8@p@grWmc!5Wc9-*<Z5xTCYc#imFjN#a^W0*R1Dk!BL2jubN$5^vwjZEChtAulo
zSS*Iqr%$7#q(rigTqq3xWYyKxIC=6UD5cOe4VtFG^E_yp2F^J~j~<OPXU?>G4cgX^
zoIQIMx~`|Kc*8JITwIJ>w{D@hxcINM5&lb_!WhG*O`EW1&mLKeiLQl+BrjjS#HUZ6
zvIC^HwpOx=WcvH##}8b;ejUE=OE7YU@}^B<65TB?FUPWF%Mb)XS|MoLHtyWHlN})O
zcs!+%<~R-*V_3a<b;^$=C$(HPF&|sDY=L1Ik{XLJ9*stE`}XbZ011b~@}dAxP*4EN
zvg9fdHHxx-!<T8A7&2r?TC{Lo7xne^*#VNDpDz=55Crf%4?z&1q@*OpbCjjpz<~qP
z=)VZ{Sv40$J0!V64Tr<B8qZ}`)lxnIfWCeE{&8Mx+s@8IexGzT`I+~+Iubponz|n5
zVQLB#Aj%XV3J_%q5Cw=b1&9JfnF2%sqD%pzOaY<*QKkS<fGAUdC_t1cKolU#6d=kJ
zAPNv=3J?W|G6jeNM419a0n&nr9a3U@mSGs`f$K~rmeRD%onk|1R)B~NIl8XH_kGy5
zow9*PS<4IAb={P6j^m`AYd0Xtn{~uKI!bA;-;3T+6I&3Hl`e#d{ry=1A~wY*Z|t;f
z8;mhE`+qP(2pD5XBob+2Gn7*N^Upuo0n*smnBs;4;a9I-$t`Zmkd`anzI~f^Ueh!b
z6%}O%i0657d#~^k(=>76!UdV+mACwBj4?DcG~oUF_i1_7bzKY^G$=bj#*7)0mNO`&
zxOVLt9zJ}SvWH#S|Gi_=rcF`{CE0A-#-c@wvIAt=v}sbJNrWp(DI$>wHf-2{y1F`e
zo+pLP1WnH55Z;%Z3|m@tf>^ZY`hWA_oXc^0o+l@N_wL<z_UsunO_R)2+#{tFQ>IMG
z4v>{AS4y#f-)SA^9E%n$LQPFg$^gVB(YB7{oRmqT6f7mv>;KI|sKhyrBfX)bq5>B$
zUQ7w^Li2=kjs*)ApkKd!t>0@VYC!APua^=V$)a7lu7fcK+qPkvCZf?O#*Q6}yu7@O
z+`GKI95ZIjfaiIwik?}Pg&#kD;KGFq`26{Ew@V0$1>$)g;_)~d8X6Ff$5BvFkS3=g
z@<?N2BW~Qdfx&|Zw;JLz0>rW`%$++Ilv1e?m7MH_>xzN4hqDhIIuw^KU6SWSog=QL
z>pJ%B+lOPvjv*S2%23f0=&cAt$@e3?K?uM3zK@?je`3p)EvT%lY%?mf35bY)@7}$`
z;>C**3WcQnP-j%Lgb*xPumHPu?SkvN2!%ot7){gg<jE5(Teb}S`}a?g8|=x2;qM|m
zvuDr7{{8zi13D9lKe76sK7EQ+t5zW#4yWm7b;OcIAw@_`zA4T*=FOXjpFe*}&*|xk
zLz<?csi_Htg@yS3{X5Fa%1~Wh4Z|=pl8Mc@m!)YM#*G_?`}gmoZ{NNtlhP4jgxiYV
z*u8uAKnQ{Bx)Kb_vQSr7C*@~N(@bG4J<(GbV<;#nKs+AD)~#D{@Zdp705Tab%_LR|
zRCQfPBoaYQO$~PJ*a6@7(bUwG23$*2Q4j&4f=viPC=`P4`>3w2maQ5A_Mt<E5Q#*<
zIfrSQux%TC`t*Te7zl+zQV6Fzjz5Je*LBg{+>G(#$D_8k7Asb)kR4vbFfwD5?a}QO
zY)FI;&N<$^d4tQBFQc}$7LOl4#@n}VTh#d=gkaF1K^QV*2%4IjQrMDh+j#!`x%?eM
z2ue#!C36wi^E?lXF?{&&0hVQTTa#1h@D>#nVfgUjm^^thmM&e22@@uuxVSiloV1H9
zwCC*zf9mv#+91=K;^fJb*uQ^&TGKKJ0*o6s4ku2W0OuU{@88GTwQCU$hY=2k<@Zg~
zL`g{r&Ye5gBNI9y1eRsNG)*wZ+O1(s+Z*=<0D@^HSMQl%yKvz`Boc`f+DIvdVHkMz
z>Xl?)M~)nk0{0@+{rdF_jg5`iyLYb)SKZxa{}UC?&(8;d4hc%P3y_wyX){gkK@gz0
zxEN(+WoaHI{`|Ui>lQfYsI9GqVHgO9!_osy(?k#i7&dHJx6|J?6{<Tpwl4oqoiT>0
zswzpRf9LN<j~>OLLx(V6zyLHiH^Z{56eYXu+qc7U95{~CE7j~s(8YHp=->3|)8Tm@
z^78WFx~^1<b{t2BsN_$<;qTtPn{jLAzi3_RA)>XQX&N?f-V9yW;kvFY5IN^kx?4!E
z3c76=1_lls*sH<l77r0#l1L;lY0@MV6%|Q>&=Q3e`Q_rpix@R(RIh%(qRTx*gsfOB
zhWYd7!!QgPmRd`Y`T6<19*iyrL_AI;D*tus*1>TcG&eW5`Q6IO$`-3+6|y?XeBZ~2
z5hKvAU%ytL^-3fXvPS9c*6ojy?%cUkw%l6^bJM0x17j>FM4P)65Y9O&Dk|{h%NIHM
z!c&spEU<Co#+*^m?p8o_T}Lz;#gZjUQvN3p^jCm1apFW7;uIiVz`RzkUX4T|k#bH{
z<||gL=uneRCG`&0BcdQIFE2+Tk$~&E@O>YJg@yR~^(&q~e=fZv7j)*kJ!A<geCpIG
zG&MEJmyUh=_6^66A5VFvI49n*8}yKDDPHSZQ&R%~C@n2*lMX9D{z4s+{3?v(ckKd@
g525ACt6Tx#e_UDA66~^_NB{r;07*qoM6N<$f{<+e761SM

literal 0
HcmV?d00001

diff --git a/addons/website_mail_group/views/snippets.xml b/addons/website_mail_group/views/snippets.xml
index 56ba81d81b3..452f59f4902 100644
--- a/addons/website_mail_group/views/snippets.xml
+++ b/addons/website_mail_group/views/snippets.xml
@@ -7,7 +7,7 @@
     <xpath expr="//div[@id='snippet_content']" position="inside">
         <div>
             <div class="oe_snippet_thumbnail">
-                <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/button_group_subscribe.png"/>
+                <img class="oe_snippet_thumbnail_img" src="/website_mail_group/static/src/img/blocks/button_group_subscribe.png"/>
                 <span class="oe_snippet_thumbnail_title">Discussion Group</span>
             </div>
 

From d4624fa826a5e9542782f2c53c8ba2c766d093bc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <lesuisse@gmail.com>
Date: Thu, 29 May 2014 18:33:04 +0200
Subject: [PATCH 17/20] [IMP] repository cleanup

- move packaging stuff to setup
- remove historical stuff
- remove oe, odoo-cmd-fme will be merged with the convered commands
- add an odoo.py script to run odo and boostrap it
- simplify README
- prepare to move documentation to the github wiki
---
 contributing.md => CONTRIBUTING.md            |    0
 README.md                                     |   85 +-
 checkout.sh                                   |   95 -
 doc/adding-command.rst                        |   34 -
 doc/commands.rst                              |   40 -
 doc/index.rst                                 |   10 -
 doc/openerp-command.rst                       |   66 -
 history/Changelog                             | 1822 -----------------
 history/Changelog-4.x                         |  951 ---------
 history/Changelog-6.x                         |   10 -
 history/INSTALL                               |   55 -
 history/README.userchange                     |   31 -
 history/change-loglevel.sh                    |   24 -
 history/check_profile_l10n_all.py             |  121 --
 history/clean-model.sql                       |   24 -
 history/gen_graph.sh                          |   32 -
 history/get-srvstats.sh                       |   19 -
 history/list-services.sh                      |   16 -
 history/migrate/3.3.0-3.4.0/README            |   35 -
 history/migrate/3.3.0-3.4.0/post.py           |  146 --
 history/migrate/3.3.0-3.4.0/pre.py            |  112 -
 history/migrate/3.4.0-4.0.0/README            |   29 -
 history/migrate/3.4.0-4.0.0/post-tiny.py      |   87 -
 history/migrate/3.4.0-4.0.0/post.py           |  116 --
 history/migrate/3.4.0-4.0.0/pre-tiny.py       |  145 --
 history/migrate/3.4.0-4.0.0/pre.py            |  127 --
 history/migrate/4.0.0-4.2.0/pre.py            |  247 ---
 history/migrate/4.0.0-4.2.0/tiny/README       |    1 -
 history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py  |  188 --
 history/migrate/4.2.0-4.4.0/pre.py            |  110 -
 history/module_graph.py                       |   87 -
 history/xml2yml.py                            |  347 ----
 install/ssl-cert.cfg                          |   89 -
 odoo.py                                       |  158 ++
 oe                                            |    8 -
 openerpcommand/__init__.py                    |   63 -
 .../addons/bench_sale_mrp/__init__.py         |    3 -
 .../addons/bench_sale_mrp/__openerp__.py      |   15 -
 openerpcommand/addons/bench_sale_mrp/data.yml |   41 -
 openerpcommand/bench_sale_mrp.py              |   68 -
 openerpcommand/benchmarks.py                  |  166 --
 openerpcommand/call.py                        |   44 -
 openerpcommand/client.py                      |  137 --
 openerpcommand/common.py                      |  108 -
 openerpcommand/conf.py                        |   25 -
 openerpcommand/cron.py                        |   46 -
 openerpcommand/drop.py                        |   50 -
 openerpcommand/grunt_tests.py                 |   50 -
 openerpcommand/initialize.py                  |  121 --
 openerpcommand/main.py                        |    7 -
 openerpcommand/model.py                       |   61 -
 openerpcommand/module.py                      |   65 -
 openerpcommand/oe-bash-completion             |   89 -
 openerpcommand/read.py                        |   61 -
 openerpcommand/scaffold.py                    |  131 --
 openerpcommand/templates/__init__.jinja2      |    4 -
 openerpcommand/templates/__openerp__.jinja2   |   24 -
 openerpcommand/templates/controllers.jinja2   |    9 -
 .../templates/ir.model.access.jinja2          |    6 -
 openerpcommand/templates/models.jinja2        |    9 -
 openerpcommand/uninstall.py                   |   63 -
 openerpcommand/update.py                      |   19 -
 openerpcommand/web.py                         |   93 -
 {debian => setup/debian}/changelog            |    0
 {debian => setup/debian}/compat               |    0
 {debian => setup/debian}/control              |    0
 {debian => setup/debian}/copyright            |    0
 {debian => setup/debian}/openerp.init         |    0
 {debian => setup/debian}/openerp.install      |    0
 {debian => setup/debian}/openerp.postinst     |    0
 {debian => setup/debian}/openerp.postrm       |    0
 {debian => setup/debian}/rules                |    0
 {install => setup}/openerp-server.1           |    0
 {install => setup}/openerp-server.conf        |    0
 {install => setup}/openerp-server.init        |    0
 {install => setup}/openerp-server.logrotate   |    0
 {install => setup}/openerp_serverrc.5         |    0
 MANIFEST.in => setup/redhat/MANIFEST.in       |    0
 {history => setup/redhat}/README.urpmi        |    0
 setup.cfg => setup/redhat/setup.cfg           |    0
 setup_rpm.sh => setup/redhat/setup_rpm.sh     |    0
 {history => setup}/run_all_with_tests.sh      |    0
 {install => setup/windows}/openerp-header.bmp |  Bin
 {install => setup/windows}/openerp-header.png |  Bin
 {install => setup/windows}/openerp-icon.ico   |  Bin
 {install => setup/windows}/openerp-icon.png   |  Bin
 {install => setup/windows}/openerp-intro.bmp  |  Bin
 {install => setup/windows}/openerp-slogan.bmp |  Bin
 {install => setup/windows}/openerp.ico        |  Bin
 {install => setup/windows}/openerp.png        |  Bin
 {install => setup/windows}/setup.nsi          |    0
 .../windows}/win32/OpenERPServerService.py    |    0
 {install => setup/windows}/win32/setup.py     |    0
 93 files changed, 188 insertions(+), 6857 deletions(-)
 rename contributing.md => CONTRIBUTING.md (100%)
 delete mode 100755 checkout.sh
 delete mode 100644 doc/adding-command.rst
 delete mode 100644 doc/commands.rst
 delete mode 100644 doc/openerp-command.rst
 delete mode 100644 history/Changelog
 delete mode 100644 history/Changelog-4.x
 delete mode 100644 history/Changelog-6.x
 delete mode 100644 history/INSTALL
 delete mode 100644 history/README.userchange
 delete mode 100755 history/change-loglevel.sh
 delete mode 100644 history/check_profile_l10n_all.py
 delete mode 100644 history/clean-model.sql
 delete mode 100755 history/gen_graph.sh
 delete mode 100755 history/get-srvstats.sh
 delete mode 100755 history/list-services.sh
 delete mode 100644 history/migrate/3.3.0-3.4.0/README
 delete mode 100644 history/migrate/3.3.0-3.4.0/post.py
 delete mode 100644 history/migrate/3.3.0-3.4.0/pre.py
 delete mode 100644 history/migrate/3.4.0-4.0.0/README
 delete mode 100644 history/migrate/3.4.0-4.0.0/post-tiny.py
 delete mode 100644 history/migrate/3.4.0-4.0.0/post.py
 delete mode 100644 history/migrate/3.4.0-4.0.0/pre-tiny.py
 delete mode 100644 history/migrate/3.4.0-4.0.0/pre.py
 delete mode 100644 history/migrate/4.0.0-4.2.0/pre.py
 delete mode 100644 history/migrate/4.0.0-4.2.0/tiny/README
 delete mode 100644 history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
 delete mode 100644 history/migrate/4.2.0-4.4.0/pre.py
 delete mode 100755 history/module_graph.py
 delete mode 100644 history/xml2yml.py
 delete mode 100644 install/ssl-cert.cfg
 create mode 100755 odoo.py
 delete mode 100755 oe
 delete mode 100644 openerpcommand/__init__.py
 delete mode 100644 openerpcommand/addons/bench_sale_mrp/__init__.py
 delete mode 100644 openerpcommand/addons/bench_sale_mrp/__openerp__.py
 delete mode 100644 openerpcommand/addons/bench_sale_mrp/data.yml
 delete mode 100644 openerpcommand/bench_sale_mrp.py
 delete mode 100644 openerpcommand/benchmarks.py
 delete mode 100644 openerpcommand/call.py
 delete mode 100644 openerpcommand/client.py
 delete mode 100644 openerpcommand/common.py
 delete mode 100644 openerpcommand/conf.py
 delete mode 100644 openerpcommand/cron.py
 delete mode 100644 openerpcommand/drop.py
 delete mode 100644 openerpcommand/grunt_tests.py
 delete mode 100644 openerpcommand/initialize.py
 delete mode 100644 openerpcommand/main.py
 delete mode 100644 openerpcommand/model.py
 delete mode 100644 openerpcommand/module.py
 delete mode 100644 openerpcommand/oe-bash-completion
 delete mode 100644 openerpcommand/read.py
 delete mode 100644 openerpcommand/scaffold.py
 delete mode 100644 openerpcommand/templates/__init__.jinja2
 delete mode 100644 openerpcommand/templates/__openerp__.jinja2
 delete mode 100644 openerpcommand/templates/controllers.jinja2
 delete mode 100644 openerpcommand/templates/ir.model.access.jinja2
 delete mode 100644 openerpcommand/templates/models.jinja2
 delete mode 100644 openerpcommand/uninstall.py
 delete mode 100644 openerpcommand/update.py
 delete mode 100644 openerpcommand/web.py
 rename {debian => setup/debian}/changelog (100%)
 rename {debian => setup/debian}/compat (100%)
 rename {debian => setup/debian}/control (100%)
 rename {debian => setup/debian}/copyright (100%)
 rename {debian => setup/debian}/openerp.init (100%)
 rename {debian => setup/debian}/openerp.install (100%)
 rename {debian => setup/debian}/openerp.postinst (100%)
 rename {debian => setup/debian}/openerp.postrm (100%)
 rename {debian => setup/debian}/rules (100%)
 rename {install => setup}/openerp-server.1 (100%)
 rename {install => setup}/openerp-server.conf (100%)
 rename {install => setup}/openerp-server.init (100%)
 rename {install => setup}/openerp-server.logrotate (100%)
 rename {install => setup}/openerp_serverrc.5 (100%)
 rename MANIFEST.in => setup/redhat/MANIFEST.in (100%)
 rename {history => setup/redhat}/README.urpmi (100%)
 rename setup.cfg => setup/redhat/setup.cfg (100%)
 rename setup_rpm.sh => setup/redhat/setup_rpm.sh (100%)
 rename {history => setup}/run_all_with_tests.sh (100%)
 rename {install => setup/windows}/openerp-header.bmp (100%)
 rename {install => setup/windows}/openerp-header.png (100%)
 rename {install => setup/windows}/openerp-icon.ico (100%)
 rename {install => setup/windows}/openerp-icon.png (100%)
 rename {install => setup/windows}/openerp-intro.bmp (100%)
 rename {install => setup/windows}/openerp-slogan.bmp (100%)
 rename {install => setup/windows}/openerp.ico (100%)
 rename {install => setup/windows}/openerp.png (100%)
 rename {install => setup/windows}/setup.nsi (100%)
 rename {install => setup/windows}/win32/OpenERPServerService.py (100%)
 rename {install => setup/windows}/win32/setup.py (100%)

diff --git a/contributing.md b/CONTRIBUTING.md
similarity index 100%
rename from contributing.md
rename to CONTRIBUTING.md
diff --git a/README.md b/README.md
index 7b3896022f0..6838cb9f39a 100644
--- a/README.md
+++ b/README.md
@@ -1,73 +1,48 @@
 About Odoo
 ==========
 
-Odoo is a suite of open source Business apps. More info at http://www.odoo.com
+Odoo is a suite of open source Business apps.  More info at http://www.odoo.com
 
-Installation
-============
+Evaluating Odoo
+---------------
 
-[Setup/migration guide for employees](https://github.com/odoo/odoo/blob/master/doc/git.rst)
+The easiest way to test Odoo is the free trial, NO email registration is
+required, select "skip this step" to skip it.
+
+    https://www.odoo.com/page/start
 
 
-Migration from bazaar
-=====================
+Getting starting with Odoo developement
+---------------------------------------
 
-If you have existing bazaar branches and want to move them to a git repository,
-there are several options:
+If you are a developer type the following command at your terminal:
 
-* download http://nightly.openerp.com/move-branch.zip and run it with
-  `python move-branch.zip -h` (for the help). It should be able to convert
-  simple-enough branches for you (even if they have merge commits &al)
-* Extract the branch contents as patches and use `git apply` or `git am` to
-  rebuild a branch from them
-* Replay the branch by hand
+    wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
+
+Then follow the tutorial here:
+
+    https://doc.openerp.com/trunk/server/howto/howto_website/
+
+If you are an Odoo employee type the following to add the odoo-dev remote
+
+    $ cd odoo; ./odoo.py setup_git_dev
 
 
-System Requirements
--------------------
+Packages, tarballs and installers
+---------------------------------
 
-The dependencies are listed in setup.py
+* Debian packages
 
+    Add this apt repository to your /etc/apt/sources.list file
 
-Debian/Ubuntu
--------------
+        deb http://nightly.openerp.com/8.0/deb/ ./
 
-Add the apt repository
+    Then type:
 
-    deb http://nightly.openerp.com/7.0/deb/ ./
+        $ sudo apt-get update
+        $ sudo apt-get install odoo
 
-in your source.list and type:
-
-    $ sudo apt-get update
-    $ sudo apt-get install openerp
-
-Or download the deb file and type:
-
-    $ sudo dpkg -i <openerp-deb-filename>
-    $ sudo apt-get install -f
-
-RedHat, Fedora, CentOS
-----------------------
-
-Install the required dependencies:
-
-    $ yum install python
-    $ easy_install pip
-    $ pip install .....
-
-Install the openerp rpm
-
-    $ rpm -i openerp-VERSION.rpm
-
-Windows
--------
-
-Check the notes in setup.py
-
-
-Setting up your database
-------------------------
-
-Point your browser to http://localhost:8069/ and click "Manage Databases", the
-default master password is "admin".
+* Source tarballs http://nightly.openerp.com/
+* Windows installer http://nightly.openerp.com/
+* RPM package http://nightly.openerp.com/
 
diff --git a/checkout.sh b/checkout.sh
deleted file mode 100755
index 0955508a178..00000000000
--- a/checkout.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#/bin/sh
-set -e
-
-ODOO=https://github.com/odoo/odoo.git
-DEV=https://github.com/odoo-dev/odoo.git
-
-usage () {
-cat <<EOF
-Usage: $0 [-m] [COPYNAME]
-
-Checks out and sets up the Odoo git repository for "internal" development.
-
-* Checks out the "production" repository (production branches) as the "odoo"
-  remote
-* Checks out the "development" repository (for employee development branches)
-  as the "dev" repository
-
-By default, the working copy is "odoo"
-
-Options:
--h        displays this help text
--m        includes github's merge refs. These are the pull requests to "odoo"
-          which merge cleanly into the main repository, after having applied
-          them to said repository
-EOF
-}
-
-while getopts :hm opt
-do
-    case $opt in
-        h)
-            usage
-            exit 0
-            ;;
-        m)
-            include_merge=yes
-            ;;
-        *)
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-copyname=${1:-"odoo"}
-
-# Collect basic configuration data, ensures correct configuration of that repo
-printf "Enter your full name: "
-read name
-printf "Enter your (work) email: "
-read email
-
-# create & set up repo
-git init $copyname
-cd $copyname
-
-git config user.name "$name"
-git config user.email "$email"
-
-# pre-push script preventing push to odoo repo by default. Git just execs
-# them, so they need a correct shebang and exec bit
-# if things get more extensive, should probably use git init templates
-cat <<EOF > .git/hooks/pre-push
-#!/bin/sh
-remote="\$1"
-url="\$2"
-
-if [ "\$url" != "$ODOO" ]
-then
-    exit 0
-fi
-
-echo "Pushing to the odoo remote ($ODOO) is forbidden, push to the dev remote"
-echo
-echo "See git help push if you really want to push to odoo"
-exit 1
-
-EOF
-chmod +x .git/hooks/pre-push
-
-# add basic repos as remotes
-git remote add odoo $ODOO
-git remote add dev $DEV
-
-if [ $include_merge ]
-then
-    git remote add merge $ODOO
-    git config remote.merge.fetch '+refs/pull/*/merge:refs/remotes/merge/*'
-fi
-
-echo
-git remote update
-
-exit 0
diff --git a/doc/adding-command.rst b/doc/adding-command.rst
deleted file mode 100644
index 5a177b06817..00000000000
--- a/doc/adding-command.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-.. _adding-command:
-
-Adding a new command
-====================
-
-``oe`` uses the argparse_ library to implement commands. Each
-command lives in its own ``openerpcommand/<command>.py`` file.
-
-.. _argparse: http://docs.python.org/2.7/library/argparse.html
-
-To create a new command, probably the most simple way to get started is to
-copy/paste an existing command, say ``openerpcommand/initialize.py`` to
-``openerpcommand/foo.py``. In the newly created file, the important bits
-are the ``run(args)`` and ``add_parser(subparsers)`` functions.
-
-``add_parser``'s responsability is to create a (sub-)parser for the command,
-i.e. describe the different options and flags. The last thing it does is to set
-``run`` as the function to call when the command is invoked.
-
-.. code-block:: python
-
-  > def add_parser(subparsers):
-  >     parser = subparsers.add_parser('<command-name>',
-  >         description='...')
-  >     parser.add_argument(...)
-  >     ...
-  >     parser.set_defaults(run=run)
-
-``run(args)`` actually implements the command. It should be kept as simple as
-possible and delegate most of its work to small functions (probably placed at
-the top of the new file). In other words, its responsability is mainly to
-deal with the presence/absence/pre-processing of ``argparse``'s arguments.
-
-Finally, the module must be added to ``openerpcommand/__init__.py``.
diff --git a/doc/commands.rst b/doc/commands.rst
deleted file mode 100644
index 7a758b1ab2a..00000000000
--- a/doc/commands.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-.. _commands:
-
-Available commands
-==================
-
-This page explain some of the available ``oe`` commands. For an overview about
-``oe``, see :doc:`openerp-command`.
-
-Keep in mind that ``oe --help`` and ``oe <command> --help`` already give a lot
-of information about the commands and their options and flags.
-
-``web``
--------
-
-The ``web`` command is used to create a single OpenERP server process to handle
-regular HTTP requests and XML-RPC requests. It is possible to execute such
-process multiple times, possibly on different machines.
-
-It is possible to chose the ``--threaded`` or ``--gevent`` flags. It is
-recommanded to use ``--threaded`` only when running a single process.
-``--gevent`` is experimental; it is planned to use it for the embedded chat
-feature.
-
-Example invocation::
-
-  > oe web --addons ../../addons/trunk:../../web/trunk/addons --threaded
-
-``cron``
---------
-
-The ``cron`` command is used to create a single OpenERP process to execute
-so-called cron jobs, also called scheduled tasks in the OpenERP interface. As
-for the ``web`` command, multiple cron processes can be run side by side.
-
-It is necessary to specify on the command-line which database need to be
-watched by the cron process with the ``--database`` option.
-
-Example invocation::
-
-  > oe cron --addons ../../addons/trunk:../../web/trunk/addons --database production
diff --git a/doc/index.rst b/doc/index.rst
index a61de5ca0e0..ad42e41a10f 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -30,16 +30,6 @@ OpenERP Server
    form-view-guidelines
    ir_actions
 
-OpenERP Command
-'''''''''''''''
-
-.. toctree::
-   :maxdepth: 1
-
-   openerp-command.rst
-   commands.rst
-   adding-command.rst
-
 OpenERP Server API
 ''''''''''''''''''
 
diff --git a/doc/openerp-command.rst b/doc/openerp-command.rst
deleted file mode 100644
index 6ca7b02b645..00000000000
--- a/doc/openerp-command.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-.. _openerp-command:
-
-The ``oe`` script
-=================
-
-The ``oe`` script provides a set of command-line tools around the OpenERP
-framework. It is meant to replace the older ``openerp-server`` script (which
-is still available).
-
-Using ``oe``
-------------
-
-In contrast to the previous ``openerp-server`` script, ``oe`` defines a few
-commands, each with its own set of flags and options. You can get some
-information for any of them with
-
-::
-
-  > oe <command> --help
-
-For instance::
-
-  > oe run-tests --help
-
-Some ``oe`` options can be provided via environment variables. For instance::
-
-  > export OPENERP_DATABASE=trunk
-  > export OPENERP_HOST=127.0.0.1
-  > export OPENERP_PORT=8069
-
-Depending on your needs, you can group all of the above in one single script;
-for instance here is a, say, ``test-trunk-view-validation.sh`` file::
-
-  COMMAND_REPO=/home/thu/repos/command/trunk/
-  SERVER_REPO=/home/thu/repos/server/trunk
-
-  export PYTHONPATH=$SERVER_REPO:$COMMAND_REPO
-  export PATH=$SERVER_REPO:$COMMAND_REPO:$PATH
-  export OPENERP_DATABASE=trunk
-  export OPENERP_HOST=127.0.0.1
-  export OPENERP_PORT=8069
-
-  # The -d ignored is actually needed by `oe` even though `test_view_validation`
-  # itself does not need it.
-  oe run-tests -d ignored -m openerp.test_view_validation
-
-Available commands
--------------------
-
-See the :doc:`commands` page.
-
-Adding new commands
--------------------
-
-See the :doc:`adding-command` page.
-
-Bash completion
----------------
-
-A preliminary ``oe-bash-completion`` file is provided. After sourcing it,
-
-::
-
-  > . oe-bash-completion
-
-completion (using the TAB character) in Bash should work.
diff --git a/history/Changelog b/history/Changelog
deleted file mode 100644
index 3c63a7ee22d..00000000000
--- a/history/Changelog
+++ /dev/null
@@ -1,1822 +0,0 @@
-2010-05-05: 5.0.10
-==================
-
-Bugfixes (server)
------------------
-
- * Not linked to a bug report:
-   * Server Actions: Cleaner legend help and error message
-   * use of tail text in preprocessor of report engine
-   * added support for missing Persian/Farsi (official language in Iran), with backport of the translations from trunk for base module
- * https://launchpad.net/bugs/534769
- * https://launchpad.net/bugs/452854
-   * res_currency: revert to correct rounding mechanism
- * https://launchpad.net/bugs/540840
-   * Groups if removed, should remove relavent access rights too
- * https://launchpad.net/bugs/558460
-   * Add the pixmaps and win32 directories in the MANIFEST to have
- * https://launchpad.net/bugs/559346
-   * Copy() of ir_model_fields corected
- * https://launchpad.net/bugs/541545
- * https://launchpad.net/bugs/574394
-   * Workflow : print of workflow should not be broken if there is no flow_stop
- * https://launchpad.net/bugs/552386
-   * _store_function dictionary should  get updated when field changes its type from function to any other storable
- * https://launchpad.net/bugs/535559
-   * Illustration tag beahvior corrected
- * https://launchpad.net/bugs/552457
-   * Raise a detailed exception if the record does not exist in the ir_model_data object
- * https://launchpad.net/bugs/513278
-   * res_currency: revert to correct rounding mechanism
- * https://launchpad.net/bugs/564926
-   * _constraints : Multiple constraints on the same field should be allowed
-
-
-Improvements (server)
----------------------
-
- * setup.cfg: Improve the setup of the server
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * Remove the bad translation files
-   * Rename the oc_OC translation files to oc_FR
-   * l10n_be: intracom declaration compliancy with Intervat 5.1.0
-   * l10n_be: compliancy of belgian vat declaration with Intervat 5.1.0 (from 05 feb 2010)
-   * account: fixed the onchange partner of bank_statement
-   * audittrail: context={} -> context=None in method signature
-   * audittrail: indentation problems
-   * audittrail: wrong class passed to super
- * https://launchpad.net/bugs/515590
- * https://launchpad.net/bugs/552455
-   * Account_analytic_default : Invoice creation from SO corected
- * https://launchpad.net/bugs/546004
-   * Account : Overdue report corrected
- * https://launchpad.net/bugs/552519
-   * account_invoice_layout : Added translation entries
- * https://launchpad.net/bugs/571978
- * https://launchpad.net/bugs/553881
-   * Account : Added a link to view unreconciled receivables/payables from Invoices
- * https://launchpad.net/bugs/566185
-   * Remove the unused translation files
- * https://launchpad.net/bugs/559478
-   * only Grouped field should appear in groupby clause, graph orientation corrected
- * https://launchpad.net/bugs/570652
-   * Locations when M2O,should not be among view type
- * https://launchpad.net/bugs/519133
-   * Account : Added centralization check on write() of move line
- * https://launchpad.net/bugs/532728
-   * sale: UoS qty visible for everyone
- * https://launchpad.net/bugs/559347
-   * Purchase : Product_uom_change should respect fiscal position related to product_id_change
- * https://launchpad.net/bugs/570132
-   * Account : code improved for move line creation
- * https://launchpad.net/bugs/551522
-   * Account : Manual reconcilation should work with the option of Skip Draft Entries of Journal
- * https://launchpad.net/bugs/539408
-   * Audittrail : Correction made to avoid crash on configuration wizard
- * https://launchpad.net/bugs/564530
-   * Account : Copying bank statement should not copy move lines
- * https://launchpad.net/bugs/568537
-   * Account : __compute() optimized a little
- * https://launchpad.net/bugs/461801
- * https://launchpad.net/bugs/568436
-   * Purchase : Merge PO should consider fiscal position
- * https://launchpad.net/bugs/552447
-   * Account : Tax :If type=code,python_compute has to be mandatory;if applicable_type=python_code,python_appliacble has to be mandatory
- * https://launchpad.net/bugs/561318
-   * Account/Document_ICS/MRP_Operations : datetime.datetime.strptime() replaced by mx.DateTime.strptime()
- * https://launchpad.net/bugs/559055
-   * account_payment: Remove the duplicated 'bank_id' field in the payment.line tree view
- * https://launchpad.net/bugs/564779
-   * Mrp_repair : Corrected make invoice process and Quotation report
- * https://launchpad.net/bugs/557501
-   * Account_Voucher : Correction in creating account.move from voucher
- * https://launchpad.net/bugs/519034
-   * Sale : progressbar for picking should be set when SO is picked 100%(including its procurement is done)
- * https://launchpad.net/bugs/569036
-   * mrp_subproduct : Corrected action_confirm method
- * https://launchpad.net/bugs/562803
-   * Membership : Copy() overridden for setting membership lines blank
- * https://launchpad.net/bugs/552503
-   * Account : Raising an exception when journal_id is missing
- * https://launchpad.net/bugs/564486
-   * Base_report_creator : Export method corrected
- * https://launchpad.net/bugs/532073
- * https://launchpad.net/bugs/489239
-   * mrp_operations : starting production order should start work order too.
- * https://launchpad.net/bugs/557373
- * https://launchpad.net/bugs/515507
-   * Support for ftp_server_host for setting the FTP interface for DMS server,
- * https://launchpad.net/bugs/535109
-   * Account:
- * https://launchpad.net/bugs/399817
- * https://launchpad.net/bugs/452854
-   * account: finish fix of generation of account.move.lines from invoice by providing extension hook
-   * account: corrected move balance check - rounding correctly based on price_accuracy
- * https://launchpad.net/bugs/570561
-   * Account_payment : Import of move line should include the date of search due date
- * https://launchpad.net/bugs/567987
-   * Account_analytic_default : Invoice creation from SO corected
- * https://launchpad.net/bugs/563713
-   * account_analytic_plans : Minor correction on a method to unlink entries
- * https://launchpad.net/bugs/513278
-   * account: corrected move balance check - rounding correctly based on price_accuracy
- * https://launchpad.net/bugs/551570
-   * Account_payment : Date will be asked to user while importing payment order into bank statement
- * https://launchpad.net/bugs/550742
-   * Account : Refund invoice wizard should have current_date as default
-
-
-Improvements (addons)
----------------------
-
- * Add the new version of Swiss Localization:
- * sale: unit tests for bug #461801
- * sale: warning instead of error in some unit tests
- * sale: demo tax account type
- * account: test case for bug #452854
- * account: renamed test
- * sale: minor test  changes
- * Account_followup : Domain improved for an act_window from Partner
-
-
-2010-04-06: 5.0.9
-=================
-
-Bugfixes (server)
------------------
-
- * https://launchpad.net/bugs/556634
-   * By pass a missing field in the translation
-
-
-2010-04-02: 5.0.8
-=================
-
-Bugfixes (server)
------------------
-
- * Not linked to a bug report:
-   * res_lang : if value of thousands_sep is not present in language,method will give error- 'moentary' name is not defined [IMP] clear cache of language on write,to be sure to get right value if value of language is changed before cache timeout
-   * bin/tools/convert.py: no need to import time since the eval(domain) is probably going to be removed or wrapped in an exception handler
-   * sql_db: avoid deadlock when releasing leaked cursors
-   * bin/tools/convert.py: reverted revision 2017.1.1: could not eval some strings. Need a dict with uid, active_id, active_ids, ...
-   * bin/tools/convert.py: missing time module
-   * i18n: fr_FR: missing information
-   * In the case we want to generate the RPM package, we change the version
-   * DONT pformat() each RPC request !
-   * reporting: change the way that para style are computed
-   * add cache to res.lang format() function
-   * fixed a bug in copy_data: it now copies the original (not translated) field value as the source value
-   * disabled "code" server action due to the security threat it poses, added --enable-code-actions command-line flag to enable it
-   * only admin can delete ir.property
-   * when deleting ir.property, do not delete the linked field
-   * correct import rng file
-   * 'Partner Manager' group should see the Partner menu
-   * removed python-xml from list of debian packages in doc/INSTALL
-   * remove ubuntu-related pyxml/python-xml hacks from openerp-server.py as pyxml shouldn't be used anywhere anymore
-   * Remove python-xml reference in setup.py
- * https://launchpad.net/bugs/495948
-   * Corrected language code for Slovenian and Danish locales. Renamed corresponding PO files.
- * https://launchpad.net/bugs/531430
-   * Remove the default values on the --no-netrpc and --no-xmlrpc
- * https://launchpad.net/bugs/538399
-   * netrpc: Close the socket if there is a raised exception
- * https://launchpad.net/bugs/532365
-   * Document : It should be allowed to browse through FTP,disregard to --no-databse-list option
- * https://launchpad.net/bugs/531026
-   * Exploit Broken : Search  should have checked access rights of read
- * https://launchpad.net/bugs/513290
-   * Export should honor the current locale(language) settings of the user.
- * https://launchpad.net/bugs/535551
-   * Uninstalling a board_* module removes dashboard action, but user shuold be allowed to login with default action
- * https://launchpad.net/bugs/514273
-   * Remove the libxml2 and libxslt dependencies for the packaging
- * https://launchpad.net/bugs/314973
-   * do not keep connections to template1, template0 and postgres in the connection pool
- * https://launchpad.net/bugs/544087
-   * Behaviour of fields.related corrected for copy() and write() calls
- * https://launchpad.net/bugs/551664
-   * Evaluate domain in act_window element is now possible
- * https://launchpad.net/bugs/528624
-   * Import : Any exception should be raised in well-manner
- * https://launchpad.net/bugs/543521
-   * Export : Correction made when selection field value if False.
- * https://launchpad.net/bugs/516568
-   * retro-compatibility: 'obj' is available in ir.action.server code
- * https://launchpad.net/bugs/380955
-   * setup.py: add the missing librairies for the windows packaging
- * https://launchpad.net/bugs/497364
-   * base: respect the limit and offset arguments of the search method
-
-
-Improvements (server)
----------------------
-
- * sql_db: improve logging
- * The act_window does not show groups.This adds groups and rearranges the view with a notebook to ensure that the addition of this m2m field doesnt introduce a scroll
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * base_contact: res.partner.job: when partner is set, the address is required. Add onchange on partner and on address.
-   * membership: bugfix + improved inheritance of membership_state field.function
-   * Base_contact : search() of job improved
-   * account_payment: added journal_id field in account.move.line.tree view
-   * Sale : Fiscal position from SO for invoice should be priorly taken from SO rather than Partner's properties
-   * Delivery : Better functional computation of weight based on move
-   * sale: move the product_uos_qty and product_uos fields to the
-   * event: made wizard of invoice creating more flexible (use onchange) + code refactoring
-   * audittrail: Check if the object exists or Not and raise an exception if it's not the case'
-   * hr_timesheet_sheet: Add a default value for the context keyword
-   * Improved mrp_jit smoke test in case the sale config wizard was run before installing mrp_jit. There is a side-effect but it's only on demo databases, and we'll fix this test in trunk when we can write better tests.
-   * account: product_id onchange on invoice lines were returning {} when no product_id was given. This was causing problems in other modules (account_analytic_default, account_analytic_plans) that inherited because of a key error 'value'. It now returns {'value':{}}.
-   * l10n_be: adaptation du module de localisation belge conformément à la nouvelle législation TVA pour les services intracom
-   * event: invoice creation from registrations
-   * purchase: security file update: added rights for manager. Fixed rights for user
- * https://launchpad.net/bugs/524521
-   * Account : USer will be notified for unreconciling partial reconcilatins if he tries to cancel the invoice
- * https://launchpad.net/bugs/540128
- * https://launchpad.net/bugs/535098
-   * Account : Only those accounts are eligible to be Parents which have type=View
- * https://launchpad.net/bugs/552455
-   * Sale : Make Invoice wizard should only create invoice for uninvoiced lines
- * https://launchpad.net/bugs/528889
-   * Account : name_search() of account.tax.code overridden for better search
- * https://launchpad.net/bugs/519220
-   * Delivery : Proper Weight calculation of stock picking
- * https://launchpad.net/bugs/535058
-   * Purchase : Seperate packign should not be created if chained locations are used
- * https://launchpad.net/bugs/545032
-   * Stock : Invoice from Stock should respect context for translations.
-   * stock: context lost in invoice wizard
- * https://launchpad.net/bugs/530081
-   * Sale : Sale order's Invoice should have invoice reference of customer Invoice
- * https://launchpad.net/bugs/545868
-   * Sale_crm : proper options set on wizard makesale
- * https://launchpad.net/bugs/467880
-   * MRP : stock.warehouse.orderpoint for qty_multiple check of 0
- * https://launchpad.net/bugs/544287
-   * Invoice object's Partner onchange had wrong parameter
- * https://launchpad.net/bugs/535655
-   * Base_setup : Better display of Currency selection(Name + Code)
- * https://launchpad.net/bugs/532728
-   * sale: Remove the product.group_uos group on the product_uos and product_uos_qty fields.
- * https://launchpad.net/bugs/540443
-   * Sale : Fiscal position value has to be passed when Invoice is created from SO
- * https://launchpad.net/bugs/532673
-   * delivery: replace 'id' with active_id in passing context of order(takes built in function id in webclient).
- * https://launchpad.net/bugs/528871
-   * Account : Dupliacting tax code should not copy move lines
- * https://launchpad.net/bugs/539707
- * https://launchpad.net/bugs/514273
-   * Base_report_designer : Replaced libxslt/libxsml2 code by lxml
- * https://launchpad.net/bugs/540946
-   * Hr_holidays : Constraint corrected for Holidays request(start date cannot be greater than end date)
- * https://launchpad.net/bugs/548494
-   * Account : Account should not be removed/deactivated if it is linked to any property/partner
- * https://launchpad.net/bugs/418080
-   * Document : Browse__files_using_ftp wizard corrected
- * https://launchpad.net/bugs/541006
-   * MRP/Purchase : Seller delay has to be converted into integer for date calculations.
- * https://launchpad.net/bugs/528978
- * https://launchpad.net/bugs/528929
-   * Account : Tax code tree view should have company.
- * https://launchpad.net/bugs/552461
-   * Scrum : Burndown chart was crashing when a taskwork entry is without date
- * https://launchpad.net/bugs/553168
-   * Account : Journal's name_search() did not use context well
- * https://launchpad.net/bugs/494352
-   * Sale : account_invoice_end() corrected/optimized so that it does not create any regression of duplicated pickings for SO
- * https://launchpad.net/bugs/531238
-   * improved regression tests in sale and mrp_jit modules to test separately auto-chained locations. (bug 531238)
-   * mrp: use correct location chaining by calling action_confirm() on stock move instead of directly writing the status (bug 531238).
- * https://launchpad.net/bugs/540151
-   * Event : Notify user before sending an email on confirming event
- * https://launchpad.net/bugs/542379
-   * Account : Terp file had duplicated author,depends keys
- * https://launchpad.net/bugs/539073
-   * account_date_check: If the date of the move line, is not in the
- * https://launchpad.net/bugs/532073
- * https://launchpad.net/bugs/526081
-   * MRP : Ondelete=cascade applied to important fields of stock.warehouse.orderpoint
- * https://launchpad.net/bugs/535642
-   * Stock : Unlink() of Move corrected
-   * Stock :Picking removal should remove moves too
- * https://launchpad.net/bugs/506431
-   * Use the file name instead of the content
- * https://launchpad.net/bugs/531638
-   * Sale_crm : Code improved for partner onchange to take effect on SO
- * https://launchpad.net/bugs/530926
-   * Account : Invoice group was missing access rights for tax and tax code
- * https://launchpad.net/bugs/531416
- * https://launchpad.net/bugs/535601
-   * Account : Proper query generation for computing debit.credit,balance
- * https://launchpad.net/bugs/532365
-   * Document : It should be allowed to browse through FTP,disregard to --no-databse-list option
- * https://launchpad.net/bugs/399817
-   * Sale : Cancelled partial packing should affect Sale order's Shipped field
- * https://launchpad.net/bugs/538064
-   * Sale : Translations for RML texts entered into po/pot
- * https://launchpad.net/bugs/531479
-   * Stock : drop view check added for stock_report_prodlots
- * https://launchpad.net/bugs/504353
-   * Product : Conversion from unmatched categorized UoM now raises exception
- * https://launchpad.net/bugs/532716
-   * MRP : Split production wizard corrected
- * https://launchpad.net/bugs/538419
-
-
-Improvements (addons)
----------------------
-
- * base_contact: res.partner.address: use domain instead of value in context
- * Stock :Layout for  Moves under Picking Improved
- * Account : Fiscalyear and Period now have name_search
- * Product : Duplicated demo data corrected
- * purchase: moved smoke test into separate test dir and renamed demo data for consistency with sale/mrp smoke tests
- * l10n_be: attribution de nouveaux codes plus explicites pour les taxes
- * Account_voucher : Accounting entries should only be available for non-view accounts
- * Account : Better view of Reconciled and Partially Reconciled entried with Entry Lines
- * Account : Setting tax code name translateable (to be consistent with tax name)
-
-
-2010-03-01: 5.0.7
-=================
-
-Bugfixes (server)
------------------
-
- * Not linked to a bug report:
-   * --smtp-ssl is not a dependent on the server ssl mode
-   * bug:504718
-   * orm: ensure the cursor is valid before computing parent_store values
-   * correct ustr. avoid a crash if getlocale() return None
-   * Fields.function : if store={}/True is removed,column should be dropped with cascaded effect
-   * Base.sql : added relation field column to ir_model_feilds
-   * Fields : relational field was not getting written to ir_model_fields,in case of one2many
-   * allow to create menu executing ir.actions.server
-   * orm: bug when browsing _inherits object
-   * Search made working for function/related fields with store=True/{...} or fnct_search=method
-   * _inherits table may delete the record which is parental to other object but not required.
-   * remove the lock on database connections
-   * correct threading problems in cache
-   * Server Action : Email can be sent with non-English characters now
-   * quality_integration_server: if db exits, db should removed on database creation
-   * Currency : Rounding improved
-   * Importation when fails,needs cursor to be rolled back
-   * handle the case of missing "#:" formated comment in po files
-   * custom report xml creation
-   * better locking when accessing to template1 database
-   * remove minidom from report/custom, replace with lxml
-   * leftover call to minidom in ps_form even though minidom isn't imported there anymore
-   * Remove leftover instances of libxslt and libxml2, replace them by lxml
-   * hang in OSX when trying to shutdown server via SIGINT
-   * set absolute path for the config file to avoid the save() method breaking on single file, since os.path.exists('') returns false and you can't create the current directory
-   * quality_integration_server: fixed problem in make link
-   * translation: modify msg id where it contains python code in translations po files
-   * use env for python shebang rather than hardcoding /usr/bin/python
-   * base: wrong fr_FR translation for 'Delete Permission'
-   * db_exist method works as expected
-   * quality_integration_server : fixed bug on make link
-   * quality_integration_server: wrong web-service name
-   * Upgrade could have failed when its a change in name field,added cascade
-   * Expression : Making search easier for 'child_of'- Recursivity on field used as a Left operand
-   * solve problem of importing data from csv with constraints available on object
-   * act_window False domain problem - produce after dom to lxml conversion
-   * On update, fields with only numeric/int/float could have digits
-   * On Update, if only the size of column is changed,it should reflect into DB
-   * quality_integration_server : fixed problem in integration server on translation checking if translation file is changed on base module
-   * Avoid crash when no args
-   * Config : wrong calculation if cached_timeout comes from config file
-   * Expression : domain calculation failes, max. recursion error protected
-   * recursive calls
-   * allow to call write without ids on osv_memory objects
-   * Specify the name of the argument for the context, to avoir a critical bug
-   * <seq> problem Report Engine
-   * Workflow button desactivation regarding user roles
-   * Improved Previous bad commit for pagelayout error
-   * Import : Context of the action/screen passed,taken into consideration while importing
-   * quality_integration_server: ascci encoding problem in quality html log
-   * recursive child_of on one2many and many2many
-   * default context
- * https://launchpad.net/bugs/463415
- * https://launchpad.net/bugs/525962
-   * Ir_model : Made an offensive check of context
- * https://launchpad.net/bugs/430133
-   * Name_search() is having now record limit to be 80 instead of None
- * https://launchpad.net/bugs/407667
-   * Allowed SQL reserved keywords to be used in _order,group by ,etc.[Make sure , your _order should look like _order='to' instead of to]
- * https://launchpad.net/bugs/495636
-   * Warning for reports for header attributes used in .py
- * https://launchpad.net/bugs/523071
-   * Default_get : fields of _inherits for default values should be considered
- * https://launchpad.net/bugs/493548
-   * Ir_actions : Unicode error corrected
- * https://launchpad.net/bugs/409354
-   * Browse with _inherits issue fixed  if more than one M2O to parent objct exists
- * https://launchpad.net/bugs/430805
-   * Import made successful when field is O2M and it has relation under that.
- * https://launchpad.net/bugs/462506
-   * Priority on fields.function with store dictionary made working.
- * https://launchpad.net/bugs/483527
- * https://launchpad.net/bugs/373176
-   * Behavior of server corrected if addons-path is wrong
- * https://launchpad.net/bugs/489355
-   * fields: '_fnct_write' should pass context object to the 'write' method
- * https://launchpad.net/bugs/491867
-   * revert bad fix
-   * fields.related were misbehaving
- * https://launchpad.net/bugs/433886
-   * Update Module : Float8 to float and numeric to float casting made possible
- * https://launchpad.net/bugs/410191
-   * Record rule : domain evaluation problem corrected
- * https://launchpad.net/bugs/519468
-   * Fields : Only one2many fields can have relation_field,avoid checks for others
- * https://launchpad.net/bugs/523971
-   * Missing imports of _ of tools.translate provided
- * https://launchpad.net/bugs/500571
-   * Record Rules : domain_force made working
- * https://launchpad.net/bugs/519204
-   * Base : Country can be searched on Country codes independent to case
- * https://launchpad.net/bugs/493545
-   * Allowed <notebook> to be added into an inherited view(under field)
- * https://launchpad.net/bugs/456978
-   * O2M should check existing relations for its concerned M2O
- * https://launchpad.net/bugs/522227
-   * Fixed error notification on parent_store=true with a column without ondelete=cascade
- * https://launchpad.net/bugs/516030
-   * Export translations + Cache on translations + Resynchronization wizard Corrections
- * https://launchpad.net/bugs/430728
-   * Allowing sql keywords as fields(don't use them in order by clause)
- * https://launchpad.net/bugs/480782
- * https://launchpad.net/bugs/524588
-   * translate: error with workaround about \xa0 in decimal_point and thousands_sep
- * https://launchpad.net/bugs/453269
-   * Amount_To_Text Corrected
-   * Amount to text conversions made better
- * https://launchpad.net/bugs/490604
-   * RAW reports creation corrected
- * https://launchpad.net/bugs/425350
-   * Menu attribute to report/wizard/url made behaving correctly
- * https://launchpad.net/bugs/504584
- * https://launchpad.net/bugs/495948
-   * Corrected language code for Slovenian and Danish locales. Renamed corresponding PO files.
- * https://launchpad.net/bugs/480301
-   * M2M : values filtering on set()
- * https://launchpad.net/bugs/503278
-   * Search : searching translated fields made possible(related,one2many,many2many)
- * https://launchpad.net/bugs/504243
- * https://launchpad.net/bugs/490125
-   * Custom fields should be removed from _columns too
- * https://launchpad.net/bugs/490337
-   * Corrections made when removing a module and updating the module database:                                                                    Entry from ir_model_data should also be removed when moudle is removed
- * https://launchpad.net/bugs/496433
-   * Server Action: Help message of Legend corrected
- * https://launchpad.net/bugs/417023
-   * Installation should alert user if any no pool record found for M2M/M2O.
- * https://launchpad.net/bugs/493657
-   * Custom fields won't disturb anything while updating server
- * https://launchpad.net/bugs/435933
-   * Encoding error corrected for client_action(ir_values-tree view)
- * https://launchpad.net/bugs/514231
-   * M2O : Unfair behavior of M2O for access denial records and normal ones(All records were hidden by access denied if one had failed to meet access rights).
- * https://launchpad.net/bugs/499501
-   * Report : Proper Message notification when RML file is not found
- * https://launchpad.net/bugs/523762
-   * Expression.py corrected when M2O search returns no IDs
- * https://launchpad.net/bugs/420507
-   * Domain was getting failed when trying to work upon M2M,O2M field of object
- * https://launchpad.net/bugs/523123
-   * Not allowing Duplicate shortcuts
- * https://launchpad.net/bugs/516469
-   * Wizard should raise exception to user when writte inside 'choice' type
- * https://launchpad.net/bugs/488234
-   * connection pool when database password is provided (thanks to Syleam Crew)
- * https://launchpad.net/bugs/491365
-   * Translation: Error parsing .po files when application puts comments in a single line
- * https://launchpad.net/bugs/433395
- * https://launchpad.net/bugs/462285
-   * Remove the useless cr.commit() in the get_id() method of the ir.sequence object
- * https://launchpad.net/bugs/356628
-   * allow related fields to point to one2many and many2many fields
- * https://launchpad.net/bugs/460560
-   * Ir_attachment : Context updation corrected on preview
- * https://launchpad.net/bugs/437729
-   * Export Translation : Warning on Non-existing record instead of breaking flow
- * https://launchpad.net/bugs/503445
-   * Partner : Name_get() of res.partner.address corrected
- * https://launchpad.net/bugs/445252
-   * Translation was not getting inserted to DB on write()
- * https://launchpad.net/bugs/497364
-   * revert previous patch about linked bug (lp:497364)
-   * Menu : Search method corrected for the non-Admin user
- * https://launchpad.net/bugs/434341
-   * Export : Selection field gets imported by its external name  if export is not import compatible
- * https://launchpad.net/bugs/489573
-   * Manual object and field creation with searchable
- * https://launchpad.net/bugs/520854
- * https://launchpad.net/bugs/449516
-   * Warning raised for server action with SMS facility
- * https://launchpad.net/bugs/519699
-   * Export translations: module name from path calculations corrected
- * https://launchpad.net/bugs/516965
-   * User / Preferences should always display translatable languages.
- * https://launchpad.net/bugs/516964
-   * default_FIELD from context should not overwrite modified FIELD value while creating record
- * https://launchpad.net/bugs/516044
-   * Graph : report corrected
- * https://launchpad.net/bugs/516962
-   * modifying a cron from client make it run concurrently multiple times
- * https://launchpad.net/bugs/447819
-   * Ir_values : reading of default values correted
- * https://launchpad.net/bugs/510600
-   * Import should raise an uncaught exception if not identified
- * https://launchpad.net/bugs/413121
-   * Related with O2M behavior corrected
- * https://launchpad.net/bugs/487836
-   * Custom Object xml arch needed encoding.
- * https://launchpad.net/bugs/516969
- * https://launchpad.net/bugs/487723
-   * Module informtion was not getting updated on upgrading module
- * https://launchpad.net/bugs/372747
-   * Disable the cache for the ir.rules
- * https://launchpad.net/bugs/478724
-   * Export : M2M field name was missing last character
- * https://launchpad.net/bugs/497423
-   * FormatLang : Dates if specified into String,will be formatted into language-specific format
- * https://launchpad.net/bugs/429519
- * https://launchpad.net/bugs/479915
-   * Added lxml as required module on setup
- * https://launchpad.net/bugs/495374
-   * Partner : titlee can have a choice to be null
- * https://launchpad.net/bugs/509629
-   * Expression : Domain calculation of M2M/O2M corrected
- * https://launchpad.net/bugs/504720
- * https://launchpad.net/bugs/516568
-   * Server Actions: evaluating dict corrected
- * https://launchpad.net/bugs/512682
-   * avoid sql injection in sequences
- * https://launchpad.net/bugs/400614
-   * Use an alternative for the locale.RADIXCHAR if this one doesn't exist
- * https://launchpad.net/bugs/491462
-   * Pickling issue solved with ir_values (get method)
- * https://launchpad.net/bugs/507429
-   * Encoding problm corrected on report contents
-   * If RML contains unicode characters and title in the same <para>,it would have failed.
-
-
-Improvements (server)
----------------------
-
- * orm: allow import and record creation to defer the computation of parent_left/right
- * orm: do not update parent_left/right if the parent haven't been changed
- * Licensing options : Added AGPL-3 and others in choices
- * Groups : Better duplication terminology.
- * sql_db: better logging
- * osv: log (in debug) access errors
- * web_service: remove log (debug) when creating database
- * exported method check_connectivity
- * Sequence : Legend improved to help user understand the usage of %(year)s
- * remove useless comment
- * Launchpad export translation files
- * removal of usages of the deprecated node.getchildren call, better usage of the attributes & tostring ET APIs, style fixes
- * improve usage of the ET API, use SubElement instead of Element/append, kwarg attributes setting instead of node.set
- * add option to disable the database listing
- * quality_integration_server: added net_port option in script
- * better connection pool (global)
- * ir_cron : added active feild on list view
- * Allow to specify the view via the context
- * cron: check the arguments to avoid security issues
- * cron: failed jobs are logged
- * cron: clean code
- * base_quality_interrrogation: put message if the score of quality less then minimal and remove unit test condition
- * quality_integration_server: quality log : add new option to specify qualitylog path to store html pages of log
- * default value for module
- * updated changelog file for 5.0.6 release
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * event: make invoice wizard now creates invoice line with better label
-   * membership:
-   * Sale : Onchange of product/qty corrected when uos is present.Product: Help corrected for uom to uos conversion.
-   * Remove the bad translation files
-   * membership: membership amount field corect name of digits in field defination
-   * audittrail: correct dependencies
-   * audittrail: ensure cursor is closed
-   * invoice: translate the product description only if partner's language is set.
-   * account: avoid a traceback if credit/debit/balance sum can be computed
-   * mrp: fixed demo data when default_code is overridded in a custom module
-   * crm: removed debugging code
-   * document: fixed problem on window on filezilla
-   * sale_crm: CRM->Opportunities: 'convert to quote' now sets the salesman from the partner (or the user if there is none)
-   * sale: onchange on partner_id now set the partner's dedicated salesman as the sale salesman or the user if there is no dedicated salesman on that partner
-   * base_contact: search for a contact in a contact job now searches in firstname and lastname
-   * product: pricelist: ondelete cascade to avoid errors when deleting pricelists and versions ('null value in column "price_version_id" violates not-null constraint')
-   * sale_delivery_report: production lot reference was missing
-   * sale: onchange on partner_id now set the partner's dedicated salesman as the sale salesman
-   * sale_delivery_report: typo in french translation file
-   * Analytic_user_function : Corrected the  Wrong way call to the  method of product.uom
-   * base_contact: search in "Contact's Jobs" now also search in firstname and lastname of contacts
-   * Base_report_creator : ilike query generation problem corrected
-   * account: At the time of invoice cancel it will remove partial reconcile id from entry
-   * Account: Bank statement line,if has write-off entries,should pass write off account to move line
-   * account: set correct journal while opening customer and supplier invoices and refunds
-   * fix a prolem for the wiki content for the indexing
-   * product: Now pricelist objects price get function will pass context to price_get method of product and compute method of currency object
-   * base_module_quality: add import statment for _ and give size to name field on save report wizard so that it can display long name also
-   * Account : Wrong residual amount comes if company currency and invoice currency are different(provided no currency defined on journal)
-   * account: wizard of fiscal year closing fixed: the entries of all previous fiscal years have to be deffered, not only the last one
-   * l10n_be: fixed data of l10n_be module
-   * Analytic account report corrected
-   * Account_Voucher : Reports corrected
-   * Sale_CRM : write() was sending wrong data
-   * MRP : Accounting Entries were duplicated when processing production order with accounting configuration for locations.
-   * base_contact: domain problem on job object
-   * project: extra info tab of task view shouldn't be readonly if the task'state is 'draft'
-   * account_followup: the followup level of a partner which was removed from the proposed partner to remind was still raised although we didn't select him.
-   * change class names for all model in voucher from Account = account_account
-   * Base_report_creator : Wizard is available only for custom query,not for the custom result
-   * Point_of_sale : Receipt report corrected
-   * Account_tax_include : improvements when invoice lines are created prior to invoice
-   * Account_tax_include : Minor modif
-   * account_analytic_plans: analytic distribution are now created on invoice line when confirming sale orders (if a line is matching account analytic default rule)
-   * account: partial reconciliation check was wrongly computed
-   * base_module_quality: get_ids method problem
-   * account: no need to do a call to 'translate', method '_' is sufficient.
-   * base_module_quality: solve translate string error
-   * Stock: Moves have no state 'auto',its 'waiting'
-   * base_module_record second range problem when second is 59
-   * Project_timesheet : Removal of task with task work should affect Analytic lines
-   * Track Incoming / Outgoing products:
-   * account_analytic_default: add stock dependancy
-   * removed print statement
-   * picked in SO
-   * Project : remove unused import causing a DeprecationWarning under Python 2.6
-   * l10n_be: corrected internal type of vat account in l10n_be: set other instead of payable/receivable
-   * Hr_timesheet_sheet : setting type=workflow to 2 buttons
-   * Account: text made translatable
-   * fix the problem of menus uring installation
-   * Regression in SO from Jeroen and Jay, picked state see bug #491375
-   * Stock : Added Product UoS to the Stock Move view
-   * Base_contact : Making Email field of address visible on Address form view
-   * Stock : Added translations
-   * Account_invoice_layout : Reports improved and SXWs made compatible to RML
-   * membership: invoice membership wizard now calculate tax corectly and on product membership fields make readonly to false
-   * membership: change membership product date from and date to value with current year on demo data
-   * membership: solve problem of deleting membership invoice created with old membership product
-   * Account: Wizards were missing translation import statement
-   * Residual amount into invoice is now correct in every case and avoid rounding trouble even if rating has changed
-   * account: avoid translate tool missing import on strictier Python 2.6 versions; bare in mind that mx.Datetime should be eraticated from the surface of the earth
-   * account: removed pdb now that things are claimed fixed (after the commits messages)
-   * account_analytic_plans: Use etree instead of xml.dom
-   * fix the problem that appers in to the account move due to accout voucher
-   * Account_date_check : correction on a method
-   * Account_voucher : Typo corrected for Voucher type.
-   * Account : Corrected the malformed report of Partner Ledger
-   * purchase_manual: Import OSV
-   * python2.6 compatibility
-   * AuditTrail : View Logs should only show logs of current object and resources
-   * fix the problem of the reports account voucher
-   * #TODO: fix me sale module can not be used here,
-   * Import OSV in the wizard
-   * purchase: Use the price_accuracy
-   * Base_Report_Creator : xml record was malformed, corrected
-   * hr_expense: corrected error message
-   * account: avoid ZeroDivisionError
-   * Specify the name of the argument for the context, to avoir a critical bug
-   * CRM : Mailgate script added option -he was conflicting,improved
-   * Account :Invoice report had Partner name displayed at wrong position
-   * bugfix residual computation and multi-currencies
-   * Base_report_creator : Calendar view problems on custom report
-   * typo
-   * workcenter load graph
-   * set the access right
-   * base_module_quality: speed test if read method has exception
-   * account_analytic_plans: avoid encoding errors
- * https://launchpad.net/bugs/528289
-   * membership: printing report crashes on graph view
- * https://launchpad.net/bugs/522696
-   * Stock : Split moves wizard should respect current language
- * https://launchpad.net/bugs/528281
-   * membership: membership state not correctly updated with associated partner
- * https://launchpad.net/bugs/524425
- * https://launchpad.net/bugs/416810
-   * Document: attachment linked with Files
- * https://launchpad.net/bugs/470359
- * https://launchpad.net/bugs/438725
-   * Purchase : Setting the value of payment term while creatying invoice from PO
- * https://launchpad.net/bugs/492793
-   * Project_gtd : Improved fields_view_get() andmade it compatible to stable
- * https://launchpad.net/bugs/525314
-   * membership: membership date from and to required now on product form
- * https://launchpad.net/bugs/453030
-   * Avoid display write-off in pay invoice wizard : take care of partial payment
-   * Avoid display write-off in pay invoice wizard. Put the right date and currency for conversion
- * https://launchpad.net/bugs/448591
-   * Account : Refund wizard wasnt calculating taxes for new invoices
- * https://launchpad.net/bugs/489241
-   * mrp_operations : work order calculation corrected
- * https://launchpad.net/bugs/493704
-   * Small stock tracking problem
- * https://launchpad.net/bugs/518914
-   * Unable to validate supplier invoice/refund with reference greater than 32 characters. The reference is used as reference for the move lines and the analytic account line but the reference of these objects are limited to 32 characters, raising an sql error. It also broke the workflow of the invoice.
- * https://launchpad.net/bugs/481130
-   * Stock: Shipping Address has to be in.po/.pot
- * https://launchpad.net/bugs/427869
-   * Residual amount in invoice when currency rating change
- * https://launchpad.net/bugs/474337
-   * [CRITICAL] warning : missing import statement for "_"
- * https://launchpad.net/bugs/513983
-   * Sale : Order lines should be not editable for non-draft SO.
- * https://launchpad.net/bugs/433898
-   * fix a problem Point of sale create outgoing shipments incl. service items
- * https://launchpad.net/bugs/516746
-   * Account : Bank statements should not be altered/removed when state is confirmed
- * https://launchpad.net/bugs/445267
-   * Mrp_subproduct : Wrong calculation of QTYs corrected(Product qty,UOS qty)
- * https://launchpad.net/bugs/496889
-   * Account : wizard_pay_invoice corrected (Check made to calculate only receivable,payable lines)
-   * Account: Better calculation of invoice amount
- * https://launchpad.net/bugs/428926
-   * account_payment when importing payment lines (currency not set correctly)
- * https://launchpad.net/bugs/502984
-   * Hr_holidays: leaves' calculation corrected on removal of leaves
- * https://launchpad.net/bugs/434628
-   * Account : In bank statements,Move Lines should be imported only once
- * https://launchpad.net/bugs/503741
-   * Purchase : Purchase/user was missing account.tax access rights
- * https://launchpad.net/bugs/457188
-   * Account_analytic_analysis : Summary of Months calculation Corrected
- * https://launchpad.net/bugs/528292
-   * membership: membership cancel date is not updated
- * https://launchpad.net/bugs/351083
-   * Account : Partner Balance report gets printed with respect to the company selected
- * https://launchpad.net/bugs/497365
-   * Account : Supplier Invoices new record creation corrected for web client
- * https://launchpad.net/bugs/435298
-   * Subscription : Disallowed to change the Object linked to the document type.
- * https://launchpad.net/bugs/490883
-   * MRP: Proper context value passed for PO creation from packing via SO
- * https://launchpad.net/bugs/479886
-   * Account : Total field on supplier invoice set to 0.0 to amke it Web-client compatible
- * https://launchpad.net/bugs/398562
-   * MRP : Accounting Entries were duplicated when processing production order with accounting configuration for locations.
- * https://launchpad.net/bugs/445547
-   * Stock: Picking report correction
- * https://launchpad.net/bugs/507694
-   * Properly cancel a draft purchase.order when unlinking it, so correct workflow signals can be propagated to parent workflows if there are any.
- * https://launchpad.net/bugs/460924
-   * Stock : force_assign won't create duplicate entries
- * https://launchpad.net/bugs/516100
-   * Account : Invoice line should display complete name of product from the onchange
-   * Stock : Onchange corrected to have an effect of translations
- * https://launchpad.net/bugs/492174
-   * Base_report_creator : encoding eror corrected on adding filters
- * https://launchpad.net/bugs/446205
-   * CRM : Mailgate script has host as parameter now onwards
- * https://launchpad.net/bugs/501625
-   * Account : General Ledger report in Landscape made transltable
- * https://launchpad.net/bugs/440557
-   * Purchase : POL had a wrong tree view which is unused till now
- * https://launchpad.net/bugs/452854
-   * Correct the validate function for balanced move into account.py (after Fabien Warning)
-   * Use price_accuracy to verify balanced entry insteed of fixed '0,0001'. Add price_accuracy on debit and credit move lines
- * https://launchpad.net/bugs/522532
-   * Stock : Priority assigned to stock.location list view
- * https://launchpad.net/bugs/522629
- * https://launchpad.net/bugs/480035
-   * CRM : action name improved
- * https://launchpad.net/bugs/439469
-   * Product : Pricelist types getting translated on Pricelist
- * https://launchpad.net/bugs/512682
-   * avoid sql injection in sequences
- * https://launchpad.net/bugs/476343
- * https://launchpad.net/bugs/447402
-   * Project_timesheet : Wrong synchro on analytic line creation fro tasks(for name).
- * https://launchpad.net/bugs/490318
-   * Account : Ondelete=cascade added to bank statement line
- * https://launchpad.net/bugs/459027
-   * Sale : SOL's subtotal was missign price-accuracy
- * https://launchpad.net/bugs/509496
-   * Account_tax_include : Refund of invioce was not counting price_type.
- * https://launchpad.net/bugs/366944
-   * Base_vat : Spanish numbers validation corrected
- * https://launchpad.net/bugs/488869
-   * Stock/MRP : Track line wizard improved
- * https://launchpad.net/bugs/474340
-   * Stock : Wizard improvements from Lionel
- * https://launchpad.net/bugs/445306
-   * document: put warning message in module descrition regarding lost files which are exits before installing document
- * https://launchpad.net/bugs/491867
-   * base_contact: fix bad related field
- * https://launchpad.net/bugs/481524
-   * Stock : Forecast report: unicode error corrected
- * https://launchpad.net/bugs/493369
-   * Hr_attendance : Sign out entries were not possible when we 'change work'
- * https://launchpad.net/bugs/438705
-   * Stock : Stock move lines on Production Order well-structured
- * https://launchpad.net/bugs/500096
-   * Base_report_creator : Support of count(*) added
- * https://launchpad.net/bugs/521106
-   * Account : Analytic charts of accounts was raising exception on displaying chart
- * https://launchpad.net/bugs/464578
-   * project_timesheet: analytic entries are fully not updated, when changing task project
- * https://launchpad.net/bugs/483583
-   * Sale/Purcghase : Function fields did not have digits attribute for precision accuracy
- * https://launchpad.net/bugs/461720
-   * Scrum : Wrong view,widgetless fields on scrum view made correct
- * https://launchpad.net/bugs/491898
-   * Purchase : Fields set readonly on done state
- * https://launchpad.net/bugs/480856
-   * Warning : the super of onchange may return {},covered the same
- * https://launchpad.net/bugs/496898
-   * Account : Fields were missing in Account chart template form view
- * https://launchpad.net/bugs/502065
-   * Stock : Product Packaging field was missing domain
- * https://launchpad.net/bugs/351167
- * https://launchpad.net/bugs/459196
-   * Account : Partner Ledger Report formatting problem solved
- * https://launchpad.net/bugs/465010
-   * Stock : Notification Message made translatable
- * https://launchpad.net/bugs/491892
-   * Reconcilation problem corrected when foreign currency rate changes
- * https://launchpad.net/bugs/504781
-   * Project : Task delegation was calling write() wrongly
- * https://launchpad.net/bugs/494245
-   * Services product included on BOM now creates a task on Project
- * https://launchpad.net/bugs/475135
-   * Account : Warning message was missing _ import
- * https://launchpad.net/bugs/467880
-   * MRP : Procurement can only be confirmed when qty>0.0
- * https://launchpad.net/bugs/401801
-   * Sale/Purchase : Worfklow instance had to ve removed while setting record's workflow back to draft state
- * https://launchpad.net/bugs/449583
-   * Sale : Better error message when account is missing from SOL for Invioce
- * https://launchpad.net/bugs/439041
-   * Report_project :wrong average of closing days counting
- * https://launchpad.net/bugs/517018
- * https://launchpad.net/bugs/487641
-   * Purchase : MOQ-pricing problem corrected
- * https://launchpad.net/bugs/500062
-   * Account : On Confirming the statement, Moves shoould have the bank statement line date
- * https://launchpad.net/bugs/525229
-   * call fields_view_get with not specify the context raise an exception on product with stock module installed
- * https://launchpad.net/bugs/441609
-   * Account : Fiscal Position Template was missing a requireed field in form view
- * https://launchpad.net/bugs/483723
-   * CRM : Case form view priority issue resolved
- * https://launchpad.net/bugs/440734
-   * Stock : Picking did not have 'type' field on display(inconsistent behavior from eTiny,koo) to work upon domain.
- * https://launchpad.net/bugs/419720
-   * Sale : Delivery Date delay computation made corrected when days are passed with fractions
- * https://launchpad.net/bugs/439208
-   * Hr_timesheet : Allowing user to enter Analytic Journal if not linked with employee(Working hours tree view)
- * https://launchpad.net/bugs/379118
-   * Stock : Partial Picking wizard was making the back order reference jump to 2 numbers,notification given on packing done.
- * https://launchpad.net/bugs/526930
-   * Account : act_link added for better options of viewing move lines from partner
-   * Account : act_link from partners for account entries should contain only receivable/payable accounts
- * https://launchpad.net/bugs/526417
-   * Sale_delivery_report : Report corrected
- * https://launchpad.net/bugs/450180
-   * Hr_timesheet_invoice : Wrong domain was sent for opening invoices created
- * https://launchpad.net/bugs/446391
-   * Base_report_creator : Allowing to use current userid
- * https://launchpad.net/bugs/519225
- * https://launchpad.net/bugs/522011
-   * fix a problem of 0 amount entries
- * https://launchpad.net/bugs/505697
-   * Account : Analytic check report should consider expenses are debits
- * https://launchpad.net/bugs/519220
-   * Weight on Picking has to be calculated from the Moves
- * https://launchpad.net/bugs/519433
-   * Sale : Invoice from packing should pass proper notes to invoice
- * https://launchpad.net/bugs/500078
- * https://launchpad.net/bugs/527151
-   * CRM_configuration : Menu action for all Unassigned opportunities had wrong domain
- * https://launchpad.net/bugs/486783
-   * Point_of_sale : Report for Reciept corrected
- * https://launchpad.net/bugs/503894
-   * Base_report_crearor :Models with _inherits made working
- * https://launchpad.net/bugs/371681
-   * Residual amount was calculated wrongly when invoice had payment term lines
- * https://launchpad.net/bugs/454536
-   * Warning : Onchange Methods were malfunctioned.Corrected and made messages available for translations
- * https://launchpad.net/bugs/504670
-   * Functional fields should have context as an argument when we use fnct_searc method
- * https://launchpad.net/bugs/507094
- * https://launchpad.net/bugs/396637
-   * account_analytic_analysis : Analytic account functional field methods corrected.
-   * Account : Analytic account functional field methods corrected.
- * https://launchpad.net/bugs/495948
-   * Corrected language code for Slovenian and Danish locales and renamed corresponding PO files.
- * https://launchpad.net/bugs/470815
-   * l10n_chart_uk_minimal : Demo account.tax.code needed negative sign
- * https://launchpad.net/bugs/513240
- * https://launchpad.net/bugs/421636
-   * Account : Restricting Payment term lines percentage insertion from 0 to 1
- * https://launchpad.net/bugs/516636
-   * Project_timesheet: Product_uom supplied to Analytic entries
- * https://launchpad.net/bugs/492211
-   * MRP : procurement does not need cancel button when its Running
- * https://launchpad.net/bugs/401035
-   * Audittrail : Assigned Access Rights to non-admin user.
- * https://launchpad.net/bugs/511198
- * https://launchpad.net/bugs/499120
-   * Stock : While removing the picking,moves should not call picking's write()
- * https://launchpad.net/bugs/438690
-   * Account : Accounts containing moves cannot be deleted
- * https://launchpad.net/bugs/490965
-   * Sale : SO was getting stuck when invoice is cancelled and SOL is with product.
- * https://launchpad.net/bugs/446520
-   * [account_followup] wrong sender for email
- * https://launchpad.net/bugs/528418
-   * membership: all products are considered to be memberships
- * https://launchpad.net/bugs/522862
-   * document: Fixed non-closed Cursor problem
- * https://launchpad.net/bugs/451310
- * https://launchpad.net/bugs/479747
- * https://launchpad.net/bugs/486794
-   * Hr_holidays: Spell mistake corrected
- * https://launchpad.net/bugs/443132
-   * Sale : Passing customer ref. of picking to invoice
- * https://launchpad.net/bugs/481372
-   * Project : If company has no Project time unit,it would have crashed.
- * https://launchpad.net/bugs/476428
-   * Stock : Partial Picking wizard was missing translation import statement
- * https://launchpad.net/bugs/500591
-   * Account: Spell corrected in order to display separator on subscription wizard
-   * Account: Creation of Moves to Subscription entries Corrected
- * https://launchpad.net/bugs/436174
-   * Account: Supplier invoices was not taking product price on onchange of product
- * https://launchpad.net/bugs/488809
-   * Sale : State was written wrongly
- * https://launchpad.net/bugs/490327
-   * Reverted bad commit from Joel@CamptoCamp
- * https://launchpad.net/bugs/383057
-   * Stock-MRP : Split production wizard made individual to mrp if mrp is not installed
- * https://launchpad.net/bugs/440711
-   * Purchase : PO with different pricelists should not be merged
- * https://launchpad.net/bugs/516143
-   * Base_report_designer : Latin-1 encoding replaced by utf-8
- * https://launchpad.net/bugs/525768
-   * membership: now membership state not depends on current date
- * https://launchpad.net/bugs/513230
-   * Product :Uom conversion was made 2 times
- * https://launchpad.net/bugs/522977
-   * Fixed mrp to ensure that mrp_jit can trigger the procurement assignation properly. See bug 522977.
- * https://launchpad.net/bugs/510692
-   * Account : Onchange of product should affect price on supplier invoice line
- * https://launchpad.net/bugs/458415
-   * document_ics : solved accent problem
- * https://launchpad.net/bugs/428873
-   * purchase: chain location does not work
- * https://launchpad.net/bugs/489355
-   * account, invoice, sale: description (product sold, invoice line and account entry line) was not translated
- * https://launchpad.net/bugs/515590
- * https://launchpad.net/bugs/499645
-   * Project_mrp: Better effect for service products creating tasks/projects
- * https://launchpad.net/bugs/466658
-   * Account : Action window of anlytic entries was missing name
- * https://launchpad.net/bugs/510217
-   * Added Missing import statements of translations( from tools.translate import _)
- * https://launchpad.net/bugs/460701
-   * Document : Attachment with document can now be deleted
- * https://launchpad.net/bugs/498047
-   * Account_tax_include : Rounding corrections
- * https://launchpad.net/bugs/435160
-   * [IMP] Correct write-off date, add analytic account, better interface between all way to reconcile
- * https://launchpad.net/bugs/458553
-   * Account : Onchange of amount/base amount of Invocie tax corrected
- * https://launchpad.net/bugs/446681
-   * Account : Refund wuzard malfunctioned with modify invoice option
- * https://launchpad.net/bugs/493444
-   * Account_analytic_default : Analytic Account value set from picking,sale
-   * account_analytic_default: now it will make entry in anayltic account on invoice line when picking done
- * https://launchpad.net/bugs/395160
-   * Project_timesheet : Analytic line creation/edition takes user based information
- * https://launchpad.net/bugs/425671
-   * Stock : Moves offer onchange on UOM to affect UOS
- * https://launchpad.net/bugs/489083
-   * Account :customer refund was displaying supplier invoice view, corrected
- * https://launchpad.net/bugs/499038
-   * CRM_profiling : Segmentation form was missing one field
- * https://launchpad.net/bugs/496991
-   * HR_Timesheet_sheet : timesheet cannot be deleted which have attendance entries encoded
- * https://launchpad.net/bugs/507638
-   * Account : General Ledger report corrected for debit/credit if 0
- * https://launchpad.net/bugs/461801
-   * Sale : Workflow behaviour fixed when order is set to draft
- * https://launchpad.net/bugs/516361
-   * POS : for Invoice created from POS,Consistency should be maintained as SO.
- * https://launchpad.net/bugs/439027
-   * MRP :Arguemnt of context was missing
- * https://launchpad.net/bugs/490342
-   * Account : making the default_get() eTiny compatible
- * https://launchpad.net/bugs/504824
-   * account: credit/debit/balance of consolidated accounts
- * https://launchpad.net/bugs/522632
-   * Sale : Sale order list view should have sum attribute
- * https://launchpad.net/bugs/435178
-   * [CRITICAL]subscription: crash subscription process
- * https://launchpad.net/bugs/522161
-   * base_module_quality: speed_test
- * https://launchpad.net/bugs/487091
-   * Stock :Invoice created from manual picking might miss UoS.
- * https://launchpad.net/bugs/379581
-   * Base_report_creator: Export of custom reports made working
- * https://launchpad.net/bugs/479195
-   * Base_vat : Romania VAT validation corrected
- * https://launchpad.net/bugs/436008
-   * Sale: Passing Contact address for invoices from SO
- * https://launchpad.net/bugs/443069
-   * Project: wrong domain for 'Tasks in Progress' menuitem
- * https://launchpad.net/bugs/518824
-   * Project : 100% completed project should dislay proper message on Gantt chart,instead of getting failed
- * https://launchpad.net/bugs/471052
-   * Product : Pricelist Item cannot use Main pricelist as the other pricelist
- * https://launchpad.net/bugs/458030
-   * Account : Ledger Report Landscape report adjusted for A4.
- * https://launchpad.net/bugs/495933
-   * Account : Made amount field of account.move searchable
- * https://launchpad.net/bugs/440248
-   * Hr_timesheet_invoice : Line once invoiced,should not be invoiced again
- * https://launchpad.net/bugs/491241
-   * Stock : Removal of picking shuold affect product stock
- * https://launchpad.net/bugs/510604
-   * Account: Sequence and main seq. should be different
- * https://launchpad.net/bugs/436651
-   * mrp : workcentre load report had a query malformed
-
-
-Improvements (addons)
----------------------
-
- * Update Translations
- * Don't specify default value for dict, that return None if value doesn't exists
- * Account_payment: showing account feild on move line when importing invoice for payment
- * Account/base_iban : bank and iban displayed on list view of O2M to partner
- * MRP : BOM structure report should follow hierarchy.
- * event_project: change the string on event object all task to remaining task and put the domain on retro planning wizard(open only projects with state=template)
- * Account : Reference allocation to move/move.line improved
- * Launchpad export translation files
- * Added GNU licence
- * Unit Test cases for Sale
- * unit test in base quality module
- * MRP : mrp.routing.workcenter made deletable on cascade effect
- * Account : Entry Line action Name Improved
- * Stock : Improved names of Stock move tree view
- * account: make comment mandatory. Since it has a default value anyway, it doesn't reall y change anything, but makes the reconciliation UI looks consistent accross the whole OpenERP (eg invoice payment)
- * Add support of analytic account into bank statement to be convenient with other method
- * Add account field into bank statement line
- * better python2.5/2.6 compatibility handling
- * base_module_quality: styles on different tests
- * base_module_quality: modify all tests result display for buildpot, use class on tag instead of css file
- * base_module_quality: pylint test result display for buildpot, use class on tag instead of css file
-
-
-2009-09-22: 5.0.6
-=================
-
-Bugfixes (server)
------------------
-
- * https://launchpad.net/bugs/421904
-   * Fields.function : Store value computation corrected
- * https://launchpad.net/bugs/407332
-   * Price Accuracy : rounding made to be based on --price_accuracy option
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * fixed an "unsupported operand type(s) for +: 'bool' and 'str'" error.
-   * Sale_delivery_report : Delivery order report should take shipping address from picking itself
-   * account: bugfixed the fiscalyear closing wizard:
-   * Purchase_manual : certificate on terp displayed wrong value
- * https://launchpad.net/bugs/431864
-   * hr_timesheet_sheet : casting correction for a view
- * https://launchpad.net/bugs/431871
-   * Account : Move line creation was giving encoding error while automated entries were inserted,corrected
- * https://launchpad.net/bugs/433979
-   * [CRITICAL]document: crash list of directory after rev:hmo@tinyerp.com-20090916110722-4kl5t5q71im6c76i
- * https://launchpad.net/bugs/407332
-   * Account : Rounding problem based on price_accuracy
- * https://launchpad.net/bugs/419720
-   * Sale : Delivery Date delay computation made corrected when days are passed with fractions
- * https://launchpad.net/bugs/423726
-   * Sale : SO Boolean field picked behavior corrected
- * https://launchpad.net/bugs/431821
-   * Account_followup : Sending email while sending follow up corrected.
-
-
-Improvements (addons)
----------------------
-
- * purchase_manual: do not redefine view: add fields by inheritance...
- * purchase: improve views to be directly usable in portals...
-
-
-2009-09-17: 5.0.5
-=================
-
-Bugfixes (server)
------------------
-
- * Not linked to a bug report:
-   * quality_integration_server: fixe problem on make link of extra-module in addons
-   * quality_integration_server : quality log : reduce overwrite last test log in other test logs
-   * base : ir_cron : take minimun next_call from database for job waiting. if database does not has any job, it will take 1 day for job waiting
-   * quality_integration_server: get message from base_quality_module if module can not success to reach minimun score
-   * regression in fields.function computation
-   * better log error, new line
-   * Report: context was missing while printing any report with header in a non-English Language
-   * quality_integration_server: fixe problem on make link of extra-module in addons
- * https://launchpad.net/bugs/425131
-   * Better translation exportation.
- * https://launchpad.net/bugs/379645
-   * Print screen : Correction when text for report is already encoded
- * https://launchpad.net/bugs/421162
-   * Send Mail : Unicode error handled
-   * Send mail : Non-English characters were throwing error.
- * https://launchpad.net/bugs/421137
-   * Base : 'Supplier Partners' menu will open new record with supplier=1,customer=0
- * https://launchpad.net/bugs/425430
-   * Export : Error solved while Exporting O2M records with None value of any field
- * https://launchpad.net/bugs/399208
-   * Translation issue with cache: it needed to restart server,SOLVED
- * https://launchpad.net/bugs/422563
-   * Security Loophole corrected
-
-
-Improvements (server)
----------------------
-
- * quality_integration_server: make link of extra-addons module in addons module automatic on install-module command
- * quality_integration_server: get message from base_quality_module if module can not success to reach minimun score
- * Rng : Accepting Groups under/after/replacing Buttons
- * quality_integration_server : quality html log
- * quality_integration_server: put max_limit in server connection
- * Base : Rate for ARS Added
- * cchange version number
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * Purchase_manual : certificate on terp displayed wrong value
-   * fix the problem of message depending on the partner language
-   * fix a problem for the overdue payment message
-   * fix problem to get the detault message
-   * #416908 computation of invoice lines
-   * Project : Taks hours computed accurately.
-   * base_module_record: avoid duplications
-   * document: do not try to index binary documents
-   * +1 on the lengthmonth returns was too much, removed it
-   * Problem when using hr_holidays Summary Report when entering date 1 jan 2009 for example.
-   * multi currency reconciliations on bank statements weren't properly displayed
-   * multi currency payments weren't correctly computed on invoice's residual amount
-   * Project_gtd : Demo data defined for tasks(inboxes)
-   * Module:product Added report tag for product pricelist reportso that it can be modified using OODesigner
-   * Document : error on create if attachment not specified
- * https://launchpad.net/bugs/422401
-   * project_gtd : timebox field re-arranged
- * https://launchpad.net/bugs/421907
-   * Account : Aged Partner Balance report for Future analysis corrected
- * https://launchpad.net/bugs/427388
-   * Project : task work behavior towards task hours corrected
- * https://launchpad.net/bugs/422408
-   * Project_gtd : Hierarchical timeboxes allowed to open
- * https://launchpad.net/bugs/403972
-   * Account : Reports from Chart of Accounts were not considering contextual value of MOVE(draft,posted)
- * https://launchpad.net/bugs/430577
-   * Sale : Order Lines switches view from tree,form and view
- * https://launchpad.net/bugs/425257
-   * Project_gtd : improved menuitems names to avoid user confusion,domain improved
- * https://launchpad.net/bugs/422078
-   * Account_tax_include : floatdivision error corrected
- * https://launchpad.net/bugs/423585
- * https://launchpad.net/bugs/423581
- * https://launchpad.net/bugs/416807
-   * report_document : Dashboard should not display partner with no files
- * https://launchpad.net/bugs/430522
- * https://launchpad.net/bugs/424214
-   * Account :Residual amount unclear when used with partial payments.
- * https://launchpad.net/bugs/424177
-   * hr_timesheet_sheet : Rounding value problem in float_time widget
- * https://launchpad.net/bugs/415056
- * https://launchpad.net/bugs/421636
-   * added tooltip on tax and payment term
- * https://launchpad.net/bugs/407290
- * https://launchpad.net/bugs/407293
-   * Account : Making account.invoice.tax field language-depenant from account.tax
- * https://launchpad.net/bugs/430043
-   * Hr_timesheet_invoice : Query calculation corrected
- * https://launchpad.net/bugs/379645
-   * Base_report_creator : Print screen report is now available for custom reports
- * https://launchpad.net/bugs/423260
-   * Account : Title of of Move Line widnows renamed
- * https://launchpad.net/bugs/427982
-   * hr_timesheet_invoice : Invoicing analytic entries wizard corrected for product
- * https://launchpad.net/bugs/426243
-   * Account : Context was missing in report
- * https://launchpad.net/bugs/426831
-   * l10n_ch : default_value() of res.partner.bank corrected
- * https://launchpad.net/bugs/430098
-   * Hr_holidays : Workflow actions validations corrected
- * https://launchpad.net/bugs/430516
- * https://launchpad.net/bugs/379191
-   * its better to aply the patch
-   * fix the problem for related fields, related fields act as a many2one fields
- * https://launchpad.net/bugs/429203
-   * CRM : Mailgate script used default uid=3 instead of 1
- * https://launchpad.net/bugs/399817
-   * Fixed Partial deliveries problem
-
-
-Improvements (addons)
----------------------
-
- * Invoice Supplier Control per line/manual
- * add missing file for the followup date
- * changed interval CRM calls to 4 hours instead of one -> efficient connection pooling with cron
- * add inherited view for company
- * add new filed to company object which will store the mesages
- * add new data file which will add over due payment message to company
- * Account : Analytic Account report following parental relationship approach(account with all its children
- * hr_timesheet_invoice : Misleading string on invoice analytic entries' wizard
- * base_module_quality: remove certificate tag from terp test
- * report_dcoument : changed the misleading name of action
-
-
-2009-08-28: 5.0.4
-=================
-
-Bugfixes (server)
------------------
-
- * Not linked to a bug report:
-   * no traceback when access denied
-   * Security fix
-   * remove bad translation files (bad name)
-   * Pagecount problem while all objects print on same page and printing special character on xsl report
- * https://launchpad.net/bugs/415973
-   * import: support "<rel_field>:db_id" , better warning message
- * https://launchpad.net/bugs/415391
-   * Functional fields with M2O relation can be printed on print screen now
- * https://launchpad.net/bugs/415334
-   * ir_cron :function and its arguements are now editable
-
-
-Improvements (server)
----------------------
-
- * replace partner name and address in demo
- * add translation names
- * update translations files
- * new translations
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * Document : error on create if attachment not specified
-   * report_dcoument : changed the misleading name of action
-   * point_of_sale: fixed a wrong domain
-   * sale: bad indentation
- * https://launchpad.net/bugs/416807
-   * report_document : Dashboard should not display partner with no files
- * https://launchpad.net/bugs/401110
-   * Audittrail : Logs set in descending order
- * https://launchpad.net/bugs/418541
-   * Project : Delegated tasks from O2M didnt have project_id
- * https://launchpad.net/bugs/416767
-   * Account_tax_include : onchange of product on invoice line price type issue
-
-
-Improvements (addons)
----------------------
-
- * update translations
- * base_module_quality: make minimal score for all test, add message if the score is below limit,varible for whether to activate the test or not
- * process view node now links to parent document directory if no record selected.
- * purchase: Merge purchases wizard: added keyword='client_action_multi'
- * Auction : improved code
- * Auction : improved auction reports
- * Age Partner Balance report executed 7 queries per partner, reduced this a total of 7 queries in total.
-
-
-2009-08-21: 5.0.3
-=================
-
-Bugfixes (server)
------------------
-
- * Not linked to a bug report:
-   * set_alarm: removed unwanted comment
-   * report engine: context argument was passed at a wrong position. Now it's passed as a named argument.
-   * fields_get check access aginst write or create access
-   * Not allowing only white spaces text to be printed
-   * sequences: avoid an sql error when locking table...
-   * report engine: fixed a bug when the xml tag is empty
-   * bin/workflow: 'stack' variable was not initialized when sql query returned an empty set.
-   * security issue: avoid access to inactive users
-   * security issue: avoid access with 'None' password (Thanks to P. Christeas for the bug report)
-   * avoid a bug when look in stack when translate code strings
- * https://launchpad.net/bugs/415257
-   * import of boolean fields in csv files.
- * https://launchpad.net/bugs/415014
-   * correct translation tgz archive creation
- * https://launchpad.net/bugs/362280
- * https://launchpad.net/bugs/416883
-   * Print screen unicode-decode error solved
- * https://launchpad.net/bugs/400378
-   * partner address search
- * https://launchpad.net/bugs/415972
-   * do not get next sequence in its own cursor
- * https://launchpad.net/bugs/413484
-   * Print Screen :  was not considering field names with superscripted,subscripted characters(ex.m²)
- * https://launchpad.net/bugs/406945
-   * import of boolean fields in csv files.
- * https://launchpad.net/bugs/413586
-   * bug in cache system that altered some arguments passed to cached function
- * https://launchpad.net/bugs/413594
-   * logger: convert the message in unicode before concatenate it with server environment
- * https://launchpad.net/bugs/348217
-   * Secure option on config file
-
-
-Improvements (server)
----------------------
-
- * Makefile and quality_integration_server module for Integration server
- * Speed impprovement: 2x faster for flow: sale -> invoice -> payment
- * Speed improvement in creation of records (4 time faster on partners)
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * Purchase :copy method was not setting stock moves to be null for PO lines
-   * Module:account Fix keyerror in general_ledger report
-   * Access rules stock / worker
-   * mrp: fr_FR.po file had a duplicate message definition
- * https://launchpad.net/bugs/413699
- * https://launchpad.net/bugs/415014
-   * report_task: regenerate translations files
- * https://launchpad.net/bugs/397100
-   * improving commit on report
- * https://launchpad.net/bugs/416296
-   * Base_setup : Country passed in  values only if filled
- * https://launchpad.net/bugs/415218
-   * report_task : report_task_user_pipeline_open was having no uniqueness
-
-
-Improvements (addons)
----------------------
-
- * POS: improved the point_of_sale receipt
-
-
-
-2009-08-12: 5.0.2
-=================
-
-Bugfixes (server)
------------------
-
- * Not Linked to a bug report:
-   * ensure sys is imported
-   * pass the context to check method of 'ir.model.access'
-   * increase size of field "name" of ir.model.data
-   * Corrected bug of expression calculation in previous commit
-   * sql expression: in search, add the time part to datetime field when it's not present
-   * setup.py: py2exe now adds 'zoneinfo' directory in library.zip
-   * Importation problem corrected for unicode.
-   * missing Import
-   * tools.amount_to_text_en: now displays cents
-   * size miss match for page and frame
-   * removed report etree warning of len
-   * security on wokflows bugfixed. The security has to be checked using the current uid, not the one that created the workflow instance!
-   * export window : use context for import compatable option in pass argument instend of added new argemenent
-   * py2exe: pytz on win32: 'zoneinfo' directory now included in library.zip
-   * module installation through -i module -d db --without-demo option corrected
-   * loading module sequence while creating new database
-   * Expression calculation(Query making) corrected for Translateable field
-   * CSV Export : null values handled
-   * sxw and odt reports
-   * Fixed odt2odt reports printing
-   * module:base made name field translatable in action.server (ref:mga)
-   * supply password problem with pg_dump, pg_restore on win32
-   * User with blank password(if so) allowed to log in.
-   * avoid required parameters rule (domain_force)
-   * Fixed oldxml at  python2.6 for Ubuntu 8.0.4,9.04
-   * fix missing tail process and skip unnecessary whitespace characters
-   * ir_attachment preview method corrected
-   * launch signal after action in workflows
-   * Added PageCount tag in report engine
-   * report engine, better spacings -> like preceeding version
-   * fix &,<,> problem for html2html-url report
-   * fix &,<,> problem for html2html report
-   * xml: the tag <delete> delete also the reference to the deleted objects into ir_model_data
-   * translation export: catch the case when a object does not exists in database
-   * browse_record: raise a better exception when the id doesn't exists
-   * Bugfix translations and float/int format in reports
-   * Complete rng files
-   * load the module graph even if it containt only "base"
-   * remove base_setup (moving base_setup to server was a workaround)
-   * expression: correct the generated sql in case of _inherits
-   * the <delete> tag doesn't crash if the referenced id does not exists
-   * closed file pointer
- * https://launchpad.net/bugs/380221
- * https://launchpad.net/bugs/403652
- * https://launchpad.net/bugs/369947
- * https://launchpad.net/bugs/371496
- * https://launchpad.net/bugs/371768
-   * bad tooltip
- * https://launchpad.net/bugs/383938
-   * Mass mailing wizard has a mail body now.
- * https://launchpad.net/bugs/409709
-   * Error reporting : library error corrected
- * https://launchpad.net/bugs/394876
-   * Import : context provided for language translation
- * https://launchpad.net/bugs/390167
-   * Custom report : sorted X-axis values
- * https://launchpad.net/bugs/405921
-   * Expression calculation for Datetime Corrected
- * https://launchpad.net/bugs/393858
-   * ir_model_data : SQL_Constraint failure covered
- * https://launchpad.net/bugs/396955
-   * disallow the deletion of records set as default properties
-   * properties reset to default one correctly
- * https://launchpad.net/bugs/399685
-   * Added sql_constraint on adding field having size<1
- * https://launchpad.net/bugs/385544
-   * ir_translation : corrected entry insertion when adding translation
- * https://launchpad.net/bugs/392187
-   * xml encoding in header for &.<.>
- * https://launchpad.net/bugs/310918
-   * RuntimeError in the cache system
- * https://launchpad.net/bugs/362280
-   * _inherits was misbehaving on search
- * https://launchpad.net/bugs/385299
-   * Report Engine Regression
-   * Report Engine regression
- * https://launchpad.net/bugs/407637
-   * Print screen now displays the report as per WYSIWYG
- * https://launchpad.net/bugs/408550
-   * default_xxx in context was passed to relational fields,corrected.
- * https://launchpad.net/bugs/385297
-   * bug in report engine
- * https://launchpad.net/bugs/381204
-   * Character Truncation problem on updation solved
- * https://launchpad.net/bugs/355491
-   * CSV Import : Accepting 'Value' of selection field from[(key,value)]
- * https://launchpad.net/bugs/409343
-   * Login : Login and password accepting accented characters
- * https://launchpad.net/bugs/376945
-   * Translation : Text with prefix '_' from py files included for exports.
- * https://launchpad.net/bugs/385664
-   * Account Module : Typo corrected
- * https://launchpad.net/bugs/405721
-   * DB operations(backup,restore) process corrected,were blocked if db_port was supplied
- * https://launchpad.net/bugs/410186
- * https://launchpad.net/bugs/355493
-   * SQL Constraint failure error on particular record while importing
- * https://launchpad.net/bugs/392052
-   * Certificate in non-digit format will not be accepted
- * https://launchpad.net/bugs/357045
-   * upgrade doesn't try to delete modules
- * https://launchpad.net/bugs/404733
-   * ir_model : context key deletion
- * https://launchpad.net/bugs/386273
-   * fields.related (m2o poiting to M2M/O2M should be skipped during write.
- * https://launchpad.net/bugs/406489
-   * Accented characters are displayed on footer now
- * https://launchpad.net/bugs/409861
-   * Context passed on copy()
- * https://launchpad.net/bugs/389795
-   * Property : Removed old referenced values from property
- * https://launchpad.net/bugs/384959
-   * ORM: Defult_field name in context belongs to curent object only, not to its relationals anymore
- * https://launchpad.net/bugs/399811
-   * Print screen reports will behave acc. to locale for date,datetime
- * https://launchpad.net/bugs/357945
-   * Export will consider float values as float and char as char
- * https://launchpad.net/bugs/406945
-   * Importation problem for bool fields corrected
- * https://launchpad.net/bugs/382352
-   * GIF image is previewed
-
-
-Improvements (server)
----------------------
-
- * Logger notification improved
- * update po(t) files
- * new method that allow the server to return a message that will be display on login page
- * import/export : added Database ID, ID
- * attributes of barcode
- * ir_model_data: convert assert to sql constraint + exception
- * Added new function called get_environment which will return the current environment of the System on which user is using OpenERP
- * better error message
- * added style for the url which are as text
- * new method "exists" that verify that a given id exists in database (or in memory for osv_memory objects)
- * maintenance: complete the remarks with the database name
- * email_send: when debuging, output to the logger
-
-
-Bugfixes (addons)
------------------
-
- * Not linked to a bug report:
-   * DMS directory not translatable + translations improvement
-   * Project : Searching active=no was failing, corrected
-   * problem with ncftp client
-   * stock_move auto_init function override but not return super clas result
-   * partner wasn't mandatory on sale_order, which lead to problems everywhere (stocks, shippings...) if a partner with sales was deleted. Added required=True on it to set the database field as 'not null'
-   * Product : Pricelist report corrected for suitable columns
-   * Stock : default value calculation corrected for stock move
-   * product price was wrong when margin is not set
-   * handle context when it equals None
-   * Product : Pricelist report corrected
-   * module:base_module_record fixed unicode string problem
-   * state name modified for the method - close
-   * explicit type cast for report.attendance
-   * explicit type cast
-   * module:account_voucher added confition for opening balance
-   * document: set default address to '' instead of 'localhost'
-   * fix ftp host address on Windows Vista
-   * document: better ip address detection (especially on win32)
-   * product: po file had duplicates
-   * sale_crm: typo in module description
-   * point_of_sale: if pickings are split because the sale order is not complete, invoices could not be created
-   * sale, stock: wrong translation
-   * point_of_sale: salesman_id: defaults to connected user
-   * point_of_sale: partner should be copied when creating a refund
-   * price unit calculation from context (web client issue).
-   * file attachment bug in x_object
-   * variants with extra on product list view
-   * [point_of_sale] security was not set for config/default_journal menu and pos.config.journal object
-   * fixed a bug when trying to search lines between 2 dates.
-   * on very big data, the query was way too long to execute. Speed is now greatly improved.
-   * point_of_sale: Sales of the day menu did not worked because the query did not matched any lines
-   * account: create move lines with date provide in wizard (bug reported by Alexis Deméaulte)
-   * Scheduler fix, introduced 5 days ago
-   * Translated Absences by Leaves
-   * multi-company modifs
-   * Account : Taxes Report Corrected
-   * Module: scrum,stock create task wizard in scrum and unreceived product wizard create new entry in stock
-   * typo
-   * general ledget report wizard (missing a field in view).
-   * soldeinit problem
-   * point_of_sale (receipt report): User and Date was lost
-   * changed size of receipt to fit cash register
-   * point_of_sale: invoice report should use the account.invoice object
-   * base_module_record: avoid a crash when calling a method with less than 6 arguments
-   * point_of_sale
-   * hr_holidays: wrong character in po files
-   * event: wrong character in po files
-   * work order orders
-   * stock value computation
-   * analytic account on advance invoices
-   * Analytic Analysis Stats
-   * layout of general ledger landscape
-   * bugfix in lot assignation on moves, bad signature
-   * hr_timesheet_invoice module : account_analytic_profit report sxw file--author-name= vra
-   * hr_timesheet_invoice module : account_analytic_profit report --author-name= vra
-   * crm rule : watcher email
-   * fix bug on crm rule to put proper wacher email
-   * Bug of referencing variable on split in production lot
-   * new cases should be created with the 'draft' state.
-   * account_balance Module : Fix the Total problem and Put Indentation in Reports.C
-   * onchange of product_id on stock move corrected
-   * correct display of pyflakes result quality module
- * https://launchpad.net/bugs/310458
-   * Simplify Migrations
- * https://launchpad.net/bugs/382641
-   * _get_stock corrected
- * https://launchpad.net/bugs/382000
-   * remove except block from try..finally whioch is not supported in python2.4
- * https://launchpad.net/bugs/379767
-   * Base_report_creator :Corrected Add filter wizard(ref:ACH)
- * https://launchpad.net/bugs/373203
- * https://launchpad.net/bugs/388346
-   * l10n_ch module : Improved Code.
-   * l10n_ch : corrected default_value method
- * https://launchpad.net/bugs/399485
-   * point_of_sale : Pikcing display partner made from POS order.
- * https://launchpad.net/bugs/388438
-   * Report_task : Corrected malfunctioned .po files
- * https://launchpad.net/bugs/380480
- * https://launchpad.net/bugs/386297
-   * purchase module : order report.
-   * Purchase: Corrected report and translation
- * https://launchpad.net/bugs/356922
-   * Base_vat : VAT validation for Portugal,Bulgaria
- * https://launchpad.net/bugs/397100
-   * Acccount,Account_invoice_layout : Minor necessary changes.
- * https://launchpad.net/bugs/388347
-   * account_payment module : payment order report.
-   * account_payment : report corrected
- * https://launchpad.net/bugs/407241
-   * sum() in query was returning null,corrected
- * https://launchpad.net/bugs/387006
-   * Stock : context for address field on picking corrected
- * https://launchpad.net/bugs/364010
-   * base_vat :sweden vat validation corrected
- * https://launchpad.net/bugs/393798
-   * hr_timesheet_sheet : date interval corrected for attendances
- * https://launchpad.net/bugs/409337
- * https://launchpad.net/bugs/387029
-   * Account : Correction of search method arguements of account.analytic.line
- * https://launchpad.net/bugs/394277
-   * Purchase,Product :description of POL made widen,partner_ref changes
- * https://launchpad.net/bugs/394275
-   * Account : Charts of accounts - Tax reports corected
-   * Account : Charts of accounts - target move options corrected
- * https://launchpad.net/bugs/404155
-   * point_of_sale :Partner info available for move line from POS,only draft/cancelled POS lines can be deleted
- * https://launchpad.net/bugs/399824
-   * Sale : Weight field for SOL displayed
- * https://launchpad.net/bugs/393824
-   * report_task : .po files corrected
- * https://launchpad.net/bugs/394640
-   * Sale : sale order report corrected for translation
- * https://launchpad.net/bugs/386513
-   * Purchase : stock moves assigned to purchase line
- * https://launchpad.net/bugs/358302
-   * Account : Corrected bank journal code creation from template
- * https://launchpad.net/bugs/402263
-   * Account : Invoice Lines will not be grouped if there are different maturity dates
- * https://launchpad.net/bugs/394436
-   * Project : Xml record corrected for view
- * https://launchpad.net/bugs/398805
- * https://launchpad.net/bugs/338329
-   * availability of prodlot check when assigning a prodlot to a move: non optimal location_id control
- * https://launchpad.net/bugs/391673
-   * Account :'note' field on Fiscal position,added on invoice report
- * https://launchpad.net/bugs/391106
-   * Process : Corrected xml record
- * https://launchpad.net/bugs/405891
-   * Module:purchase corrected delay time in picking
- * https://launchpad.net/bugs/389540
-   * Account : Added Configuration wizard to make overdue payment report message configurable on company
- * https://launchpad.net/bugs/400210
-   * Stock : partial packign wizard values made translated
- * https://launchpad.net/bugs/377614
- * https://launchpad.net/bugs/406827
-   * CRM : Mailgate script improved to have as much information on History.
- * https://launchpad.net/bugs/404975
-   * document : create doc of any resource model with black name
- * https://launchpad.net/bugs/401184
-   * module base_module_record Fixed when object has _rec_name
- * https://launchpad.net/bugs/399642
- * https://launchpad.net/bugs/393756
-   * Sale : Removed unused code
- * https://launchpad.net/bugs/400326
-   * document : if name/dirname does not has value, dirname will be display like <objectname><id>
-   * document : use '=' operator instend of 'like' on serach directory nodes into DMS
- * https://launchpad.net/bugs/383940
-   * Document : Logging enabled for abstracted_fs
- * https://launchpad.net/bugs/403964
-   * STock : Locations structure wizard improved
-   * Stock: Location analysis wizard improved,date replaced by datetime field on wizard
- * https://launchpad.net/bugs/385664
-   * Account Module : Typo corrected
- * https://launchpad.net/bugs/380473
- * https://launchpad.net/bugs/376804
-   * account_analytic_analysis : Months sorted
- * https://launchpad.net/bugs/393840
-   * Account_tax_include corrected to resolve conflict with account_invoice_layout
- * https://launchpad.net/bugs/405441
-   * delivery : context passed on picking form view
- * https://launchpad.net/bugs/388901
-   * Product : Onchange on pricelist item corrected
- * https://launchpad.net/bugs/395173
-   * Account : Corrected journal check on move line creation
- * https://launchpad.net/bugs/388404
-   * report_crm,document_ics,account : Access Rules assigned
-   * Report_timesheet : Access rules
- * https://launchpad.net/bugs/396254
-   * Account : Cancelled invoice will not be listed under unpaid state
- * https://launchpad.net/bugs/404142
-   * point_of_sale :Partner info available for move line from POS,only draft/cancelled POS lines can be deleted
- * https://launchpad.net/bugs/410779
-   * Document : made uninstallable
- * https://launchpad.net/bugs/411469
-   * Wiki : Made uninstallable
- * https://launchpad.net/bugs/394733
- * https://launchpad.net/bugs/400093
-   * stock : Stock Valuation Entries Don't Adjust with UoM
- * https://launchpad.net/bugs/395046
-   * Product : Corrected template view
- * https://launchpad.net/bugs/407327
-   * CRM : Due to rules, duplicate watcher(CC) ids were entered.
- * https://launchpad.net/bugs/389015
-   * Project : Copy Method corrected
- * https://launchpad.net/bugs/411329
-   * module:mrp added on_change on bom_id for selecting routing
-
-
-Improvements (addons)
----------------------
-
- * update po(t) files
- * Module:account Api changes def _refund_cleanup_lines(self, lines): added cr,uid arguments
- * pyflakes test display result improve on base_module_quality
- * crm: allow to put case description in action mail
- * Account : Move line form view from MOVE shows date for better user readability
- * mrp: pep8
- * use inheritance instead of wrapping when changing behavior of services
- * Module:Purchase Api change in inv_line_create added cr,uid parameters
- * Improved views
- * base_module_quality : gives warning to the user if pylint or pyflakes not installed
- * stock: wizard_invoice_onshipping.py: pep8
- * add base_module_quality module
- * Sale : state name display corected
- * Directory structure is translated to the users preference language in FTP Client
- * reformated the wizard message
- * account: invoice view: hide some fields to non employee users (portal i.e.)
- * account_voucher : report voucher.
- * mrp module : bom_structure.
- * account module : Analytic reports.
- * stock module : picking report.
- * mrp Module : Production order report.
- * account module : Tax Report.
- * stock Module : reports.
- * sale_delivery_report Module : Report Changes.
- * event_certificate module : for Certificate report.
- * purchase Module : order report and revert Changes : sale order Report.
- * purchase,sale : order report.
- * stock module : report improvement.
- * stock,purchase module : report improvement.
- * account_balance module : Improved Landscape report.
- * account_balance Module : Report changes.
- * account_balance Module : Minor report Change.
- * account_balance Module : Modified reports.
- * point_of_sale: receipt report: better date formatting
- * point_of_sale: receipt report: Salesman instead of User
- * module:stock improved views
- * improved translations for crm_configuration
-
-
-
-2009-05-26: 5.0.1
-=================
-
-TODO
-
-2009-02-12: 5.0.0-3
-===================
-
-TODO
-
-2009-02-08: 5.0.0-2
-===================
-
-TODO
-
-2009-02-06: 5.0.0
-=================
-
-TODO
-
-2009-01-03: 5.0.0-rc3
-=====================
-
-TODO
-
-2008-12-22: 5.0.0-rc2
-=====================
-
-TODO
-
-2008-12-01: 5.0.0-rc1.1
-=======================
-
-TODO
-
-2008-11-28: 5.0.0-rc1
-=====================
-
-TODO
-
-2008-11-03: 5.0.0-alpha
-=======================
-
-TODO
-
diff --git a/history/Changelog-4.x b/history/Changelog-4.x
deleted file mode 100644
index d884fe8d391..00000000000
--- a/history/Changelog-4.x
+++ /dev/null
@@ -1,951 +0,0 @@
-4.2.1
-	Bugfixes
-	Fix context for source_count function
-	Create stock move on production for products without BOM lines
-	Add IBAN fields in bank view
-	Fix uninitialize variable in import data
-	Update due date on invoice when payment term change
-	Fix store on field function that have type many2one or one2one
-	Request summary must be truncate
-	Partner event name must be truncate
-	Remove parent field on partner contact view
-	Fix icon type on journal period
-	Remove exception on the size of char field
-	Fix reference on move line that comes from invoice (Customer != Supplier)
-	Add function search on sheet_id of timesheet_sheet
-	Don't return 0 for balance account if there is no fiscal year
-	Fix set to draft for expense, now really set to draft
-	Add product and partner in the recursive call of tax compute
-	Don't compute balance account for inactive account
-	Fix bad encoding in log message on report_sxw
-	Fix overdue report for refund lines
-	Don't start server in non secure mode if secure mode have been set
-	Fix default value of move line if move_id is not find
-	Fix _product_partner_ref for cannot concatenate 'str' and 'bool' objects
-	Add partner_id in the context of SO for browsing the product
-	Fix multi-tax code on invoice
-	Fix tax definition for Belgium chart
-	Remove compute debit/credit on inactive account
-	Fix the way the tax are rounded for invoice with tax included prices
-	Fix SO to use the right uom and price to create invoice
-	Fix on_chnage uos on SO to return the id not the browse record
-	Add condition on the button "Sending goods>Packing to be invoiced" to show
-		only customer packings
-	Fix zero division error when the quantity is zero on an invoice line
-	Fix duplicate timesheet line that have been invoiced
-	Fix invoice report for bad removeParentNode tag
-	Fix priority for product view
-	Fix tax line computation when encoding account lines manually
-	Fix refund supplier invoice to have the same journal
-	New chinese translation
-	Pass context to action_done on stock move
-	Add product_uom change on sale order line
-	Fix demo data for working time UOM
-	Fix _sheet function in timesheet_sheet when called with a list of non
-		unique id
-	Remove commit inside function validate on account move
-	Use one function to post account move
-	Fix computation of sale/purchase amount in segmentation module
-	Use standar uom converion in analytic lines
-	Add journal_id in context for account move line search in payment module
-	Fix wrong id used by pricelist based on partner form
-	Use partner reference from SO/PO for invoice name if there is one
-	Make analysis analytic module include child accounts
-
-4.2.0
-	Summary:
-		Add new view graph
-		REPORT_INTRASTAT: new module
-		KERNEL: add netrpc (speed improvement)
-		REPORT_STOCK: add report on stock by stock location and production lots
-		HR_TIMESHEET_INVOICE: add final invoice
-		MULTI_COMPANY_ACCOUNT: new module
-		ADD modules publication tools
-		KERNEL: add timezone
-		KERNEL: add concurnecy check
-		BASE: allow to specify many view_id in act_window
-		BASE: add ir.rules (acces base on record fields)
-		KERNEL: add search_count on objects
-		KERNEL: add assert tools (unit test)
-		KERNEL: improve workflow speed
-		KERNEL: move some modules to extra_addons
-	Bugfixes:
-		Fix pooler for multi-db
-		REPORT_ANALYTIC: new reports
-		BOARD_ACCOUNT: new dashboard for accountants
-		PURCHASE: allow multiple pickings for the same purchase order
-		STOCK: When refunding picking: confirm & Assign the newly generated picking
-		PRODUCT: add average price
-		STOCK: Fix workflow for stock
-		TOOLS: Fix export translate for wizard
-		KERNEL: add id in import_data
-		BASE: add history rate to currency
-		ACCOUNT: partner_id is now required for an invoice
-		HR_TIMESHEET: add exception if employee haven't product
-		I18N: new fr_CH file
-		HR_EXPENSE: fix domain
-		ACCOUNT: Fix invoice with currency and payment term
-		ACCOUNT: Fix currency
-		KERNEL: add pidfile
-		ACCOUNT,PURCHASE,SALE: use partner lang for description
-		Model Acces: Unlink permission (delete) is now available
-		KERNEL: Remove set for python2.3
-		HR: add id to Attendance menu
-		PRODUCT: add dimension to packaging
-		ACCOUNT: new cash_discount on payment term
-		KERNEL: Add price accuracy
-		BASE: Function to remove installed modules
-		REPORT_SALE: fix for sale without line
-		PURCHASE: remove use of currency
-		KERNEL: fix set without values
-		PURCHASE: fix domain pricelist
-		INVOICE: use date for currency rate
-		KERNEL: Fix import many2many by id
-		KERNEL: run the cron
-		ACCOUNT: bank statment line now have a ref t othe corresponding invoice
-		ACCOUNT: Add possibilitty to include tax amount in base amount for the computation of the next taxes
-		ACCOUNT: Add product in tax compute python code
-		KERNEL: use reportlab 2.0
-		BASE: fix import the same lang
-		ACCOUNT: fix tax code
-		ACCOUNT: define tax account for invoice and refund
-		ACCOUNT: add supplier tax to product
-		ACCOUNT: don't overwrite tax_code on the creation for account line
-		PURCHASE: use partner code for report order
-		KERNEL: fix pooler netsvc for multi-db
-		TOOLS: add ref to function tag
-		PRODUCT: fix digits on volume and weight, add weight_net
-		ACCOUNT: split to new module account_cash_discount
-		ORM : error message on python constraints are now displayed correctly
-		ACCOUNT: add partner to tax compute context
-		KERNEL: improve logger
-		PROJECT: add check_recursion for project
-		HR_TIMESHEET_INVOICE: improve create invoice
-		ACCOUNT: add product_id to analytic line create by invoice
-		KERNEL: fix the inheritance mechanism
-		KERNEL: Fix use always basename for cvs file
-		BASE: fix IBAN len to 27
-		INVOICE: fix invoice number for analytic
-		REPORT: add replace tag for custom header
-		ACCOUNT: add ref to analytic line
-		BASE: prevent exception in ir_cron
-		SALE: fix uos for tax_amount
-		MRP: fix dbname in _procure_confirm
-		HR_EXPENSE: add domain to analytic_account
-		KERNEL: use 0 instead of False for fix on _fnct_read
-		SUBSCRIPTION: add required to model
-		HR_TIMESHEET: add rounding on report
-		SALE: Fix cancel invoice and recreate invoice, now cancel also the order lines
-		STOCK-DELIVERY: add wizard invoice_onshipping from delivery to stock
-		STOCK: use tax from sale for invoice
-		BASE: improve copy of res.partner
-		ACCOUNT: pay only invoice if not in state draft
-		REPORT: fix rml translation, translate before eval
-		PRODUCT_EXTENDED: don't use seller price for bom price
-		ACCOUNT_TAX_INCLUDE: fix right amount in account move generate with tax_include
-		BASE: improve workflow print
-		SALE: fix workflow error when create invoice from wizard
-		MRP: Use company currency for Product Cost Structure
-		BASE: prevent recursion in company
-		KERNEL: Fix deleted property and many2one
-		KERNEL: allow directory for import csv
-		KERNEL: add store option to fields function
-		ACCOUNT: use property_account_tax on on_change_product
-		KERNEL: add right-click for translate label
-		KERNEL: fix log of backtrace
-		KERNEL: fix search on xxx2many
-		BASE: use tool to call popen.pipe2
-		KERNEL: fix print workflow on win32
-		BASE: fix US states
-		KERNEL: use python 2.3 format_exception
-		ACCOUNT: add multi-company into base accounting
-		KERNEL: check return code for exec_pg_command_pipe
-		KERNEL: fix search with active args
-		KERNEL: improve _sql_contsraints, now insert if doesn't exist
-		KERNEL: remove old inheritor and add _constraints and _sql_constraints to the fields inherited
-		CRM: bugfix mailgate
-		PURCHASE: fix the UOM for purchase line and improve update price unit
-		ACCOUNT: new invoice view
-		KERNEL,BASE: allow to create zip modules
-		BASE: add right-to-left
-		KERNEL: copy now ignore technical values ('create_date', 'create_uid', 'write_date' and 'write_uid')
-		ACCOUNT_TAX_INCLUDE: Now the module manage correctly the case when the taxes defined on the product differ from the taxes defined on the invoice line
-		ALL: fix colspan 3 -> 4
-		KERNEL: use context for search
-		ACCOUNT: improve speed of analytic account
-		ACCOUNT: fix search debit/credit on partner
-		ACCOUNT: fix refund invoice if no product_id nor uos_id on lines
-		MRP: fix scheduler location of product to produce and method, date of automatic orderpoint
-		KERNEL: many2many : fix unlink and link action
-		MRP: add default product_uom from context and add link from product to bom
-		PROJECT: improve speed for function fields
-		ALL: remove bad act_window name
-		KERNEL: modification for compatibility with postgres 7.4
-		KERNEL: fix size for selection field
-		KERNEL: fix compatibility for python2.5
-		KERNEL: add new win32 build script
-		KERNEL: add test for duplicate report and wizard
-		ACCOUNT: force round amount fixed in payment term
-		KERNEL: fix print screen
-		CRM: Better ergonomy
-		SERVER: add sum tag on tree view that display sum of the selected lines
-		KERNEL: allow subfield query on one2many
-		KERNEL: fix create_date and write_date as there are timestamp now
-		SERVER: improve language
-		KERNEL: fix search on fields function of type one2many, many2many
-		ACCOUNT: fix pay invoice to use period
-		ACCOUNT: add check recursion in account.tax.code
-		MRP: fix compute cycle for workcenter
-		BASE: add constraint uniq module name
-		BASE: improve update module list
-		ACCOUNT: add round to last payment term
-		KERNEL: don't modify the args of the call
-		KERNEL: don't use mutable as default value in function defintion
-		KERNEL: fix orm for sql query with reserved words
-
-16/03/2007
-4.0.3
-	Summary:
-		Improve the migration scripts
-		Some bugfixes
-		Print workflow on win32 (with ghostscript)
-
-	Bugfixes:
-		BASE: Fix "set default value"
-		HR_TIMESHEET_INVOICE: Improve invoice on timesheet
-		ACCOUNT: Fix tax amount
-		KERNEL: correct the delete for property
-		PURCHASE: fix the journal for invoice created by PO
-		KERNEL: fix the migration for id removed
-		Add id to some menuitem
-		BASE: prevent exception in ir_cron when the DB is dropped
-		HR: Fix sign-in/sign-out, the user is now allowed to provide a date in
-			the future
-		SALE: fix uos for the tax amount
-		MRP: fix wrong dbname in _procure_confirm
-		HR_EXPENSE: add domain to analytic_account
-		ACCOUNT: fix debit_get
-		SUBSCRIPTION: model is required now
-		HR_TIMESHEET: add rounding value to report
-		SALE: Fix cancel and recreate invoice, now cancel also the order lines
-		STOCK: use the tax define in sale for the invoice
-		ACCOUNT: add test to pay only if invoice not in state draft
-		KERNEL: root have access to all records
-		REPORT: fix rml translation to translate before the eval
-		ACCOUNT_TAX_INCLUDE: Use the right amount in account mmove generate
-			with tax_include
-		BASE: Improve the workflow print
-		SALE: Fix workflow error when creating invoice from the wizard
-		PRODUCT_EXTENDED: don't use pricelist to compute standard price
-		MRP: Use company currency for product cost structure
-		KERNEL: fix where clause when deleting false items
-		ACCOUNT: product source account depend on the invoice type now
-		ACCOUNT: use the property account tax for the on_change_product
-		ACCOUNT: use the invoice date for the date of analytic line
-		ACCOUNT: Fix the pay invoice when multi-currency
-		HR_TIMESHEET_PROJECT: use the right product
-		STOCK: Fix to assign picking with product consumable and call the
-			workflow
-		STOCK: Fix the split lot production
-		PURCHASE: fix workflow for purchase with manual invoice to not set
-			invoice and paid
-		DELIVERY: can use any type of journal for invoice
-		KERNEL: fix search on xxx2many
-		ACCOUNT: add id to sequence record
-		KERNEL: set properly the demo flag for module installed
-		KERNEL: Fix print workflow on win32
-		LETTER: fix print letter
-
-	Migration:
-		Fix migration for postreSQL 7.4
-		Fix the default value of demo in module
-		Fix migration of account_uos to product_uos
-
-Wed Jan 17 15:06:07 CET 2007
-4.0.2
-	Summary:
-		Improve the migration
-		Some bugfixes
-		Improve tax
-
-	Bugfixes:
-		Fix tax for invoice, refund, etc
-		SALE: fix view priority
-		PURCHASE: wizard may crash on some data
-		BASE: Fix import the same lang
-		BASE: start the cron
-		PURCHASE: fix domain for pricelist
-		KERNEL: fix object set without values
-		REPORT_SALE: fix for sale without line
-		KERNEL: add pidfile
-		BASE: remove 'set' for python2.3 compliant
-	Migration:
-		Migrate hr_timesheet user_id
-
-Fri Dec 22 12:01:26 CET 2006
-4.0.1
-	Summary:
-		Improve the migration
-		Some bugfixes
-	
-	Bugfixes:
-		HR_EXPENSE: Fix domain
-		HR_TIMESHEET: Fix employee without product
-		TOOLS: Fix export translate
-		BASE: fix for concurrency of sequence number
-		MRP: fix report
-		CRM: fix graph report
-		KERNEL: fix instance of osv_pool
-		KERNEL: fix setup.py
-
-
-Mon Dec 4 18:01:55 CET 2006
-4.0.0
-	Summary:
-		Some bugfixes
-
-Tue Nov 28 14:44:20 CET 2006
-4.0.0-rc1
-	Summary:
-		This is a stable version (RC1) with lots of new features. Main
-		Improvements were:
-			Accounting: more functions, new modules, more stable
-			Much more better ergonomy
-			Lots of simplification to allows non IT people to use and
-				configure Tiny ERP: manage database, step by step configuration
-				menu, auto-installers, better help, ...
-
-	New:
-		Skill management module
-		ACCOUNT:
-			New and simpler bank statement form
-			New reports:
-				on Timesheets (analytic accounting)
-				Theorical revenue based on time spent
-				Global timesheet report by month
-				Chart of accounts
-			Different taxes methods supported
-				Gross (brut)
-				Net
-				Fixed amount
-		INVOICE:
-			invoice on shipping (manufacturing industry)
-			invoice on timesheet (services)
-		PURCHASE:
-			different invoicing control method (on order, on shipping,
-			manual)
-		Support of prices tax included /excluded in sales orders
-		New modules:
-			Sale_journal, stock_journal for bigger industries:
-				Divide works in different journals
-			New invoicing method from partner, to so, to picking
-				Daily, Monthly (grouped by partner or not)
-			New modules for prices with taxes included / excluded
-		New chart of accounts supported:
-			l10n_be/                     l10n_chart_be_frnl/
-			l10n_chart_id/               l10n_chart_uk/
-			l10n_ca-qc/                  l10n_chart_br/
-			l10n_chart_it/               l10n_chart_us_general/
-			l10n_ch/                     l10n_chart_ca_en/
-			l10n_chart_it_cc2424/        l10n_chart_us_manufacturing/
-			l10n_ch_pcpbl_association/   l10n_chart_ca_fr/
-			l10n_chart_la/               l10n_chart_us_service/
-			l10n_ch_pcpbl_independant/   l10n_chart_ch_german/
-			l10n_chart_nl/               l10n_chart_us_ucoa/
-			l10n_ch_pcpbl_menage/        l10n_chart_cn/
-			l10n_chart_nl_standard/      l10n_chart_us_ucoa_ez/
-			l10n_ch_pcpbl_plangen/       l10n_chart_cn_traditional/
-			l10n_chart_no/               l10n_chart_ve/
-			l10n_ch_pcpbl_plangensimpl/  l10n_chart_co/
-			l10n_chart_pa/               l10n_fr/
-			l10n_ch_vat_brut/            l10n_chart_cz/
-			l10n_chart_pl/               l10n_se/
-			l10n_ch_vat_forfait/         l10n_chart_da/
-			l10n_chart_sp/               l10n_simple/
-			l10n_ch_vat_net/             l10n_chart_de_datev_skr03/
-			l10n_chart_sw/
-			l10n_chart_at/               l10n_chart_de_skr03/
-			l10n_chart_sw_church/
-			l10n_chart_au/               l10n_chart_hu/
-			l10n_chart_sw_food/
-		Step by step configuration menu
-		Setup wizard on first connection
-			Select a company profile, auto-install language, demo data, ...
-
-	Imrovements:
-		KERNEL: Demo data improved
-			Better import / export system
-		KERNEL: Multi-database management system
-			Backup, Restore, Create, Drop from the client
-		PRODUCT/PRODUCT_EXTD: Eavily change the product form, use the new
-			object to compute the pricelist
-		REPORTS:
-			Better Sale order, purchase order, invocies and customers reports
-		ACCOUNT: Support of taxes in accounts
-			management of the VAT taxes for most european countries:
-				Support of VAT codes in invoices
-				Better computation of default values in accounting entries
-				Preferences in partners, override products
-			Bugfix when closing a fiscal year
-			Better ergonomy when writting entries
-		New Module Management System:
-			Install / Upgrade new modules directly from the client
-			Install new languages
-		KERNEL:
-			Ability to add select=True at the object level for postgresql indexes
-			Bugfix in search in some inherited objects
-			Added the ability to call methods from a browse object
-		KERNEL+BASE: changed the way the migration system works for menuitems:
-			now you can change a menuitem defined elsewhere. And this will work
-			whether that menuitem has an id or not (it use the name of the
-			menuitem to find it)
-		KERNEL:
-			Installing a module from the client
-		Better Windows Auto-Installer
-		DELIVERY:
-			Delivery and invoicing on picking list
-		KERNEL:
-			Distinction between active (by default) and installable
-		ACCOUNT/PROJECT: Added support for the type of invoicing
-		CRM:
-			eMAil gateway
-			Management of different departments and sections
-			Rule system
-		About 20 new statistics reporting
-		eCommerce interface:
-			Better Joomla (virtuemart, OSCommerce) support
-			Joomla is now fully functionnal
-
-	Bugfixes:
-		ACCOUNT: tree view on reporting analytic account
-		KERNEL: Fix the bug that happened when mixing active and child_of
-			search
-		KERNEL: Check for the existance of active when computing child_of
-		PRODUCT: production computation with different UoM
-
-------------------------------------------------------------------------
-
-Fri Oct  6 14:44:05 CEST 2006
-Server 3.4.2
-    Improvements:
-        BASE: changed workflow print system so that it handles inexisting 
-              workflows more gracefully (patch from Geoff Gardiner)
-        MRP: new view to take into account the orderpoint exceptions
-        MRP: made menu title more explicit
-
-    Bugfixes:
-        ACCOUNT: fixed typo in invoice + changed sxw file so that it is in 
-                 sync with the rml file
-        DELIVERY: fixed taxes on delivery line (patch from Brice Vissière)
-        PROJECT: skip tasks without user in Gantt charts (it crashed the report)
-        PRODUCT: fixed bug when no active pricelist version was found 
-        PRODUCT_EXTENDED: correct recursive computation of the price
-        SALE: get product price from price list even when quantity is set after
-              the product is set
-        STOCK: fixed partial picking
-
-    Packaging:
-        Changed migration script so that it works on PostgreSQL 7.4
-
-------------------------------------------------------------------------
-
-Tue Sep 12 15:10:31 CEST 2006
-Server 3.4.1
-    Bugfixes:
-        ACCOUNT: fixed a bug which prevented to reconcile posted moves.
-
-------------------------------------------------------------------------
-
-Mon Sep 11 16:12:10 CEST 2006
-Server 3.4.0 (changes since 3.3.0)
-    New modules:
-        ESALE_JOOMLA: integration with Joomla CMS 
-        HR_TIMESHEET_ICAL: import iCal to automatically complete timesheet 
-            based on outlook meetings
-        PARTNER_LDAP: adds partner synchronization with an LDAP server
-        SALE_REBATE: adds rebates to sale orders
-
-        4 new modules for reporting using postgresql views:
-        REPORT_CRM: reporting on CRM cases: by month, user, ...
-        REPORT_PROJECT: reporting on projects: tasks closed by project, user,
-                        month, ...
-        REPORT_PURCHASE: reporting on purchases
-        REPORT_SALE: reporting on sales by periods and by product, category of
-                     product, ...
-
-    New features:
-        KERNEL: Tiny ERP server and client may now communicate through HTTPS.
-                To launch the server with HTTPS, use the -S or --secure option
-                Note that if the server runs on HTTPS, the clients MUST connect
-                with the "secure" option checked.
-        KERNEL: the server can now run as a service on Windows
-        Printscreen function (Tree view print)
-        KERNEL: added a new --stop-after-init option which stops the server 
-                just before it starts listening
-        KERNEL: added support for a new forcecreate attribute on XML record 
-                fields: it is useful for records are in a data node marked as 
-                "noupdate" but the record still needs to be added if it doesn't
-                exit yet. The typical use for that is when you add a new record
-                to a noupdate file/node.
-        KERNEL: manage SQL constraints with human-readable error message on the
-                client side, eg: Unique constraints
-        KERNEL: added a new system to be able to specify the tooltip for each
-                field in the definition of the field (by using the new help="" 
-                attribute)
-        ACCOUNT: new report: aged trial balance system
-        ACCOUNT: added a wizard to pay an invoice from the invoice form
-        BASE: print on a module to print the reference guide using introspection
-        HR: added report on attendance errors
-        PRODUCT: products now support multi-Level variants
-
-    Improvements:
-        KERNEL: speed improvement in many parts of the system thanks to some
-                optimizations and a new caching system
-        KERNEL: New property system which replace the, now deprecated, ir_set 
-                system. This leads to better migration of properties, more
-                practical use of them (they can be used like normal fields), 
-                they can be translated, they are "multi-company aware", and 
-                you can specify access rights for them on a per field basis.
-        KERNEL: Under windows, the server looks for its configuration file in 
-                the "etc" sub directory (relative to the installation path). 
-                This was needed so that the server can be run as a windows 
-                service (using the SYSTEM profile).
-        KERNEL: added ability to import CSV files from the __terp__.py file
-        KERNEL: force freeing cursor when closing them, so that they are 
-                available again immediately and not when garbage collected.
-        KERNEL: automatically drop not null/required constraints from removed
-                fields (ie which are in the database but not in the object)
-        KERNEL: added a command-line option to specify which smtp server to use
-                to send emails.
-        KERNEL: made browse_record hashable
-        ALL: removed shortcuts for the demo user.
-        ACCOUNT: better invoice report
-        ACCOUNT: Modifs for account chart, removed old stock_income account type
-        ACCOUNT: made the test_paid method on invoices more tolerant to buggy 
-                 data (open invoices without move/movelines)
-        ACCOUNT: better bank statement reconciliation system
-        ACCOUNT: accounting entries encoding improved a lot (using journal)
-        ACCOUNT: Adding a date and max Qty field in analytic accounts for 
-                 support contract
-        ACCOUNT: Adding the View type to analytic account / cost account
-        ACCOUNT: changed test_paid so that the workflow works even if there is
-                 no move line
-        ACCOUNT: Cleanup credit/debit and balance computation methods. Should 
-                 be faster too.
-        ACCOUNT: use the normal sequence (from the journal) for the name of 
-                 moves generated from invoices instead of the longer name.
-        ACCOUNT: print Payment delay in invoices
-        ACCOUNT: account chart show subtotals
-        ACCOUNT: Subtotal in view accounts
-        ACCOUNT: Replaced some Typo: moves-> entries, Transaction -> entry
-        ACCOUNT: added quantities in analytic accounts view, and modified 
-                 cost ledger report for partners/customers
-        ACCOUNT: added default value for the currency field in invoices
-        ACCOUNT: added the comment/notes field on the invoice report
-        BASE: added menuitem (and action) to access partner functions (in the 
-              definitions menu)
-        BASE: better demo data
-        BASE: duplicating a menu item now duplicates its action and submenus
-        BASE: Bank Details on Partners
-        CRM: View on all actions made on cases (used by our ISO9002 customer 
-             to manage corrections to actions)
-        CRM: fixed wizard to create a sale order from a case
-        CRM: search on non active case, not desactivated by default
-        CRM: Case ID in fields with search
-        HR_TIMESHEET: new "sign_in, sign_out" using projects. It fills 
-                      timesheets and attendance at the same time.
-        HR_TIMESHEET: added cost unit to employee demo data
-        MRP: improvement in the scheduler
-        MRP: purchase order lines' description generated from a procurement
-             defaults to the product name instead of procurement name
-        MRP: Better traceability
-        MRP: Better view for procurement in exception
-        MRP: Added production delay in product forms. Use this delay for 
-             average production delay for one product
-        MRP: dates scheduler, better computation
-        MRP: added constraint for non 0 BoM lines
-        PRODUCT: Better pricelist system (on template or variant of product)
-        PRODUCT_EXTENDED: Compute the price only if there is a supplier
-        PROJECT: when a task is closed, use the task's customer to warn the 
-                 customer if it is set, otherwise use the project contact.
-        PROJECT: better system to automatically send an email to the customer 
-                 when a task is closed or reopened.
-        PURCHASE: date_planned <= current_time line in red
-        PURCHASE: better purchase order report
-        PURCHASE: better purchase order duplication: you can now duplicate non 
-                  draft purchase orders and the new one will become draft.
-        SALE: better sale order report
-        SALE: better demo data for sale orders
-        SALE: better view for buttons in sale.order
-        SALE: select product => description = product name instead of code
-        SALE: warehouse field in shop is now required
-        SCRUM: lots of improvements for better useability
-        STOCK: allows to confirm empty picking lists.
-        STOCK: speed up stock computation methods
-
-    Bugfixes:
-        KERNEL: fix a huge bug in the search method for objects involving 
-                "old-style" inheritance (inherits) which prevented some records
-                to be accessible in some cases. Most notable example was some 
-                products were not accessible in the sale order lines if you had
-                more products in your database than the limit of your search 
-                (80 by default).
-        KERNEL: fixed bug which caused OO (sxw) reports to behave badly (crash 
-                on Windows and not print correctly on Linux) when data 
-                contained XML entities (&, <, >)
-        KERNEL: reports are now fully concurrency compliant
-        KERNEL: fixed bug which caused menuitems without id to cause havoc on 
-                update. The menuitems themselves were not created (which is 
-                correct) but they created a bad "default" action for all 
-                menuitems without action (such as all "menu folders").
-        KERNEL: fix a small security issue: we should check the password of the 
-                user when a user asks for the result of a report (in addition 
-                to the user id and id of that report)
-        KERNEL: bugfix in view inheritancy
-        KERNEL: fixed duplicating resource with a state field whose selection 
-                doesn't contain a 'draft' value (for example project tasks). It
-                now uses the default value of the resource for that field.
-        KERNEL: fixed updating many2many fields using the (4, id) syntax
-        KERNEL: load/save the --logfile option correctly in the config file
-        KERNEL: fixed duplicating a resource with many2many fields
-        ALL: all properties should be inside a data tag with "noupdate" and
-             should have a forcecreate attribute.
-        ACCOUNT: fixed rounding bug in tax computation method
-        ACCOUNT: bugfix in balance and aged balance reports
-        ACCOUNT: fixing precision in function fields methods 
-        ACCOUNT: fixed creation of account move lines without using the client 
-                 interface
-        ACCOUNT: fixed duplicating invoices
-        ACCOUNT: fixed opening an invoices whose description contained non 
-                 ASCII chars at specific position
-        ACCOUNT: small bugfixes in all accounting reports
-        ACCOUNT: fixed crash when --without-demo due to missing payment.term
-        ACCOUNT: fixed bug in automatic reconciliation
-        ACCOUNT: pass the address to the tax computation method so that it is 
-                 available in the tax "python applicable code"
-        BASE: allows to delete a request which has a history (it now deletes the
-              history as well as the request)
-        BASE: override copy method for users so that we can duplicate them
-        BASE: fixed bug when the user search for a partner by hitting on an 
-              empty many2one field (it searched for a partner with ref=='')
-        BASE: making ir.sequence call thread-safe.
-        CRM: fixed a bug which introduced an invalid case state when closing a
-             case (Thanks to Leigh Willard)
-        HR: added domain to category tree view so that they are not displayed 
-            twice
-        HR_TIMESHEET: fixed print graph
-        HR_TIMESHEET: fixed printing timesheet report
-        HR_TIMESHEET: Remove a timesheet entry removes the analytic line
-        MRP: bugfix on "force reservation"
-        MRP: fixed bugs in some reports and MRP scheduler when a partner has 
-             no address
-        MRP: fix Force production button if no product available
-        MRP: when computing lots of procurements, the scheduler could raise 
-             locking error at the database level. Fixed.
-        PRODUCT: added missing context to compute product list price
-        PRODUCT: fixed field type of qty_available and virtual_available 
-                 (integer->float). This prevented these fields to be displayed
-                 in forms.
-        PROJECT: fixed the view of unassigned task (form and list) instead of 
-                 form only.
-        PURCHASE: fixed merging orders that made inventory errors when coming 
-                  from a procurement (orderpoint).
-        PURCHASE: fix bug which prevented to make a purchase order with 
-                  "manual" lines (ie without product)
-        PURCHASE: fix wizard to group purchase orders in several ways:
-            - only group orders if they are to the same location
-            - only group lines if they are the same except for qty and unit
-            - fix the workflow redirect method so that procurement are not 
-              canceled when we merge orders
-        SALE: fixed duplicating a confirmed sale order
-        SALE: fixed making sale orders with "manual" lines (without product)
-        STOCK: future stock prevision bugfix (for move when date_planned < now)
-        STOCK: better view for stock.move
-        STOCK: fixed partial pickings (waiting for a production)
-        Miscellaneous minor bugfixes
-
-    Packaging:
-        Fixed bug in setup.py which didn't copy csv files nor some sub-
-            directories
-        Added a script to migrate a 3.3.0 server to 3.4.0 (you should read the 
-            README file in doc/migrate/3.3.0-3.4.0)
-        Removed OsCommerce module
-
-------------------------------------------------------------------------
-
-Fri May 19 10:16:18 CEST 2006
-Server 3.3.0
-    New features:
-        NEW MODULE: hr_timesheet_project
-            Automatically maps projects and tasks to analytic account
-            So that hours spent closing tasks are automatically encoded
-        KERNEL: Added a logfile and a pidfile option (patch from Dan Horak)
-        STOCK: Added support for revisions of tracking numbers
-        STOCK: Added support for revision of production lots
-        STOCK: Added a "splitting and tracking lines" wizard
-        PRODUCT_EXTENDED: Added a method to compute the cost of a product
-                          automatically from the cost of its parts
-
-    Improvements:
-        ALL: Small improvements in wizards (order of buttons)
-        PRODUCT: Remove packaging info from supplierinfo
-        PROJECT: Better task view (moved unused fields to other tab)
-        SALE: Keep formating for sale order lines' notes in the sale order report
-
-    Bugfixes:
-        KERNEL: Fixed bug which caused field names with non ascii chars didn't work
-                in list mode on Windows
-        KERNEL: Fix concurrency issue with UpdatableStr with the use of 
-                threading.local
-        KERNEL: Removed browse_record __unicode__ method... It made the sale order
-                report crash when using product names with non ASCII characters
-        KERNEL: Fixed bug which caused the translation export to fail when the server 
-                was not launched from the directory its source is.
-        BASE: Updating a menuitem now takes care its parent menus
-        BASE: Fixed a cursor locking issue with updates
-        BASE: Fixed viewing sequence types as a tree/list
-        HR: Month field needs to be required in the "hours spent" report
-        PURCHASE: fixed group purchase order wizard:
-         - if there were orders from several different suppliers, it created a purchase
-           order for only the first supplier but canceled other orders, even those which
-           weren't merged in the created order (closes bugzilla #236)
-         - doesn't trash "manual" lines (ie lines with no product)
-         - pay attentions to unit factors when adding several lines together
-        MRP: fixed workcenter load report (prints only the selected workcenters) and 
-             does't crash if the user didn't select all workcenters
-        
-    Miscellaneous:
-        Removed pydot from required dependencies
-
-------------------------------------------------------------------------
-
-Server 3.3.0-rc1
-================
-
-Changelog for Users
--------------------
-
-New module: OS Commerce
-    Integration with Tiny ERP and OS Commerce
-    Synchronisation 100% automated with eSale;
-        Import of categories of products
-        Export of products (with photos support)
-        Import of Orders (with the eslae module)
-        Export of stock level
-        Import of OSCommerce Taxes
-    Multiple shop allowed with different rules/products
-    Simple Installation
-
-New Module: HR_TIMESHEET
-    Management by affair, timesheets creates analytic entries in the
-    accounting to get costs and revenue of each affairs. Affairs are
-    structured in trees.
-
-New Module: Account Follow Up
-    Multi-Level and configurable Follows ups for the accounting module
-
-New module; Productivity Analysis of users
-    A module to compare productivity of users of Tiny ERP
-    Generic module, you can compare everything (sales, products, partners,
-    ...)
-
-New Modules for localisations:
-    Accounting localisations for be, ca, fr, de, ch, sw
-    Fix: corrected encoding (latin1 to utf8) of Swedish account tree XML file
-
-New Module - Sandwich
-    Allows employees to order the lunch
-    Keeps employees preferences
-
-New Module TOOLS:
-    Email automatic importation/integration in the ERP
-
-New Module EDI:
-    Import of EDI sale orders
-    Export of shippings
-
-Multi-Company:
-    Tiny ERP is now fully multi-company !
-    New Company and configuration can be made in the client side.
-
-ACCOUNTING:
-    Better Entries > Standard Entries (Editable Tree, like in Excel)
-        Automatic creation of lines
-    Journal centralised or not
-        Counterpart of lines in one line or one counterpart per entry
-    Analytic accounting recoded from scratch
-        5 new reports
-        Completly integrated with:
-            production,
-            hr_timesheet > Management by affairs
-            sales & purchases,
-            Tasks.
-    Added unreconciliation functionnalities
-    Added account tree fast rendering
-    Better tax computation system supporting worldwide specific countries
-    Better subscription system
-    Wizard to close a period
-    Wizard to clase a fiscal year
-    Very powerfull, simple and complete multi-currency system
-        in pricelists, sale order, purchases, ...
-    Added required fields in currencies (currency code)
-    Added decimal support
-    Better search on accounts (on code, shortcut or name)
-    Added constraint;
-        on users
-        on group
-        on accounts in a journal
-    added menuitem for automatic reconciliation; Multi-Levels
-    added factor to analytic units
-    added form view for budget items dotations
-    made number of digits in quantity field of the budget spread wizard coherent with the object field
-    fixed journal on purchase invoices/refunds (SugarCRM #6)
-    Better bank statement reconciliation
-    Fixed some reports
-
-STOCK:
-    Better view for location (using localisation of locations; posx, posy, posz)
-
-MARKETING:
-    fixed small bug when a partner has no adress
-    state field of marketing partner set as readonly
-    fixed marketing steps form view
-    better history view
-    disabled completely send sms wizard
-    fixed send email wizard
-    good priority -> high priority
-    fixed 'call again later' button
-
-NETWORK:
-    added tree view for login/password
-
-HR:
-    added holiday_status (=type of ...) to expense claim form view
-
-BASE (partner):
-    fixed email_send and _email_send methods
-    removed partner without addresses from demo data
-    Added a date field in the partner form
-
-MRP:
-    New report: workcenter futur loads
-    Analytic entries when production done.
-    SCHEDULER: better error msg in the generated request
-    Allows services in BoMs (for eg, subcontracting)
-
-Project/Service Management:
-    create orders from tasks; bugfixes
-    Completly integrated with the rest of the ERP
-        Services can now be MTO/MTS, Buy (subcontracting), produce (task), ...
-        Services can be used anywhere (sale.order, bom, ...)
-    See this graph;
-        http://tiny.be/download/flux/flux_procurement.png
-    tasks sorted by ... AND id, so that the order is not random
-    within a priority
-
-Automatic translations of all wizards
-
-Scrum Project Management
-    Better Ergonomy; click on a sprint to view tasks
-    Planned, Effetive hours and progress in backlog, project and sprint
-    Better Burndown Chart computation
-    Better (simpler) view of tasks
-
-Better demo Data
-    In All modules, eth converted to english
-
-PRODUCT:
-    computing the weight of the packaging
-    Added last order date
-    Alternative suppliers (with delay, prefs, ...) for one product
-
-PRICELISTS:
-    much more powerfull system
-    views simplified
-    one pricelist per usage: sale, order, pvc
-    price_type on product_view
-    Multi-Currency pricelist (EUR pricelist can depend on a $ one)
-
-HR-TIMESHEET: fixed bugs in hours report:
-    sum all lines for the same day instead of displaying only the first one
-    it now uses the analytic unit factor, so that mixing hours and days has some sense
-    close cursor
-
-SALE:
-    invoices generated from a sale order are pre-computed (taxes are computed)
-
-    new invoicing functionnality;
-        invoice on order quantities or,
-        invoice on shipped quantities
-
-    Invoice on a sale.order or a sale.order.line
-
-    added default value for uos_qty in sale order lines (default to 1)
-
-
-Changelog for Developers
-------------------------
-
-New option --debug, that opens a python interpreter when an exception
-occurs on the server side.
-
-Better wizard system. Arguements self, cr, uid, context are passed in all
-functions of the wizard like normal objects. All wizards converted.
-
-Speed improvements in many views; partners, sale.order, ...
-    less requests from client to server when opening a form
-
-Better translation system, wizard terms are exported.
-
-Script to render module dependency graph
-
-KERNEL+ALL: pass context to methods computing a selection.
-
-Modification for actions and view definitions:
-    Actions Window:
-        New field: view_mode = 'tree,form' or 'form,tree' -> default='form,tree'
-        New role of view_type: tree (with shortcuts), form (others with switch button)
-    If you need a form that opens in list mode:
-        view_mode = 'tree,form' or 'tree'
-        view_type = form
-    You can define a view in a view (for example sale.order.line in
-    sale.order)
-        less requests on the client side, no need to define 2 views
-
-Better command-line option message
-
-Fixed bug which prevented to search for names using non ASCII
-chars in many2one or many2many fields
-
-Report Engine: bugfix for concurrency
-
-Support of SQL constraints
-    Uniq, check, ...
-    Good error message in the client side (check an account entry with
-    credit and debit >0)
-
-Fixed: when an exception was raised, the cursor wasn't closed and this
-could cause a freeze in some cases
-
-Sequence can contains code: %(year)s, ... for prefix, suffix
-    EX: ORDER %(year)/0005
-
-Bugfixes for automatic migration system
-
-bugfix on default value with creation of inherits
-
-Improvement in report_sxw; you can redefine preprocess to do some
-preprocessing before printing
-
-Barcode support enabled by default
-
-Fixed OpenOffice reports when the server is not launched from the
-directory the code reside
-
-Print workflow use a pipe instead of using a temporary file (now workflows
-works on Windows Servers)
-
-Inheritancy improved (multiple arguments: replace, inside, after, before)
-
-Lots of small bugfixes
-
diff --git a/history/Changelog-6.x b/history/Changelog-6.x
deleted file mode 100644
index 05b5f58217e..00000000000
--- a/history/Changelog-6.x
+++ /dev/null
@@ -1,10 +0,0 @@
-2010-07-XX: 6.0.0
-=================
-
-Improvements (server)
----------------------
-
- * support of 'ref' attribute for importing 'reference' field values, as for many2one fields.
- * experimental xml2yml script in /tools for conversion of XML data/test files to the new YAML format
-
-
diff --git a/history/INSTALL b/history/INSTALL
deleted file mode 100644
index 254b7e7b5a0..00000000000
--- a/history/INSTALL
+++ /dev/null
@@ -1,55 +0,0 @@
-OpenERP Quick Installation Guide
----------------------------------
-
-This file contains a quick guide to configure and install the OpenERP server.
-
-Required dependencies:
----------------------
-
-You need the following software installed:
-
-    * Python 2.5 or 2.6
-    * Postgresql 8.2 or above
-    * Psycopg2 python module 
-    * Reportlab pdf generation library for python
-    * lxml python module
-    * pytz python module
-    * PyYaml python module (install with: easy_install PyYaml)
-
-Some dependencies are only required for specific purposes:
-
-for rendering workflows graphs, you need:
-    * graphviz
-    * pyparsing
-
-For Luxembourg localization, you also need:
-    * pdftk (http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
-
-for generating reports using non .jpg images, you need:
-    * Python Imaging Library for python
-
-For Debian-based distributions, the required packages can be installed with the 
-following command:
-
-  #> apt-get install -y postgresql graphviz python-psycopg2 python-lxml python-tz python-imaging
-
-For Fedora 
-if they are not installed, install:
-python and postgresql
-
-uses yum or you can recover required packages on fedora web site in "core" or "extra" repository :
-postgresql-python
-python-lxml
-python-imaging
-python-psycopg2
-python-reportlab
-graphviz
-You can find pyparsing at http://pyparsing.sourceforge.net/ 
-
-1. Check that all the required dependencies are installed.
-
-2. Launch the program "python ./bin/openerp-server.py -r db_user -w db_password --db_host 127.0.0.1".
-See the man page for more information about options.
-
-3. Connect to the server using the GUI client. And follow the instructions to create a new database.
-
diff --git a/history/README.userchange b/history/README.userchange
deleted file mode 100644
index f6cc0ab0666..00000000000
--- a/history/README.userchange
+++ /dev/null
@@ -1,31 +0,0 @@
-Important note for OpenERP build >= 5.0.1-11xrg:
-
-THE USERNAME HAS CHANGED!!
-
-Former user "tinyerp" is now called "openerp".
-
-
-For that, you will have to make sure the following files are chowned
-to the new user:
-
-/var/log/openerp
-/var/spool/openerp
-/var/run/openerp
-/etc/openerp
-/etc/openerp/cert.cfg
-/etc/openerp-server.conf
-/etc/logrotate.d/openerp-server
-
-Then, rename the user in the postgres database:
-
- psql -U postgres postgres
- 
- ALTER ROLE tinyerp RENAME TO openerp;
- 
-Then, edit your openerp-server.conf to depict the change:
-- db_user = tinyerp
-+ db_user = openerp
-
-Good luck!
-
-
diff --git a/history/change-loglevel.sh b/history/change-loglevel.sh
deleted file mode 100755
index 88c8c1d0fe0..00000000000
--- a/history/change-loglevel.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-ADMIN_PASSWD='admin'
-method_1() {
-    cat '-' << EOF
-<xml>
-<methodCall>
-    <methodName>set_loglevel</methodName>
-    <params>
-        <param><value><string>$ADMIN_PASSWD</string></value>
-        </param>
-        <param>
-        <value><string>$1</string></value>
-        </param>
-    </params>
-</methodCall>
-EOF
-}
-LEVEL=10
-
-if [ -n "$1" ] ; then LEVEL=$1 ; fi
-
-method_1 $LEVEL | POST -c 'text/xml' http://localhost:8069/xmlrpc/common
-#eof
diff --git a/history/check_profile_l10n_all.py b/history/check_profile_l10n_all.py
deleted file mode 100644
index e7b391a942a..00000000000
--- a/history/check_profile_l10n_all.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-#
-# This script will automatically test all profiles, localisations and language
-# packs You must start the OpenERP server and not have a test database. You
-# may also have to change some data in the top of this file.
-#
-
-import xmlrpclib
-import time
-import base64
-
-url = 'http://localhost:8069/xmlrpc'
-profiles = [
-    'profile_accounting',
-    'profile_service',
-    'profile_manufacturing'
-]
-l10n_charts = [
-    'l10n_uk',
-    False,
-    'l10n_be',
-    'l10n_fr'
-]
-dbname = 'test'
-admin_passwd = 'admin'
-lang = False          # List of langs of False for all
-
-
-sock = xmlrpclib.ServerProxy(url+'/object')
-sock2 = xmlrpclib.ServerProxy(url+'/db')
-sock3 = xmlrpclib.ServerProxy(url+'/common')
-sock4 = xmlrpclib.ServerProxy(url+'/wizard')
-demos =  [True]
-
-langs = lang or (map(lambda x: x[0], sock2.list_lang()) + ['en_US'])
-
-def wait(id):
-    progress=0.0
-    while not progress==1.0:
-        time.sleep(3)
-        progress,users = sock2.get_progress(admin_passwd, id)
-        time.sleep(3)
-    return True
-
-def wizard_run(wizname, fieldvalues=None, endstate='end'):
-    if fieldvalues is None:
-        fieldvalues = {}
-    wiz_id = sock4.create(dbname, uid, 'admin', wizname)
-    state = 'init'
-    datas = {'form':{}}
-    while state!=endstate:
-        res = sock4.execute(dbname, uid, 'admin', wiz_id, datas, state, {})
-        if 'datas' in res:
-            datas['form'].update( res['datas'] )
-        if res['type']=='form':
-            for field in res['fields'].keys():
-                datas['form'][field] = res['fields'][field].get('value', False)
-            state = res['state'][-1][0]
-            datas['form'].update(fieldvalues)
-        elif res['type']=='state':
-            state = res['state']
-    return True
-
-for demo in demos:
-    for l10n in l10n_charts:
-        print 'Testing localisation', l10n, '...'
-        for prof in profiles:
-            print '\tTesting profile', prof, '...'
-            id = sock2.create(admin_passwd, dbname, demo, lang)
-            wait(id)
-            uid = sock3.login(dbname, 'admin','admin')
-
-            idprof = sock.execute(dbname, uid, 'admin', 'ir.module.module', 'search', [('name','=',prof)])
-            if l10n:
-                idl10n = sock.execute(dbname, uid, 'admin', 'ir.module.module', 'search', [('name','=',l10n)])
-            else:
-                idl10n = [-1]
-            wizard_run('base_setup.base_setup', {
-                'profile': idprof[0],
-                'charts': idl10n[0],
-            }, 'menu')
-            for lang in langs:
-                print '\t\tTesting Language', lang, '...'
-                wizard_run('module.lang.install', {'lang': lang})
-
-            ok = False
-            range = 4
-            while (not ok) and range:
-                try:
-                    time.sleep(2)
-                    id = sock2.drop(admin_passwd, dbname)
-                    ok = True
-                except:
-                    range -= 1
-            time.sleep(2)
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/clean-model.sql b/history/clean-model.sql
deleted file mode 100644
index 59b492aab2d..00000000000
--- a/history/clean-model.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-
-SELECT model, res_id, module FROM ir_model_data 
-	WHERE model = 'ir.actions.act_window' 
-	  AND NOT EXISTS (SELECT 1 FROM ir_act_window WHERE id = ir_model_data.res_id);
-
-
-SELECT model, res_id, module FROM ir_model_data 
-	WHERE model = 'ir.ui.menu' 
-	  AND NOT EXISTS (SELECT 1 FROM ir_ui_menu WHERE id = ir_model_data.res_id);
-
-SELECT model, res_id, module FROM ir_model_data 
-	WHERE model = 'ir.ui.view' 
-	  AND NOT EXISTS (SELECT 1 FROM ir_ui_view WHERE id = ir_model_data.res_id);
-
-DONT DELETE FROM ir_model_data 
-	WHERE model = 'ir.actions.act_window' 
-	  AND NOT EXISTS (SELECT 1 FROM ir_act_window WHERE id = ir_model_data.res_id);
-	  
-DONT DELETE FROM ir_model_data 
-	WHERE model = 'ir.ui.menu' 
-	  AND NOT EXISTS (SELECT 1 FROM ir_ui_menu WHERE id = ir_model_data.res_id);
--- Other cleanups:
--- DELETE from ir_model_data where module = 'audittrail' AND model = 'ir.ui.view' AND NOT EXISTS( SELECT 1 FROM ir_ui_view WHERE ir_ui_view.id = ir_model_data.res_id);
--- DELETE from ir_model_data where module = 'audittrail' AND model = 'ir.ui.menu' AND NOT EXISTS( SELECT 1 FROM ir_ui_menu WHERE id = ir_model_data.res_id);
\ No newline at end of file
diff --git a/history/gen_graph.sh b/history/gen_graph.sh
deleted file mode 100755
index 7be31ed8061..00000000000
--- a/history/gen_graph.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-##############################################################################
-#
-# Copyright (c) 2004-2009 TINY SPRL. (http://tiny.be)
-#
-# $Id$
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contact a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-##############################################################################
-
-`dirname $0`/module_graph.py $@ | dot -Tpng -o > module_graph.png
-
diff --git a/history/get-srvstats.sh b/history/get-srvstats.sh
deleted file mode 100755
index 931d575858a..00000000000
--- a/history/get-srvstats.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# ADMIN_PASSWD='admin'
-method_1() {
-    cat '-' << EOF
-<xml>
-<methodCall>
-    <methodName>get_stats</methodName>
-    <params>
-    </params>
-</methodCall>
-EOF
-}
-LEVEL=10
-
-if [ -n "$1" ] ; then LEVEL=$1 ; fi
-
-method_1 $LEVEL | POST -c 'text/xml' http://localhost:8069/xmlrpc/common
-#eof
diff --git a/history/list-services.sh b/history/list-services.sh
deleted file mode 100755
index a90e58479d5..00000000000
--- a/history/list-services.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# ADMIN_PASSWD='admin'
-method_1() {
-    cat '-' << EOF
-<xml>
-<methodCall>
-    <methodName>list_http_services</methodName>
-    <params>
-    </params>
-</methodCall>
-EOF
-}
-
-method_1 | POST -c 'text/xml' http://localhost:8069/xmlrpc/common
-#eof
diff --git a/history/migrate/3.3.0-3.4.0/README b/history/migrate/3.3.0-3.4.0/README
deleted file mode 100644
index 10cf834af0e..00000000000
--- a/history/migrate/3.3.0-3.4.0/README
+++ /dev/null
@@ -1,35 +0,0 @@
-This document describes the steps to follow to migrate from a version 3.3.0 of Tiny ERP server to a version 3.4.0
-
-Warning: the migration scripts involved in this migration are only meant for 
-a standard Tiny ERP installation. It might not work or even break some data 
-if you added or modified some code to the default Tiny ERP distribution.
-
-To migrate a 3.3.0 server to version 3.4.0 you should:
-
-- stop Tiny ERP server 3.3.0
-
-- backup your database
-	For example: pg_dump terp330 > backup330.sql
-
-- run the pre.py script (located in this directory)
-	You might need to pass it some optional arguments so that it can connect 
-	to the database.
-
-	For example: python pre.py -d terp330
-
-- run TinyERP server 3.4.0 with "-u all" in the parameters
-	For example: ./tinyerp-server.py -d terp330 -u all
-
-- stop TinyERP server 3.4.0
-
-- run the post.py script (located in this directory)
-
-	You might need to pass it some optional arguments so that it can connect 
-	to the database.
-
-	For example: python post.py -d terp330
-
-- run TinyERP server 3.4.0 again with "-u all" in the parameters
-	For example: ./tinyerp-server.py -d terp330 -u all
-
-- you are ready to work with the new version.
diff --git a/history/migrate/3.3.0-3.4.0/post.py b/history/migrate/3.3.0-3.4.0/post.py
deleted file mode 100644
index bdbd719116b..00000000000
--- a/history/migrate/3.3.0-3.4.0/post.py
+++ /dev/null
@@ -1,146 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Gaetan de Menten, <ged@tiny.be>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ------------------------------------------- #
-# convert partner payment terms to properties #
-# ------------------------------------------- #
-
-# setup
-
-cr.execute("select id from ir_model_fields where name='property_payment_term' and model='res.partner'")
-fields_id = cr.fetchone()[0]
-
-cr.execute("select company_id from res_users where company_id is not null limit 1")
-company_id = cr.fetchone()[0]
-
-# get partners
-cr.execute("SELECT c.relname FROM pg_class c, pg_attribute a WHERE c.relname='res_partner' AND a.attname='payment_term' AND c.oid=a.attrelid")
-partners=[]
-drop_payment_term=False
-if cr.rowcount:
-    drop_payment_term=True
-    cr.execute("select id, payment_term from res_partner where payment_term is not null")
-    partners = cr.dictfetchall()
-
-# loop over them
-
-for partner in partners:
-    value = 'account.payment.term,%d' % partner['payment_term']
-    res_id = 'res.partner,%d' % partner['id']
-    cr.execute(
-        "insert into ir_property(name, value, res_id, company_id, fields_id) "\
-        "values(%s, %s, %s, %d, %d)", 
-        ('property_payment_term', value, res_id, company_id, fields_id))
-
-# remove the field
-if drop_payment_term:
-    cr.execute("alter table res_partner drop column payment_term")
-cr.execute("delete from ir_model_fields where model = 'res.partner' and name = 'payment_term'")
-
-cr.commit()
-
-# ------------------------ #
-# remove duplicate reports #
-# ------------------------ #
-
-cr.execute("select model, report_name from ir_act_report_xml group by model, report_name having count(*)>1")
-reports_wh_duplicates = cr.dictfetchall()
-
-cr.execute("select res_id from ir_model_data where model='ir.actions.report.xml'")
-registered_reports = cr.fetchall()
-reg_reports_ids = ','.join([str(id) for (id,) in registered_reports])
-
-for report in reports_wh_duplicates:
-    cr.execute("select id from ir_act_report_xml where model=%s and report_name=%s and id not in ("+reg_reports_ids+")", (report['model'], report['report_name']))
-    (id,) = cr.fetchone()
-    cr.execute("delete from ir_act_report_xml where id=%d", (id,))
-    cr.execute("delete from ir_values where value='ir.actions.report.xml,%d'", (id,))
-
-cr.commit()
-
-# ------------------------------------- #
-# remove duplicate workflow transitions #
-# ------------------------------------- #
-
-# this removes all transitions which are not registered in ir_model_data
-
-cr.execute("delete from wkf_transition where id not in (select res_id from ir_model_data where model='workflow.transition')")
-cr.commit()
-
-# -------------------------------- #
-# remove bad "default" menu action #
-# -------------------------------- #
-
-cr.execute("delete from ir_values where key='action' and model='ir.ui.menu' and res_id is null")
-cr.commit()
-
-cr.close()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/3.3.0-3.4.0/pre.py b/history/migrate/3.3.0-3.4.0/pre.py
deleted file mode 100644
index db8ec6ddfcc..00000000000
--- a/history/migrate/3.3.0-3.4.0/pre.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Gaetan de Menten, <ged@tiny.be>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ------------------------- #
-# change some columns types #
-# ------------------------- #
-
-def change_column(cr, table, column, new_type, copy):
-    commands = [
-        "ALTER TABLE %s RENAME COLUMN %s TO temp_column" % (table, column),
-        "ALTER TABLE %s ADD COLUMN %s %s" % (table, column, new_type),
-        "ALTER TABLE %s DROP COLUMN temp_column" % table
-    ]
-    if copy:
-        commands.insert(
-            2, 
-            "UPDATE %s SET %s=temp_column::%s" % (table, column, new_type))
-
-    for command in commands:
-        cr.execute(command)
-
-change_column(cr, 'account_account_type', 'code_from', 'varchar(10)', False)
-change_column(cr, 'account_account_type', 'code_to', 'varchar(10)', False)
-cr.commit()
-
-# ----------------------------------------------------- #
-# add some fields (which cannot be added automatically) #
-# ----------------------------------------------------- #
-
-for line in (
-        "alter table ir_model_fields add group_name varchar(64)",
-        "alter table ir_model_fields add view_load boolean",
-        "alter table ir_model_fields alter group_name set default ''",
-        "alter table ir_model_fields alter view_load set default False",
-        "delete from ir_values where value like '%,False'",
-    ):
-    try:
-        cr.execute(line)
-    except psycopg.ProgrammingError, e:
-        cr.commit()
-        print e
-
-cr.commit()
-cr.close()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/3.4.0-4.0.0/README b/history/migrate/3.4.0-4.0.0/README
deleted file mode 100644
index 6f8d73d9520..00000000000
--- a/history/migrate/3.4.0-4.0.0/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This document describes the steps to follow to migrate from a version 3.4.0 of Tiny ERP server to a version 4.0.0
-
-Warning: the migration scripts involved in this migration are only meant for 
-a standard Tiny ERP installation. It might not work or even break some data 
-if you added or modified some code to the default Tiny ERP distribution.
-
-To migrate a 3.4.0 server to version 4.0.0 you should:
-
-- stop Tiny ERP server 3.4.0
-
-- backup your database
-	For example: pg_dump terp340 > backup340.sql
-
-- run the pre.py script (located in this directory)
-	You might need to pass it some optional arguments so that it can connect 
-	to the database.
-
-	For example: python pre.py -d terp340
-
-- run TinyERP server 4.0.0 with "-d terp340 -u all" in the parameters
-	For example: ./tinyerp-server.py -d terp340 -u all
-
-- stop TinyERP server 4.0.0
-
-- run the post.py script (located in this directory)
-	You might need to pass it some optional arguments so that it can connect 
-	to the database.
-
-- you are ready to work with the new version.
diff --git a/history/migrate/3.4.0-4.0.0/post-tiny.py b/history/migrate/3.4.0-4.0.0/post-tiny.py
deleted file mode 100644
index f4d299f3763..00000000000
--- a/history/migrate/3.4.0-4.0.0/post-tiny.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Gaetan de Menten, <ged@tiny.be>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# --------------- #
-# remove old menu #
-# --------------- #
-
-cr.execute("delete from ir_ui_menu where (id not in (select parent_id from ir_ui_menu where parent_id is not null)) and (id not in (select res_id from ir_values where model='ir.ui.menu'))")
-cr.commit()
-
-# --------------- #
-# remove ir_value #
-# --------------- #
-
-cr.execute("delete from ir_values where model = 'ir.ui.menu' and res_id is null")
-cr.commit()
-
-cr.close()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/3.4.0-4.0.0/post.py b/history/migrate/3.4.0-4.0.0/post.py
deleted file mode 100644
index 2abb06dd6f9..00000000000
--- a/history/migrate/3.4.0-4.0.0/post.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Gaetan de Menten, <ged@tiny.be>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ---------------------------------------------------------------- #
-# move user id from hr_analytic_timesheet to account_analytic_line #
-# ---------------------------------------------------------------- #
-
-cr.execute("UPDATE account_analytic_line SET user_id = hr_analytic_timesheet.user_id FROM hr_analytic_timesheet WHERE hr_analytic_timesheet.line_id = account_analytic_line.id")
-cr.commit()
-
-# --------------- #
-# remove old menu #
-# --------------- #
-
-while True:
-    cr.execute("select id from ir_ui_menu where (id not in (select parent_id from ir_ui_menu where parent_id is not null)) and (id not in (select res_id from ir_values where model='ir.ui.menu'))")
-    if not cr.rowcount:
-        break
-    cr.execute("delete from ir_ui_menu where (id not in (select parent_id from ir_ui_menu where parent_id is not null)) and (id not in (select res_id from ir_values where model='ir.ui.menu'))")
-cr.commit()
-
-# ----------------------------------------- #
-# add default value for discount in invoice #
-# ----------------------------------------- #
-
-cr.execute("update account_invoice_line set discount=0.0 where discount is null;")
-cr.commit()
-
-
-# -------------------------------------------------------------------------- #
-# update constraint account_invoice_line_uos_id_fkey on account_invoice_line #
-# -------------------------------------------------------------------------- #
-
-cr.execute("ALTER TABLE account_invoice_line DROP CONSTRAINT account_invoice_line_uos_id_fkey")
-cr.execute("ALTER TABLE account_invoice_line ADD FOREIGN KEY (uos_id) REFERENCES product_uom(id) ON DELETE SET NULL")
-cr.commit()
-
-print """
-WARNING: account_uos has been replaced by product_uom.
-It is not possible to migrate the data automatically so you need to create the old account_uos in the new product_uom.
-And then update the field uos_id of the table account_invoice to match the new id of product_uom.
-
-EXAMPLE:
-    UPDATE account_invoice SET uos_id = new_id WHERE uos_id = old_id;
-"""
-
-cr.close()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/3.4.0-4.0.0/pre-tiny.py b/history/migrate/3.4.0-4.0.0/pre-tiny.py
deleted file mode 100644
index 1001957e719..00000000000
--- a/history/migrate/3.4.0-4.0.0/pre-tiny.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Gaetan de Menten, <ged@tiny.be>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ------------------------- #
-# change some columns types #
-# ------------------------- #
-
-def change_column(cr, table, column, new_type, copy):
-    commands = [
-        "ALTER TABLE %s RENAME COLUMN %s TO temp_column" % (table, column),
-        "ALTER TABLE %s ADD COLUMN %s %s" % (table, column, new_type),
-        "ALTER TABLE %s DROP COLUMN temp_column" % table
-    ]
-    if copy:
-        commands.insert(
-            2, 
-            "UPDATE %s SET %s=temp_column::%s" % (table, column, new_type))
-
-    for command in commands:
-        cr.execute(command)
-
-#change_column(cr, 'crm_case', 'date_closed', 'timestamp', True)
-cr.commit()
-
-# -------------------- #
-# add module if needed #
-# -------------------- #
-
-cr.execute("SELECT name FROM ir_module_module")
-if not cr.rowcount:
-    for module in set(['base', 'marketing', 'subscription', 'account', 'base_partner_relation', 'audittrail', 'account_followup', 'product', 'hr', 'l10n_simple', 'crm', 'stock', 'hr_timesheet', 'purchase', 'report_purchase', 'mrp', 'sale', 'report_sale', 'delivery', 'project', 'sale_crm', 'hr_timesheet_project', 'scrum', 'report_project',
-'account_followup',
-'account',
-'audittrail',
-'base_partner_relation',
-'crm',
-'delivery',
-'edi',
-'hr_evaluation',
-'hr_expense',
-'hr',
-'hr_timesheet_invoice',
-'hr_timesheet_project',
-'hr_timesheet',
-'l10n_simple',
-'marketing',
-'mrp',
-'network',
-'product',
-'project',
-'purchase',
-'report_crm',
-'report_project',
-'report_purchase',
-'report_sale',
-'sale_crm',
-'sale',
-'sandwich',
-'scrum',
-'stock']):
-        cr.execute("INSERT INTO ir_module_module (name, state) VALUES ('%s', 'installed')" % module)
-    cr.commit()
-
-
-# ----------------------------------------------------- #
-# add some fields (which cannot be added automatically) #
-# ----------------------------------------------------- #
-
-for line in (
-        "ALTER TABLE ir_module_module ADD demo BOOLEAN DEFAULT False",
-        "delete from ir_values where value like '%,False'",
-        """UPDATE ir_ui_view set arch='<?xml version="1.0"?><tree string="Menu" toolbar="1"><field icon="icon" name="name"/></tree>' where name='ir.ui.menu.tree' and type='tree' and field_parent='child_id'""",
-    ):
-    cr.execute(line)
-
-cr.commit()
-cr.close()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/3.4.0-4.0.0/pre.py b/history/migrate/3.4.0-4.0.0/pre.py
deleted file mode 100644
index 3e9f2bbf2d4..00000000000
--- a/history/migrate/3.4.0-4.0.0/pre.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Gaetan de Menten, <ged@tiny.be>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ------------------------- #
-# change some columns types #
-# ------------------------- #
-
-def change_column(cr, table, column, new_type, copy):
-    commands = [
-        "ALTER TABLE %s RENAME COLUMN %s TO temp_column" % (table, column),
-        "ALTER TABLE %s ADD COLUMN %s %s" % (table, column, new_type),
-        "ALTER TABLE %s DROP COLUMN temp_column" % table
-    ]
-    if copy:
-        commands.insert(
-            2, 
-            "UPDATE %s SET %s=temp_column::%s" % (table, column, new_type))
-
-    for command in commands:
-        cr.execute(command)
-
-change_column(cr, 'crm_case', 'date_closed', 'timestamp', True)
-cr.commit()
-
-# -------------------- #
-# add module if needed #
-# -------------------- #
-
-cr.execute("SELECT name FROM ir_module_module")
-if not cr.rowcount:
-    for module in ('base', 'marketing', 'subscription', 'account', 'base_partner_relation', 'audittrail', 'account_followup', 'product', 'hr', 'l10n_simple', 'crm', 'stock', 'hr_timesheet', 'purchase', 'report_purchase', 'mrp', 'sale', 'report_sale', 'delivery', 'project', 'sale_crm', 'hr_timesheet_project', 'scrum', 'report_project'):
-        cr.execute("INSERT INTO ir_module_module (name, state) VALUES ('%s', 'installed')" % module)
-    cr.commit()
-
-# --------------- #
-# remove old menu #
-# --------------- #
-
-while True:
-    cr.execute("select id from ir_ui_menu where id not in (select parent_id from ir_ui_menu where parent_id is not null) and id not in (select res_id from ir_model_data where model='ir.ui.menu')")
-    if not cr.rowcount:
-        break
-    cr.execute("delete from ir_ui_menu where id not in (select parent_id from ir_ui_menu where parent_id is not null) and id not in (select res_id from ir_model_data where model='ir.ui.menu')")
-cr.commit()
-
-# ----------------------------------------------------- #
-# add some fields (which cannot be added automatically) #
-# ----------------------------------------------------- #
-
-for line in (
-        "ALTER TABLE ir_module_module ADD demo BOOLEAN",
-        "ALTER TABLE ir_module_module SET demo DEFAULT False",
-        "DELETE FROM ir_values WHERE VALUE LIKE '%,False'",
-        """UPDATE ir_ui_view set arch='<?xml version="1.0"?><tree string="Menu" toolbar="1"><field icon="icon" name="name"/></tree>' where name='ir.ui.menu.tree' and type='tree' and field_parent='child_id'""",
-    ):
-    cr.execute(line)
-
-cr.commit()
-cr.close()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/4.0.0-4.2.0/pre.py b/history/migrate/4.0.0-4.2.0/pre.py
deleted file mode 100644
index a8080ee9a2a..00000000000
--- a/history/migrate/4.0.0-4.2.0/pre.py
+++ /dev/null
@@ -1,247 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Cédric Krier, <ced@tinyerp.com>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ------------------------ #
-# change currency rounding #
-# ------------------------ #
-
-cr.execute("""SELECT c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE WHEN a.attlen=-1 THEN a.atttypmod-4 ELSE a.attlen END as size FROM pg_class c,pg_attribute a,pg_type t WHERE c.relname='res_currency' AND a.attname='rounding' AND c.oid=a.attrelid AND a.atttypid=t.oid""")
-res = cr.dictfetchall()
-if res[0]['typname'] != 'numeric':
-    for line in (
-        "ALTER TABLE res_currency RENAME rounding TO rounding_bak",
-        "ALTER TABLE res_currency ADD rounding NUMERIC(12,6)",
-        "UPDATE res_currency SET rounding = power(10, - rounding_bak)",
-        "ALTER TABLE res_currency DROP rounding_bak",
-        ):
-        cr.execute(line)
-cr.commit()
-
-# ----------------------------- #
-# drop constraint on ir_ui_view #
-# ----------------------------- #
-
-cr.execute('SELECT conname FROM pg_constraint where conname = \'ir_ui_view_type\'')
-if cr.fetchall():
-    cr.execute('ALTER TABLE ir_ui_view DROP CONSTRAINT ir_ui_view_type')
-cr.commit()
-
-# ------------------------ #
-# update res.partner.bank  #
-# ------------------------ #
-
-cr.execute('SELECT a.attname FROM pg_class c, pg_attribute a WHERE c.relname = \'res_partner_bank\' AND a.attname = \'iban\' AND c.oid = a.attrelid')
-if cr.fetchall():
-    cr.execute('ALTER TABLE res_partner_bank RENAME iban TO acc_number')
-cr.commit()
-
-# ------------------------------------------- #
-# Add perm_id to ir_model and ir_model_fields #
-# ------------------------------------------- #
-
-cr.execute('SELECT a.attname FROM pg_class c, pg_attribute a WHERE c.relname = \'ir_model\' AND a.attname = \'perm_id\' AND c.oid = a.attrelid')
-if not cr.fetchall():
-    cr.execute("ALTER TABLE ir_model ADD perm_id int references perm on delete set null")
-cr.commit()
-
-cr.execute('SELECT a.attname FROM pg_class c, pg_attribute a WHERE c.relname = \'ir_model_fields\' AND a.attname = \'perm_id\' AND c.oid = a.attrelid')
-if not cr.fetchall():
-    cr.execute("ALTER TABLE ir_model_fields ADD perm_id int references perm on delete set null")
-cr.commit()
-
-
-# --------------------------------- #
-# remove name for all ir_act_window #
-# --------------------------------- #
-
-cr.execute("UPDATE ir_act_window SET name = ''")
-cr.commit()
-
-# ------------------------------------------------------------------------ #
-# Create a "allow none" default access to keep the behaviour of the system #
-# ------------------------------------------------------------------------ #
-
-cr.execute('SELECT model_id FROM ir_model_access')
-res= cr.fetchall()
-for r in res:
-    cr.execute('SELECT id FROM ir_model_access WHERE model_id = %d AND group_id IS NULL', (r[0],))
-    if not cr.fetchall():
-        cr.execute("INSERT into ir_model_access (name,model_id,group_id) VALUES ('Auto-generated access by migration',%d,NULL)",(r[0],))
-cr.commit()
-
-# ------------------------------------------------- #
-# Drop view report_account_analytic_line_to_invoice #
-# ------------------------------------------------- #
-
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_line_to_invoice\'')
-if cr.fetchall():
-    cr.execute('DROP VIEW report_account_analytic_line_to_invoice')
-cr.commit()
-
-# --------------------------- #
-# Drop state from hr_employee #
-# --------------------------- #
-
-cr.execute('SELECT * FROM pg_class c, pg_attribute a WHERE c.relname=\'hr_employee\' AND a.attname=\'state\' AND c.oid=a.attrelid')
-if cr.fetchall():
-    cr.execute('ALTER TABLE hr_employee DROP state')
-cr.commit()
-
-# ------------ #
-# Add timezone #
-# ------------ #
-
-cr.execute('SELECT id FROM ir_values where model=\'res.users\' AND key=\'meta\' AND name=\'tz\'')
-if not cr.fetchall():
-    import pytz, pickle
-    meta = pickle.dumps({'type':'selection', 'string':'Timezone', 'selection': [(x, x) for x in pytz.all_timezones]})
-    value = pickle.dumps(False)
-    cr.execute('INSERT INTO ir_values (name, key, model, meta, key2, object, value) VALUES (\'tz\', \'meta\', \'res.users\', %s, \'tz\', %s, %s)', (meta,False, value))
-cr.commit()
-
-# ------------------------- #
-# change product_uom factor #
-# ------------------------- #
-
-cr.execute('SELECT a.attname FROM pg_class c, pg_attribute a, pg_type t WHERE c.relname = \'product_uom\' AND a.attname = \'factor\' AND c.oid = a.attrelid AND a.atttypid = t.oid AND t.typname = \'float8\'')
-if cr.fetchall():
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat_account\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_account_analytic_planning_stat_account')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_account_analytic_planning_stat')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat_user\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_account_analytic_planning_stat_user')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_purchase_order_product\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_purchase_order_product')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_purchase_order_category\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_purchase_order_category')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_sale_order_product\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_sale_order_product')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_sale_order_category\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_sale_order_category')
-    cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_hr_timesheet_invoice_journal\'')
-    if cr.fetchall():
-        cr.execute('DROP VIEW report_hr_timesheet_invoice_journal')
-
-    cr.execute('ALTER TABLE product_uom RENAME COLUMN factor to temp_column')
-    cr.execute('ALTER TABLE product_uom ADD COLUMN factor NUMERIC(12,6)')
-    cr.execute('UPDATE product_uom SET factor = temp_column')
-    cr.execute('ALTER TABLE product_uom ALTER factor SET NOT NULL')
-    cr.execute('ALTER TABLE product_uom DROP COLUMN temp_column')
-cr.commit()
-
-
-# ------------------------------------------------- #
-# Drop name_uniq constraint on stock_production_lot #
-# ------------------------------------------------- #
-
-cr.execute('SELECT conname FROM pg_constraint where conname = \'stock_production_lot_name_uniq\'')
-if cr.fetchall():
-    cr.execute('ALTER TABLE stock_production_lot DROP CONSTRAINT stock_production_lot_name_uniq')
-cr.commit()
-
-# ------------------------------------ #
-# Put country/state code in upper case #
-# ------------------------------------ #
-
-cr.execute('UPDATE res_country SET code = UPPER(code)')
-cr.execute('UPDATE res_country_state SET code = UPPER(code)')
-cr.commit()
-
-# --------------------------------------------- #
-# Add primary key on tables inherits ir_actions #
-# --------------------------------------------- #
-
-cr.execute('SELECT indexname FROm pg_indexes WHERE indexname = \'ir_act_report_xml_pkey\' and tablename = \'ir_act_report_xml\'')
-if not cr.fetchall():
-    cr.execute('ALTER TABLE ir_act_report_xml ADD PRIMARY KEY (id)')
-cr.execute('SELECT indexname FROm pg_indexes WHERE indexname = \'ir_act_report_custom_pkey\' and tablename = \'ir_act_report_custom\'')
-if not cr.fetchall():
-    cr.execute('ALTER TABLE ir_act_report_custom ADD PRIMARY KEY (id)')
-cr.execute('SELECT indexname FROm pg_indexes WHERE indexname = \'ir_act_group_pkey\' and tablename = \'ir_act_group\'')
-if not cr.fetchall():
-    cr.execute('ALTER TABLE ir_act_group ADD PRIMARY KEY (id)')
-cr.execute('SELECT indexname FROm pg_indexes WHERE indexname = \'ir_act_execute_pkey\' and tablename = \'ir_act_execute\'')
-if not cr.fetchall():
-    cr.execute('ALTER TABLE ir_act_execute ADD PRIMARY KEY (id)')
-cr.execute('SELECT indexname FROm pg_indexes WHERE indexname = \'ir_act_wizard_pkey\' and tablename = \'ir_act_wizard\'')
-if not cr.fetchall():
-    cr.execute('ALTER TABLE ir_act_wizard ADD PRIMARY KEY (id)')
-cr.commit()
-
-cr.close
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/4.0.0-4.2.0/tiny/README b/history/migrate/4.0.0-4.2.0/tiny/README
deleted file mode 100644
index 36f129050d0..00000000000
--- a/history/migrate/4.0.0-4.2.0/tiny/README
+++ /dev/null
@@ -1 +0,0 @@
-Those scripts are provide as example of customization of migration scripts
diff --git a/history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py b/history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
deleted file mode 100644
index f2485a24100..00000000000
--- a/history/migrate/4.0.0-4.2.0/tiny/pre-tiny.py
+++ /dev/null
@@ -1,188 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__author__ = 'Cédric Krier, <ced@tinyerp.com>'
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-raise Exception('This script is provided as an example, you must custom it before')
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# fix country
-
-
-cr.execute('SELECT code from res_country where code is not null group by code')
-res = cr.fetchall()
-
-for c in res:
-    cr.execute('SELECT max(id) from res_country where code = %s group by code', (c[0],))
-    res2 = cr.fetchone()
-    cr.execute('SELECT id from res_country where code = %s', (c[0],))
-    ids = ','.join(map(lambda x: str(x[0]), cr.fetchall()))
-    cr.execute('UPDATE res_partner_address set country_id = %d where country_id in ('+ids+')', (res2[0],))
-    cr.execute('DELETE FROM res_country WHERE code = %s and id <> %d', (c[0], res2[0],))
-cr.commit()
-
-
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_planning_stat\'')
-if cr.fetchall():
-    cr.execute('DROP VIEW report_account_analytic_planning_stat')
-cr.commit()
-
-
-cr.execute('SELECT name from ( SELECT name, count(name) AS n FROM res_partner GROUP BY name ) AS foo WHERE n > 1')
-res = cr.fetchall()
-
-
-for p in res:
-    cr.execute('SELECT max(id) FROM res_partner WHERE name = %s GROUP BY name', (p[0],))
-    res2 = cr.fetchone()
-    cr.execute('UPDATE res_partner set active = False WHERE name = %s and id <> %d', (p[0], res2[0],))
-    cr.execute('SELECT id FROM res_partner WHERE name = %s AND id <> %d', (p[0], res2[0],))
-    res3 = cr.fetchall()
-    i = 0
-    for id in res3:
-        name = p[0]+' old'
-        if i:
-            name = name + ' ' + str(i)
-        cr.execute('UPDATE res_partner set name = %s WHERE id = %d', (name, id[0]))
-        i += 1
-cr.commit()
-
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_account_analytic_line_to_invoice\'')
-if cr.fetchall():
-    cr.execute('DROP VIEW report_account_analytic_line_to_invoice')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_timesheet_invoice\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_timesheet_invoice')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_purchase_order_category\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_purchase_order_category')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_purchase_order_product\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_purchase_order_product')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_sale_order_category\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_sale_order_category')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_sale_order_product\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_sale_order_product')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_timesheet_user\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_timesheet_user')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'report_task_user_pipeline_open\'')
-if cr.fetchall():
-    cr.execute('drop VIEW report_task_user_pipeline_open')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'hr_timesheet_sheet_sheet_day\'')
-if cr.fetchall():
-    cr.execute('drop VIEW hr_timesheet_sheet_sheet_day')
-cr.execute('SELECT viewname FROM pg_views WHERE viewname = \'hr_timesheet_sheet_sheet_account\'')
-if cr.fetchall():
-    cr.execute('drop VIEW hr_timesheet_sheet_sheet_account')
-cr.execute('SELECT viewname from pg_views where viewname = \'sale_journal_sale_stats\'')
-if cr.fetchall():
-    cr.execute('drop VIEW sale_journal_sale_stats')
-cr.execute('SELECT viewname from pg_views where viewname = \'sale_journal_picking_stats\'')
-if cr.fetchall():
-    cr.execute('drop VIEW sale_journal_picking_stats')
-cr.execute('SELECT viewname from pg_views where viewname = \'sale_journal_invoice_type_stats\'')
-if cr.fetchall():
-    cr.execute('drop VIEW sale_journal_invoice_type_stats')
-
-cr.execute('ALTER TABLE product_template ALTER list_price TYPE numeric(16,2)')
-cr.execute('ALTER TABLE product_template ALTER standard_price TYPE numeric(16,2)')
-cr.execute('ALTER TABLE product_product ALTER price_extra TYPE numeric(16,2)')
-cr.execute('ALTER TABLE product_product ALTER price_margin TYPE numeric(16,2)')
-cr.execute('ALTER TABLE pricelist_partnerinfo ALTER price TYPE numeric(16,2)')
-cr.execute('ALTER TABLE account_invoice_line ALTER price_unit TYPE numeric(16,2)')
-cr.execute('ALTER TABLE purchase_order_line ALTER price_unit TYPE numeric(16,2)')
-cr.execute('ALTER TABLE sale_order_line ALTER price_unit TYPE numeric(16,2)')
-cr.commit()
-
-
-cr.execute('SELECT tablename FROM pg_tables WHERE tablename = \'subscription_document_fields\'')
-if cr.fetchall():
-    cr.execute('DROP TABLE subscription_document_fields')
-cr.execute('SELECT tablename FROM pg_tables WHERE tablename = \'subscription_document\'')
-if cr.fetchall():
-    cr.execute('DROP TABLE subscription_document')
-cr.execute('SELECT tablename FROM pg_tables WHERE tablename = \'subscription_subscription_history\'')
-if cr.fetchall():
-    cr.execute('DROP TABLE subscription_subscription_history')
-cr.commit()
-
-# -------------------- #
-# Change currency rate #
-# -------------------- #
-
-cr.execute('SELECT a.attname FROM pg_class c, pg_attribute a WHERE c.relname = \'res_currency_rate\' AND a.attname = \'rate_old\' AND c.oid = a.attrelid')
-if not cr.fetchall():
-    cr.execute('ALTER TABLE res_currency_rate ADD rate_old NUMERIC(12,6)')
-    cr.execute('UPDATE res_currency_rate SET rate_old = rate')
-    cr.execute('UPDATE res_currency_rate SET rate = (1 / rate_old)')
-cr.commit()
-
-cr.close
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/migrate/4.2.0-4.4.0/pre.py b/history/migrate/4.2.0-4.4.0/pre.py
deleted file mode 100644
index 5c4598274e5..00000000000
--- a/history/migrate/4.2.0-4.4.0/pre.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-__version__ = '0.1.0'
-
-import psycopg
-import optparse
-import ConfigParser
-
-# -----
-
-parser = optparse.OptionParser(version="Tiny ERP server migration script " + __version__)
-
-parser.add_option("-c", "--config", dest="config", help="specify path to Tiny ERP config file")
-
-group = optparse.OptionGroup(parser, "Database related options")
-group.add_option("--db_host", dest="db_host", help="specify the database host") 
-group.add_option("--db_port", dest="db_port", help="specify the database port") 
-group.add_option("-d", "--database", dest="db_name", help="specify the database name")
-group.add_option("-r", "--db_user", dest="db_user", help="specify the database user name")
-group.add_option("-w", "--db_password", dest="db_password", help="specify the database password") 
-parser.add_option_group(group)
-
-options = optparse.Values()
-options.db_name = 'terp' # default value
-parser.parse_args(values=options)
-
-if hasattr(options, 'config'):
-    configparser = ConfigParser.ConfigParser()
-    configparser.read([options.config])
-    for name, value in configparser.items('options'):
-        if not (hasattr(options, name) and getattr(options, name)):
-            if value in ('true', 'True'):
-                value = True
-            if value in ('false', 'False'):
-                value = False
-            setattr(options, name, value)
-
-# -----
-
-host = hasattr(options, 'db_host') and "host=%s" % options.db_host or ''
-port = hasattr(options, 'db_port') and "port=%s" % options.db_port or ''
-name = "dbname=%s" % options.db_name
-user = hasattr(options, 'db_user') and "user=%s" % options.db_user or ''
-password = hasattr(options, 'db_password') and "password=%s" % options.db_password or ''
-
-db = psycopg.connect('%s %s %s %s %s' % (host, port, name, user, password), serialize=0)
-cr = db.cursor()
-
-# ------------------------------ #
-# drop not null on ir_attachment #
-# ------------------------------ #
-
-cr.execute('ALTER TABLE ir_attachment \
-        ALTER COLUMN res_model DROP NOT NULL, \
-        ALTER COLUMN res_id DROP NOT NULL')
-cr.commit()
-
-# ---------------------------------- #
-# change case date_deadline rounding #
-# ---------------------------------- #
-
-cr.execute("""SELECT
-c.relname,a.attname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,t.typname,CASE
-WHEN a.attlen=-1 THEN a.atttypmod-4 ELSE a.attlen END as size FROM pg_class
-c,pg_attribute a,pg_type t WHERE c.relname='crm_case' AND
-a.attname='date_deadline' AND c.oid=a.attrelid AND a.atttypid=t.oid""")
-
-res = cr.dictfetchall()
-if res[0]['typname'] != 'timestamp':
-    for line in (
-        "ALTER TABLE crm_case RENAME date_deadline TO date_deadline_bak",
-        "ALTER TABLE crm_case ADD date_deadline timestamp",
-        "UPDATE crm_case SET date_deadline = date_deadline_bak",
-        "ALTER TABLE crm_case DROP date_deadline_bak",
-        ):
-        cr.execute(line)
-cr.commit()
-
-cr.execute('drop view report_task_user_pipeline_open');
-cr.commit()
-
-cr.execute('alter table ir_model_fields add state varchar(26)')
-cr.execute('alter table ir_model_fields add select_level varchar(3)')
-cr.execute('alter table ir_act_wizard add primary key(id)')
-cr.commit()
-
-
-cr.close()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/module_graph.py b/history/module_graph.py
deleted file mode 100755
index b29bd316e2f..00000000000
--- a/history/module_graph.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-# TODO handle the case of zip modules
-
-import os
-import optparse
-import sys
-import glob
-
-# TODO use the same function provided in openerp.modules
-def load_information_from_description_file(module):
-    """
-    :param module: The name of the module (sale, purchase, ...)
-    """
-    for filename in ['__openerp__.py', '__terp__.py']:
-        description_file = os.path.join(module, filename)
-        if os.path.isfile(description_file):
-            return eval(file(description_file).read())
-
-    return {}
-
-def get_valid_path(paths, module):
-    for path in paths:
-        full = os.path.join(path, module)
-        if os.path.exists(full):
-            return full
-    return None
-
-parser = optparse.OptionParser(usage="%prog [options] [module1 [module2 ...]]")
-parser.add_option("-p", "--addons-path", dest="path", help="addons directory", action="append")
-(opt, args) = parser.parse_args()
-
-modules = []
-if not opt.path:
-    opt.path = ["."]
-
-if not args:
-    for path in opt.path:
-        modules += map(os.path.dirname, glob.glob(os.path.join(path, '*', '__openerp__.py')))
-        modules += map(os.path.dirname, glob.glob(os.path.join(path, '*', '__terp__.py')))
-else:
-    for module in args:
-        valid_path = get_valid_path(opt.path, module)
-        if valid_path:
-            modules.append(valid_path)
-
-all_modules = set(map(os.path.basename, modules))
-print 'digraph G {'
-while len(modules):
-    f = modules.pop(0)
-    module_name = os.path.basename(f)
-    all_modules.add(module_name)
-    info = load_information_from_description_file(f)
-    if info.get('installable', True):
-        for name in info.get('depends',[]):
-            valid_path = get_valid_path(opt.path, name)
-            if name not in all_modules:
-                if valid_path:
-                    modules.append(valid_path)
-                else:
-                    all_modules.add(name)
-                    print '\t%s [color=red]' % (name,)
-            print '\t%s -> %s;' % (module_name, name)
-print '}'
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/history/xml2yml.py b/history/xml2yml.py
deleted file mode 100644
index 8344d5f81e0..00000000000
--- a/history/xml2yml.py
+++ /dev/null
@@ -1,347 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-"""
-Experimental script for conversion between OpenERP's XML serialization format
-and the new YAML serialization format introduced in OpenERP 6.0.
-Intended to be used as a quick preprocessor for converting data/test files, then
-to be fine-tuned manually.
-"""
-
-import yaml
-import logging
-from lxml import etree
-
-__VERSION__ = '0.0.2'
-
-def toString(value):
-    value='"' + value + '"'
-    return value
-
-class XmlTag(etree.ElementBase):
-    def _to_yaml(self):
-        child_tags = []
-        for node in self:
-            if hasattr(node, '_to_yaml'):
-                child_tags.append(node._to_yaml())
-        return self.tag(attrib=self.attrib, child_tags=child_tags)
-
-class YamlTag(object):
-    """
-    Superclass for constructors of custom tags defined in yaml file.
-    """
-    def __init__(self, **kwargs):
-        self.__dict__.update(kwargs)
-        self.attrib = self.__dict__.get('attrib', {})
-        self.child_tags = self.__dict__.get('child_tags', '')
-    def __getitem__(self, key):
-        return getattr(self, key)
-    def __getattr__(self, attr):
-        return None
-    def __repr__(self):
-        for k,v in self.attrib.iteritems():
-            if str(v) and str(v)[0] in ['[', '{', '#', '*', '(']:
-                self.attrib[k] = toString(self.attrib[k]).replace("'", '')
-        st = self.yaml_tag + ' ' + str(self.attrib)
-        return st
-
-# attrib tags
-class ref(YamlTag):
-    yaml_tag = u'!ref'
-    def __init__(self, expr="False"):
-        self.expr = expr
-    def __repr__(self):
-        return "'%s'"%str(self.expr)
-
-class Eval(YamlTag):
-    yaml_tag = u'!eval'
-    def __init__(self, expr="False"):
-        self.expr = expr
-    def __repr__(self):
-        value=str(self.expr)
-        if value.find("6,") != -1:
-            value = eval(str(eval(value)))
-            value=value[0][2]
-            value = [[value]]
-        else:
-            try:
-                value=int(value)
-            except:
-                if value and value[0] in ['[', '{', '#', '*', '(']:
-                    value = value.replace('"', r'\"')
-                    value = toString(value)
-                else:
-                    try:
-                        value = eval(value)
-                    except Exception:
-                        pass
-        return value
-
-class Search(YamlTag):
-    yaml_tag = u'!ref'
-
-# test tag
-class xml_test(XmlTag):
-    def _to_yaml(self):
-        expr = self.attrib.get('expr')
-        text = self.text
-        if text:
-            expr = expr + ' == ' + '"%s"'%text
-        return [[expr]]
-
-class xml_data(etree.ElementBase):
-    def _to_yaml(self):
-        value = self.attrib.get('noupdate', "0")
-        return data(value)
-
-# field tag:
-class xml_field(etree.ElementBase):
-    def _to_yaml(self):
-        field = '  ' + self.attrib.pop('name','unknown')
-
-        if self.attrib.get('search', None):
-            value = Search(attrib=self.attrib, child_tags='').__repr__()
-        else:
-            attr = (self.attrib.get('ref', None) and 'ref') or (self.attrib.get('eval', None) and 'eval') or 'None'
-            value = Eval(self.attrib.get(attr, self.text)).__repr__() or ''
-        return {field: value}
-
-# value tag
-class xml_value(etree.ElementBase):
-    def _to_yaml(self):
-
-        if self.attrib.get('eval', None):
-            key, val = 'eval', '"'+self.attrib.get('eval')+'"'
-        elif self.attrib.get('model', None):
-            key, val = 'model', self.attrib.get('model')
-        val=val.replace("'",'""')
-        self.attrib.pop(key)
-        d={}
-        for k,v in self.attrib.iteritems():
-            if k == 'search':
-                v = '"' + v + '"'
-            k='--' + k
-            v=v.replace("'",'""')
-            d[k] = v
-        if d:
-            ls=[[{key:val},dict(d)]]
-        else:
-            ls=[[{key:val}]]
-        return ls
-
-# data tag
-class data(YamlTag):
-    yaml_tag = u'!context'
-    def __init__(self, noupdate="0"):
-        self.child_tags = {'    noupdate':noupdate}
-    def __repr__(self):
-        return "!!context"
-
-# Record tag
-class Record(YamlTag):
-    yaml_tag = u'!record'
-class xml_record(XmlTag):
-    tag=Record
-    def _to_yaml(self):
-        child_tags = {}
-        for node in self:
-            if hasattr(node, '_to_yaml'):
-                child_tags.update(node._to_yaml())
-        return Record(attrib=self.attrib, child_tags=child_tags)
-
-# ir_set tag
-class Ir_Set(YamlTag):
-    yaml_tag = u'!ir_set'
-    def __repr__(self):
-        st = self.yaml_tag
-        return st
-class xml_ir_set(XmlTag):
-    tag=Ir_Set
-    def _to_yaml(self):
-        child_tags = {}
-        for node in self:
-            if hasattr(node, '_to_yaml'):
-                child_tags.update(node._to_yaml())
-        return Ir_Set(attrib=self.attrib, child_tags=child_tags)
-
-# workflow tag
-class Workflow(YamlTag):
-    yaml_tag = u'!workflow'
-class xml_workflow(XmlTag):
-    tag=Workflow
-
-# function tag
-class Function(YamlTag):
-    yaml_tag = u'!function'
-class xml_function(XmlTag):
-    tag=Function
-
-# function tag
-class Assert(YamlTag):
-    yaml_tag = u'!assert'
-class xml_assert(XmlTag):
-    tag=Assert
-
-# menuitem tagresult.append(yaml.safe_dump(obj, default_flow_style=False, allow_unicode=True).replace("'",''))
-class MenuItem(YamlTag):
-    yaml_tag = u'!menuitem'
-class xml_menuitem(XmlTag):
-    tag=MenuItem
-
-# act_window tag
-class ActWindow(YamlTag):
-    yaml_tag = u'!act_window'
-class xml_act_window(XmlTag):
-    tag=ActWindow
-
-# report tag
-class Report(YamlTag):
-    yaml_tag = u'!report'
-class xml_report(XmlTag):
-    tag=Report
-
-# deletes tag
-class Delete(YamlTag):
-    yaml_tag = u'!delete'
-class xml_delete(XmlTag):
-    tag=Delete
-
-# python tag
-class Python(YamlTag):
-    yaml_tag = u'!python'
-class xml_python(XmlTag):
-    tag=Python
-
-# context tag
-class Context(YamlTag):
-    yaml_tag = u'!context'
-class xml_context(XmlTag):
-    tag=Context
-
-# url tag
-class Url(YamlTag):
-    yaml_tag = u'!url'
-class xml_url(XmlTag):
-    tag=Url
-
-# delete tag
-class Delete(YamlTag):
-    yaml_tag = u'!delete'
-class xml_delete(XmlTag):
-    tag=Delete
-
-def represent_data(dumper, data):
-        return dumper.represent_mapping(u'tag:yaml.org,2002:map', [('!'+str(data), data.child_tags)])
-
-yaml.SafeDumper.add_representer(Record, represent_data)
-yaml.SafeDumper.add_representer(data, represent_data)
-yaml.SafeDumper.add_representer(Workflow, represent_data)
-yaml.SafeDumper.add_representer(Function, represent_data)
-yaml.SafeDumper.add_representer(Assert, represent_data)
-yaml.SafeDumper.add_representer(MenuItem, represent_data)
-yaml.SafeDumper.add_representer(Ir_Set, represent_data)
-yaml.SafeDumper.add_representer(Python, represent_data)
-yaml.SafeDumper.add_representer(Context, represent_data)
-
-class MyLookup(etree.CustomElementClassLookup):
-    def lookup(self, node_type, document, namespace, name):
-        if node_type=='element':
-            return {
-                'data': xml_data,
-                'record': xml_record,
-                'field': xml_field,
-                'workflow': xml_workflow,
-                'function': xml_function,
-                'value': xml_value,
-                'assert': xml_assert,
-                'test': xml_test,
-                'menuitem': xml_menuitem,
-                'act_window': xml_act_window,
-                'report': xml_report,
-                'delete': xml_delete,
-                'python': xml_python,
-                'context': xml_context,
-                'url': xml_url,
-                'ir_set': xml_ir_set,
-            }.get(name, None)
-        elif node_type=='comment':
-            return None#xml_comment
-        return None
-
-class xml_parse(object):
-    def __init__(self):
-        self.context = {}
-    def parse(self, fname):
-        parser = etree.XMLParser()
-        parser.setElementClassLookup(MyLookup())
-        result = []
-        self.root = etree.XML(file(fname).read(), parser)
-        for data in self.root:
-            if hasattr(data, '_to_yaml'):
-                obj = data._to_yaml()
-                if obj.yaml_tag == '!context':
-                    result.append(yaml.dump(str(obj)).replace("'",'').split('\n')[0])
-                    result.append(yaml.dump(obj.child_tags, default_flow_style=False).replace("'",''))
-                else:
-                    result.append(yaml.safe_dump(obj, default_flow_style=False, allow_unicode=True).replace("'",''))
-            self.context.update(data.attrib)
-            for tag in data:
-                if tag.tag == etree.Comment:
-                    result.append(tag)
-                else:
-                    if hasattr(tag, '_to_yaml'):
-                        obj = tag._to_yaml()
-                        if not obj.child_tags:
-                            result.append(yaml.dump('!'+str(obj), default_flow_style=False, allow_unicode=True, width=999).replace("'",''))
-                        else:
-                            result.append(yaml.safe_dump(obj, default_flow_style=False, allow_unicode=True, width=999).replace('\n:', ':\n').replace("'",''))
-        print "# Experimental OpenERP xml-to-yml conversion! (v%s)"%__VERSION__
-        print "# Please use this as a first conversion/preprocessing step,"
-        print "# not as a production-ready tool!"
-        for record in result:
-            if type(record) != type(''):
-                record=str(record)
-                l= record.split("\n")
-                for line in l:
-                    print '#' + str(line)
-                continue
-            record=str(record)
-            record = record.replace('- --','  ')        #for value tag
-            record = record.replace('!!', '- \n  !')    #for all parent tags
-            record = record.replace('- - -', '    -')   #for many2many fields
-            record = record.replace('? ', '')           #for long expressions
-            record = record.replace('""', "'")          #for string-value under value tag
-            print record
-
-if __name__=='__main__':
-    import optparse
-    import sys
-    parser = optparse.OptionParser(
-        usage = '%s file.xml' % sys.argv[0])
-    (opt, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.error("incorrect number of arguments")
-    fname = sys.argv[1]
-    p = xml_parse()
-    p.parse(fname)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/install/ssl-cert.cfg b/install/ssl-cert.cfg
deleted file mode 100644
index 08ca7b5757e..00000000000
--- a/install/ssl-cert.cfg
+++ /dev/null
@@ -1,89 +0,0 @@
-# X.509 Certificate options
-#
-# DN options
-
-# The organization of the subject.
-organization = "Some organization."
-
-# The organizational unit of the subject.
-unit = "ERP dept."
-
-# The locality of the subject.
-# locality =
-
-# The state of the certificate owner.
-state = "State"
-
-# The country of the subject. Two letter code.
-country = BE
-
-# The common name of the certificate owner.
-cn = "Some company"
-
-# A user id of the certificate owner.
-#uid = "clauper"
-
-# If the supported DN OIDs are not adequate you can set
-# any OID here.
-# For example set the X.520 Title and the X.520 Pseudonym
-# by using OID and string pairs.
-#dn_oid = "2.5.4.12" "Dr." "2.5.4.65" "jackal"
-
-# This is deprecated and should not be used in new
-# certificates.
-# pkcs9_email = "none@none.org"
-
-# The serial number of the certificate
-serial = 001
-
-# In how many days, counting from today, this certificate will expire.
-expiration_days = 700
-
-# X.509 v3 extensions
-
-# A dnsname in case of a WWW server.
-#dns_name = "www.none.org"
-#dns_name = "www.morethanone.org"
-
-# An IP address in case of a server.
-#ip_address = "192.168.1.1"
-
-# An email in case of a person
-email = "none@none.org"
-
-# An URL that has CRLs (certificate revocation lists)
-# available. Needed in CA certificates.
-#crl_dist_points = "http://www.getcrl.crl/getcrl/"
-
-# Whether this is a CA certificate or not
-#ca
-
-# Whether this certificate will be used for a TLS client
-#tls_www_client
-
-# Whether this certificate will be used for a TLS server
-tls_www_server
-
-# Whether this certificate will be used to sign data (needed
-# in TLS DHE ciphersuites).
-#signing_key
-
-# Whether this certificate will be used to encrypt data (needed
-# in TLS RSA ciphersuites). Note that it is prefered to use different
-# keys for encryption and signing.
-encryption_key
-
-# Whether this key will be used to sign other certificates.
-#cert_signing_key
-
-# Whether this key will be used to sign CRLs.
-#crl_signing_key
-
-# Whether this key will be used to sign code.
-#code_signing_key
-
-# Whether this key will be used to sign OCSP data.
-#ocsp_signing_key
-
-# Whether this key will be used for time stamping.
-#time_stamping_key
diff --git a/odoo.py b/odoo.py
new file mode 100755
index 00000000000..54e32726f55
--- /dev/null
+++ b/odoo.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python2
+#----------------------------------------------------------
+# odoo cli
+#
+# To install your odoo development environement type:
+#
+# wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
+#
+# The setup_* subcommands used to boostrap odoo are defined here inline and may
+# only depends on the python 2.7 stdlib
+#
+# The rest of subcommands are defined in odoo/cli or in <module>/cli by
+# subclassing the Command object
+#
+# https://raw.githubusercontent.com/odoo-dev/odoo/master-odoo-cmd-fme/odoo.py
+#
+#----------------------------------------------------------
+import os
+import re
+import sys
+import subprocess
+
+GIT_HOOKS_PRE_PUSH = """
+#!/usr/bin/env python2
+import re
+import sys
+if re.search('github.com[:/]odoo/odoo.git$', sys.argv[2]):
+    print "Pushing to /odoo/odoo.git is forbidden, please push to odoo-dev, use -f to override"
+    sys.exit(1)
+"""
+
+def printf(f,*l):
+    print "odoo:" + f % l
+
+def run(*l):
+    if isinstance(l[0], list):
+        l = l[0]
+    printf("running %s", " ".join(l))
+    subprocess.check_call(l)
+
+def git_locate():
+    # Locate git dir
+    # TODO add support for os.environ.get('GIT_DIR')
+
+    # check for an odoo child
+    if os.path.isfile('odoo/.git/config'):
+        os.chdir('odoo')
+
+    path = os.getcwd()
+    while path != '/':
+        gitconfig_path = os.path.join(path, '.git/config')
+        if os.path.isfile(gitconfig_path):
+            content = open(gitconfig_path).read()
+            if re.search('github.com[:/]odoo/odoo.git', content):
+                break
+        path = os.path.dirname(path)
+    if path == '/':
+        path = None
+    return path
+
+def cmd_setup_git_init():
+    git_dir = git_locate()
+    if git_dir:
+        printf('git repo found at %s',git_dir)
+    else:
+        run("git", "init", "odoo")
+        git_dir = os.path.join(os.getcwd(), 'odoo')
+    if git_dir:
+        # sane push config for git < 2.0
+        run('git','config','push.default','simple')
+        # merge bzr style
+        run('git','config','merge.ff','no')
+        run('git','config','merge.commit','no')
+        # push hooks
+        pre_push_path = os.path.join(git_dir, '.git/hooks/pre-push')
+        open(pre_push_path,'w').write(GIT_HOOKS_PRE_PUSH.strip())
+        os.chmod(pre_push_path, 0755)
+        # setup odoo remote
+        run('git','config','remote.odoo.url','https://github.com/odoo/odoo.git')
+        run('git','config','remote.odoo.pushurl','git@github.com:odoo/odoo.git')
+        run('git','config','--add','remote.odoo.fetch','dummy')
+        run('git','config','--unset-all','remote.odoo.fetch')
+        run('git','config','--add','remote.odoo.fetch','+refs/heads/*:refs/remotes/odoo/heads/*')
+        # setup odoo-dev remote
+        run('git','config','remote.odoo-dev.url','https://github.com/odoo-dev/odoo.git')
+        run('git','config','remote.odoo-dev.pushurl','git@github.com:odoo-dev/odoo.git')
+        run('git','remote','update')
+        # setup master branch
+        run('git','config','branch.master.remote','odoo')
+        run('git','config','branch.master.merge','refs/heads/master')
+        run('git','checkout','master')
+    else:
+        printf('no git repo found')
+
+def cmd_setup_git_odoo_dev():
+    git_dir = git_locate()
+    if git_dir:
+        # setup odoo-dev remote
+        run('git','config','--add','remote.odoo-dev.fetch','dummy')
+        run('git','config','--unset-all','remote.odoo-dev.fetch')
+        run('git','config','--add','remote.odoo-dev.fetch','+refs/heads/*:refs/remotes/odoo-dev/heads/*')
+        run('git','config','--add','remote.odoo-dev.fetch','+refs/pull/*:refs/remotes/odoo-dev/pull/*')
+        run('git','remote','update')
+
+def cmd_setup_git_odoo_review():
+    git_dir = git_locate()
+    if git_dir:
+        # setup odoo-dev remote
+        run('git','config','--add','remote.odoo.fetch','dummy')
+        run('git','config','--unset-all','remote.odoo.fetch')
+        run('git','config','--add','remote.odoo.fetch','+refs/heads/*:refs/remotes/odoo/heads/*')
+        run('git','config','--add','remote.odoo.fetch','+refs/tags/*:refs/remotes/odoo/tags/*')
+        run('git','config','--add','remote.odoo.fetch','+refs/pull/*:refs/remotes/odoo/pull/*')
+
+def setup_deps_debian(git_dir):
+    debian_control_path = os.path.join(git_dir, 'debian/control')
+    debian_control = open(debian_control_path).read()
+    debs = re.findall('python-[0-9a-z]+',debian_control)
+    proc = subprocess.Popen(['sudo','apt-get','install'] + debs, stdin=open('/dev/tty'))
+    proc.communicate()
+
+def cmd_setup_deps():
+    git_dir = git_locate()
+    if git_dir:
+        if os.path.isfile('/etc/debian_version'):
+            setup_deps_debian(git_dir)
+
+def setup_pg_debian(git_dir):
+    cmd = ['sudo','su','-','postgres','-c','createuser -s %s' % os.environ['USER']]
+    subprocess.call(cmd)
+
+def cmd_setup_pg():
+    git_dir = git_locate()
+    if git_dir:
+        if os.path.isfile('/etc/debian_version'):
+            setup_pg_debian(git_dir)
+
+def cmd_setup():
+    cmd_setup_git_init()
+    cmd_setup_deps()
+    cmd_setup_pg()
+
+def main():
+    # regsitry of commands
+    g = globals()
+    cmds = dict([(i[4:],g[i]) for i in g if i.startswith('cmd_')])
+    # if curl URL | python2 then use command setup
+    if len(sys.argv) == 1 and __file__ == '<stdin>':
+        cmd_setup()
+    elif len(sys.argv) == 2 and sys.argv[1] in cmds:
+        cmds[sys.argv[1]]()
+    else:
+        import openerp
+        openerp.cli.main()
+
+if __name__ == "__main__":
+    main()
+
diff --git a/oe b/oe
deleted file mode 100755
index 03c037b735c..00000000000
--- a/oe
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /usr/bin/env python2
-
-if __name__ == '__main__':
-    import sys
-    if len(sys.argv) > 1 and sys.argv[1] == 'run-tests':
-        sys.exit(0)
-    import openerpcommand.main
-    openerpcommand.main.run()
diff --git a/openerpcommand/__init__.py b/openerpcommand/__init__.py
deleted file mode 100644
index b7131913e1e..00000000000
--- a/openerpcommand/__init__.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import argparse
-import textwrap
-
-from .call import Call
-from .client import Open, Show, ConsumeNothing, ConsumeMemory, LeakMemory, ConsumeCPU
-from .benchmarks import Bench, BenchRead, BenchFieldsViewGet, BenchDummy, BenchLogin
-from .bench_sale_mrp import BenchSaleMrp
-from . import common
-
-from . import conf # Not really server-side (in the `for` below).
-from . import cron
-from . import drop
-from . import initialize
-from . import model
-from . import module
-from . import read
-from . import scaffold
-from . import uninstall
-from . import update
-from . import web
-from . import grunt_tests
-
-command_list_server = (conf, cron, drop, initialize, model, module, read,
-                       scaffold, uninstall, update, web, grunt_tests, )
-
-command_list_client = (Call, Open, Show, ConsumeNothing, ConsumeMemory,
-                       LeakMemory, ConsumeCPU, Bench, BenchRead,
-                       BenchFieldsViewGet, BenchDummy, BenchLogin,
-                       BenchSaleMrp, )
-
-def main_parser():
-    parser = argparse.ArgumentParser(
-        usage=argparse.SUPPRESS,
-        description=textwrap.fill(textwrap.dedent("""\
-                    OpenERP Command provides a set of command-line tools around
-                    the OpenERP framework: openobject-server. All the tools are
-                    sub-commands of a single oe executable.""")),
-        epilog="""Use <command> --help to get information about the command.""",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-    )
-    description = []
-    for x in command_list_server:
-        description.append(x.__name__[len(__package__)+1:])
-        if x.__doc__:
-            description.extend([
-                ":\n",
-                textwrap.fill(str(x.__doc__).strip(),
-                              subsequent_indent='  ',
-                              initial_indent='  '),
-            ])
-        description.append("\n\n")
-    subparsers = parser.add_subparsers(
-        title="Available commands",
-        help=argparse.SUPPRESS,
-        description="".join(description[:-1]),
-    )
-    # Server-side commands.
-    for x in command_list_server:
-        x.add_parser(subparsers)
-    # Client-side commands. TODO one per .py file.
-    for x in command_list_client:
-        x(subparsers)
-    return parser
diff --git a/openerpcommand/addons/bench_sale_mrp/__init__.py b/openerpcommand/addons/bench_sale_mrp/__init__.py
deleted file mode 100644
index 99ae05ee3a1..00000000000
--- a/openerpcommand/addons/bench_sale_mrp/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-# Nothing here, the module provides only data.
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerpcommand/addons/bench_sale_mrp/__openerp__.py b/openerpcommand/addons/bench_sale_mrp/__openerp__.py
deleted file mode 100644
index 3d8781905cc..00000000000
--- a/openerpcommand/addons/bench_sale_mrp/__openerp__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': 'bench_sale_mrp',
-    'version': '0.1',
-    'category': 'Benchmarks',
-    'description': """Prepare some data to run a benchmark.""",
-    'author': 'OpenERP SA',
-    'maintainer': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base', 'sale_mrp'],
-    'data': ['data.yml'],
-    'installable': True,
-    'auto_install': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerpcommand/addons/bench_sale_mrp/data.yml b/openerpcommand/addons/bench_sale_mrp/data.yml
deleted file mode 100644
index 419492e60e1..00000000000
--- a/openerpcommand/addons/bench_sale_mrp/data.yml
+++ /dev/null
@@ -1,41 +0,0 @@
--
-  This is a subset of `sale_mrp/test/sale_mrp.yml`.
--
-  I define a product category `Mobile Products Sellable`.
--
-  !record {model: product.category, id: my_product_category_0}:
-    name: Mobile Products Sellable
--
-  I define a product `Slider Mobile`
--
-  !record {model: product.product, id:  my_slider_mobile_0}:
-    categ_id: my_product_category_0
-    cost_method: standard
-    list_price: 200.0
-    mes_type: fixed
-    name: Slider Mobile
-    procure_method: make_to_order
-    seller_delay: '1'
-    seller_ids:
-      - delay: 1
-        name: base.res_partner_agrolait
-        min_qty: 2.0
-        qty: 5.0
-    standard_price: 189.0
-    supply_method: produce
-    type: product
-    uom_id: product.product_uom_unit
-    uom_po_id: product.product_uom_unit
--
-  I create a Bill of Material for the `Slider Mobile` product.
--
-  !record {model: mrp.bom, id: mrp_bom_slidermobile0}:
-    company_id: base.main_company
-    name: Slider Mobile
-    product_efficiency: 1.0
-    product_id: my_slider_mobile_0
-    product_qty: 1.0
-    product_uom: product.product_uom_unit
-    product_uos_qty: 0.0
-    sequence: 0.0
-    type: normal
diff --git a/openerpcommand/bench_sale_mrp.py b/openerpcommand/bench_sale_mrp.py
deleted file mode 100644
index 60e53037855..00000000000
--- a/openerpcommand/bench_sale_mrp.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""
-Benchmark based on the `sale_mrp` addons (in `sale_mrp/test/sale_mrp.yml`).
-"""
-
-import time
-
-from .benchmarks import Bench
-
-class BenchSaleMrp(Bench):
-    """\
-    Similar to `sale_mrp/test/sale_mrp.yml`.
-
-    This benchmarks the OpenERP server `sale_mrp` module by creating and
-    confirming a sale order. As it creates data in the server, it is necessary
-    to ensure unique names for the newly created data. You can use the --seed
-    argument to give a lower bound to those names. (The number of generated
-    names is --jobs * --samples.)
-    """
-
-    command_name = 'bench-sale-mrp'
-    bench_name = '`sale_mrp/test/sale_mrp.yml`'
-
-    def measure_once(self, i):
-        if self.worker >= 0:
-            i = int(self.args.seed) + i + (self.worker * int(self.args.samples))
-        else:
-            i = int(self.args.seed) + i
-
-        # Resolve a few external-ids (this has little impact on the running
-        # time of the whole method).
-        product_uom_unit = self.execute('ir.model.data', 'get_object_reference', 'product', 'product_uom_unit')[1]
-        my_slider_mobile_0 = self.execute('ir.model.data', 'get_object_reference', 'bench_sale_mrp', 'my_slider_mobile_0')[1]
-        res_partner_4 = self.execute('ir.model.data', 'get_object_reference', 'base', 'res_partner_4')[1]
-        res_partner_address_7 = self.execute('ir.model.data', 'get_object_reference', 'base', 'res_partner_address_7')[1]
-        list0 = self.execute('ir.model.data', 'get_object_reference', 'product', 'list0')[1]
-        shop = self.execute('ir.model.data', 'get_object_reference', 'sale', 'shop')[1]
-
-        # Create a sale order for the product `Slider Mobile`.
-        data = {
-            'client_order_ref': 'ref_xxx_' + str(i).rjust(6, '0'),
-            'date_order': time.strftime('%Y-%m-%d'),
-            'invoice_quantity': 'order',
-            'name': 'sale_order_ref_xxx_' + str(i).rjust(6, '0'),
-            'order_line': [(0, 0, {
-                'name': 'Slider Mobile',
-                'price_unit': 2,
-                'product_uom': product_uom_unit,
-                'product_uom_qty': 5.0,
-                'state': 'draft',
-                'delay': 7.0,
-                'product_id': my_slider_mobile_0,
-                'product_uos_qty': 5,
-                'type': 'make_to_order',
-            })],
-            'order_policy': 'manual',
-            'partner_id': res_partner_4,
-            'partner_invoice_id': res_partner_address_7,
-            'partner_order_id': res_partner_address_7,
-            'partner_shipping_id': res_partner_address_7,
-            'picking_policy': 'direct',
-            'pricelist_id': list0,
-            'shop_id': shop,
-        }
-        sale_order_id = self.execute('sale.order', 'create', data, {})
-
-        # Confirm the sale order.
-        self.object_proxy.exec_workflow(self.database, self.uid, self.password, 'sale.order', 'order_confirm', sale_order_id, {})
-
diff --git a/openerpcommand/benchmarks.py b/openerpcommand/benchmarks.py
deleted file mode 100644
index 401ce077b77..00000000000
--- a/openerpcommand/benchmarks.py
+++ /dev/null
@@ -1,166 +0,0 @@
-"""
-Define a base class for client-side benchmarking.
-"""
-import hashlib
-import multiprocessing
-import sys
-import time
-
-from .client import Client
-
-class Bench(Client):
-    """
-    Base class for concurrent benchmarks. The measure_once() method must be
-    overriden.
-
-    Each sub-benchmark will be run in its own process then a report is done
-    with all the results (shared with the main process using a
-    `multiprocessing.Array`).
-    """
-
-    def __init__(self, subparsers=None):
-        super(Bench, self).__init__(subparsers)
-        self.parser.add_argument('-n', '--samples', metavar='INT',
-            default=100, help='number of measurements to take')
-            # TODO if -n <int>s is given (instead of -n <int>), run the
-            # benchmark for <int> seconds and return the number of iterations.
-        self.parser.add_argument('-o', '--output', metavar='PATH',
-            required=True, help='path to save the generated report')
-        self.parser.add_argument('--append', action='store_true',
-            default=False, help='append the report to an existing file')
-        self.parser.add_argument('-j', '--jobs', metavar='JOBS',
-            default=1, help='number of concurrent workers')
-        self.parser.add_argument('--seed', metavar='SEED',
-            default=0, help='a value to ensure different runs can create unique data')
-        self.worker = -1
-
-    def work(self, iarr=None):
-        if iarr:
-            # If an array is given, it means we are a worker process...
-            self.work_slave(iarr)
-        else:
-            # ... else we are the main process and we will spawn workers,
-            # passing them an array.
-            self.work_master()
-
-    def work_master(self):
-        N = int(self.args.samples)
-        self.arrs = [(i, multiprocessing.Array('f', range(N)))
-            for i in xrange(int(self.args.jobs))]
-        ps = [multiprocessing.Process(target=self.run, args=(arr,))
-            for arr in self.arrs]
-        [p.start() for p in ps]
-        [p.join() for p in ps]
-
-        self.report_html()
-
-    def work_slave(self, iarr):
-        j, arr = iarr
-        self.worker = j
-        N = int(self.args.samples)
-        total_t0 = time.time()
-        for i in xrange(N):
-            t0 = time.time()
-            self.measure_once(i)
-            t1 = time.time()
-            arr[i] = t1 - t0
-            print >> sys.stdout, '\r%s' % ('|' * (i * 60 / N)),
-            print >> sys.stdout, '%s %s%%' % \
-                (' ' * (60 - (i * 60 / N)), int(float(i+1)/N*100)),
-            sys.stdout.flush()
-        total_t1 = time.time()
-        print '\nDone in %ss.' % (total_t1 - total_t0)
-
-    def report_html(self):
-        series = []
-        for arr in self.arrs:
-            serie = """{
-                data: %s,
-                points: { show: true }
-            }""" % ([[x, i] for i, x in enumerate(arr)],)
-            series.append(serie)
-        chart_id = hashlib.md5(" ".join(sys.argv)).hexdigest()
-        HEADER = """<!doctype html>
-<title>Benchmarks</title>
-<meta charset=utf-8>
-<script type="text/javascript" src="js/jquery.min.js"></script>
-<script type="text/javascript" src="js/jquery.flot.js"></script>
-"""
-
-        CONTENT = """<h1>%s</h1>
-%s
-<div id='chart_%s' style='width:400px;height:300px;'>...</div>
-<script type="text/javascript">
-$.plot($("#chart_%s"), [%s],
-  {yaxis: { ticks: false }});
-</script>""" % (self.bench_name, ' '.join(sys.argv), chart_id, chart_id,
-        ','.join(series))
-        if self.args.append:
-            with open(self.args.output, 'a') as f:
-                f.write(CONTENT,)
-        else:
-            with open(self.args.output, 'w') as f:
-                f.write(HEADER + CONTENT,)
-
-    def measure_once(self, i):
-        """
-        The `measure_once` method is called --jobs times. A `i` argument is
-        supplied to allow to create unique values for each execution (e.g. to
-        supply fresh identifiers to a `create` method.
-        """
-        pass
-
-class BenchRead(Bench):
-    """Read a record repeatedly."""
-
-    command_name = 'bench-read'
-    bench_name = 'res.users.read(1)'
-
-    def __init__(self, subparsers=None):
-        super(BenchRead, self).__init__(subparsers)
-        self.parser.add_argument('-m', '--model', metavar='MODEL',
-            required=True, help='the model')
-        self.parser.add_argument('-i', '--id', metavar='RECORDID',
-            required=True, help='the record id')
-
-    def measure_once(self, i):
-        self.execute(self.args.model, 'read', [self.args.id], [])
-
-class BenchFieldsViewGet(Bench):
-    """Read a record's fields and view architecture repeatedly."""
-
-    command_name = 'bench-view'
-    bench_name = 'res.users.fields_view_get(1)'
-
-    def __init__(self, subparsers=None):
-        super(BenchFieldsViewGet, self).__init__(subparsers)
-        self.parser.add_argument('-m', '--model', metavar='MODEL',
-            required=True, help='the model')
-        self.parser.add_argument('-i', '--id', metavar='RECORDID',
-            required=True, help='the record id')
-
-    def measure_once(self, i):
-        self.execute(self.args.model, 'fields_view_get', self.args.id)
-
-class BenchDummy(Bench):
-    """Dummy (call test.limits.model.consume_nothing())."""
-
-    command_name = 'bench-dummy'
-    bench_name = 'test.limits.model.consume_nothing()'
-
-    def __init__(self, subparsers=None):
-        super(BenchDummy, self).__init__(subparsers)
-        self.parser.add_argument('-a', '--args', metavar='ARGS',
-            default='', help='some arguments to serialize')
-
-    def measure_once(self, i):
-        self.execute('test.limits.model', 'consume_nothing')
-
-class BenchLogin(Bench):
-    """Login (update res_users.date)."""
-
-    command_name = 'bench-login'
-    bench_name = 'res.users.login(1)'
-
-    def measure_once(self, i):
-        self.common_proxy.login(self.database, self.user, self.password)
diff --git a/openerpcommand/call.py b/openerpcommand/call.py
deleted file mode 100644
index b4f9e95075a..00000000000
--- a/openerpcommand/call.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-Call an arbitrary model's method.
-"""
-import ast
-import os
-import pprint
-import sys
-import time
-import xmlrpclib
-
-import client
-
-class Call(client.Client):
-    """\
-    Call an arbitrary model's method.
-
-    Example:
-      > oe call res.users.read '[1, 3]' '[]' -u 1 -p admin
-    """
-    # TODO The above docstring is completely borked in the
-    # --help message.
-
-    command_name = 'call'
-
-    def __init__(self, subparsers=None):
-        super(Call, self).__init__(subparsers)
-        self.parser.add_argument('call', metavar='MODEL.METHOD',
-            help='the model and the method to call, using the '
-            '<model>.<method> format.')
-        self.parser.add_argument('args', metavar='ARGUMENT',
-            nargs='+',
-            help='the argument for the method call, must be '
-            '`ast.literal_eval` compatible. Can be repeated.')
-
-    def work(self):
-        try:
-            model, method = self.args.call.rsplit('.', 1)
-        except:
-            print "Invalid syntax `%s` must have the form <model>.<method>."
-            sys.exit(1)
-        args = tuple(map(ast.literal_eval, self.args.args)) if self.args.args else ()
-        x = self.execute(model, method, *args)
-        pprint.pprint(x, indent=4)
-
diff --git a/openerpcommand/client.py b/openerpcommand/client.py
deleted file mode 100644
index 87586b68ddf..00000000000
--- a/openerpcommand/client.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""
-Define a few common arguments for client-side command-line tools.
-"""
-import os
-import sys
-import time
-import xmlrpclib
-
-import common
-
-class Client(common.Command):
-    """
-    Base class for XML-RPC command-line clients. It must be inherited and the
-    work() method overriden.
-    """
-
-    def __init__(self, subparsers=None):
-        super(Client, self).__init__(subparsers)
-        required_or_default = common.required_or_default
-        self.parser.add_argument('-H', '--host', metavar='HOST',
-            **required_or_default('HOST', 'the server host'))
-        self.parser.add_argument('-P', '--port', metavar='PORT',
-            **required_or_default('PORT', 'the server port'))
-
-    def execute(self, *args):
-        return self.object_proxy.execute(self.database, self.uid, self.password, *args)
-
-    def initialize(self):
-        self.host = self.args.host
-        self.port = int(self.args.port)
-        self.database = self.args.database
-        self.user = self.args.user
-        self.password = self.args.password
-
-        self.url = 'http://%s:%d/xmlrpc/' % (self.host, self.port)
-        self.common_proxy = xmlrpclib.ServerProxy(self.url + 'common')
-        self.object_proxy = xmlrpclib.ServerProxy(self.url + 'object')
-
-        try:
-            self.uid = int(self.user)
-        except ValueError, e:
-            self.uid = self.common_proxy.login(self.database, self.user, self.password)
-
-    def run(self, *args):
-        self.initialize()
-        self.work(*args)
-
-    def work(self, *args):
-        pass
-
-class Open(Client):
-    """Get the web client's URL to view a specific model."""
-
-    command_name = 'open'
-
-    def __init__(self, subparsers=None):
-        super(Open, self).__init__(subparsers)
-        self.parser.add_argument('-m', '--model', metavar='MODEL',
-            required=True, help='the view type')
-        self.parser.add_argument('-v', '--view-mode', metavar='VIEWMODE',
-            default='tree', help='the view mode')
-
-    def work(self):
-        ids = self.execute('ir.actions.act_window', 'search', [
-            ('res_model', '=', self.args.model),
-            ('view_mode', 'like', self.args.view_mode),
-            ])
-        xs = self.execute('ir.actions.act_window', 'read', ids, [])
-        for x in xs:
-            print x['id'], x['name']
-            d = {}
-            d['host'] = self.host
-            d['port'] = self.port
-            d['action_id'] = x['id']
-            print "  http://%(host)s:%(port)s/web/webclient/home#action_id=%(action_id)s" % d
-
-class Show(Client):
-    """Display a record."""
-
-    command_name = 'show'
-
-    def __init__(self, subparsers=None):
-        super(Show, self).__init__(subparsers)
-        self.parser.add_argument('-m', '--model', metavar='MODEL',
-            required=True, help='the model')
-        self.parser.add_argument('-i', '--id', metavar='RECORDID',
-            required=True, help='the record id')
-
-    def work(self):
-        xs = self.execute(self.args.model, 'read', [self.args.id], [])
-        if xs:
-            x = xs[0]
-            print x['name']
-        else:
-            print "Record not found."
-
-class ConsumeNothing(Client):
-    """Call test.limits.model.consume_nothing()."""
-
-    command_name = 'consume-nothing'
-
-    def work(self):
-        xs = self.execute('test.limits.model', 'consume_nothing')
-
-class ConsumeMemory(Client):
-    """Call test.limits.model.consume_memory()."""
-
-    command_name = 'consume-memory'
-
-    def __init__(self, subparsers=None):
-        super(ConsumeMemory, self).__init__(subparsers)
-        self.parser.add_argument('--size', metavar='SIZE',
-            required=True, help='size of the list to allocate')
-
-    def work(self):
-        xs = self.execute('test.limits.model', 'consume_memory', int(self.args.size))
-
-class LeakMemory(ConsumeMemory):
-    """Call test.limits.model.leak_memory()."""
-
-    command_name = 'leak-memory'
-
-    def work(self):
-        xs = self.execute('test.limits.model', 'leak_memory', int(self.args.size))
-
-class ConsumeCPU(Client):
-    """Call test.limits.model.consume_cpu_time()."""
-
-    command_name = 'consume-cpu'
-
-    def __init__(self, subparsers=None):
-        super(ConsumeCPU, self).__init__(subparsers)
-        self.parser.add_argument('--seconds', metavar='INT',
-            required=True, help='how much CPU time to consume')
-
-    def work(self):
-        xs = self.execute('test.limits.model', 'consume_cpu_time', int(self.args.seconds))
diff --git a/openerpcommand/common.py b/openerpcommand/common.py
deleted file mode 100644
index 7572bb4efa6..00000000000
--- a/openerpcommand/common.py
+++ /dev/null
@@ -1,108 +0,0 @@
-"""
-Define a few common arguments for server-side command-line tools.
-"""
-import argparse
-import os
-try:
-    from setproctitle import setproctitle
-except ImportError:
-    setproctitle = lambda x: None
-import sys
-
-def add_addons_argument(parser):
-    """
-    Add a common --addons argument to a parser.
-    """
-    parser.add_argument('--addons', metavar='ADDONS',
-        **required_or_default('ADDONS',
-                              'colon-separated list of paths to addons'))
-def set_addons(args):
-    """
-    Turn args.addons into a list instead of a column-separated strings.
-    Set openerp.toools.config accordingly.
-    """
-    import openerp.tools.config
-    config = openerp.tools.config
-
-    assert hasattr(args, 'addons')
-    if args.addons:
-        args.addons = args.addons.split(':')
-    else:
-        args.addons = []
-
-    config['addons_path'] = ','.join(args.addons)
-
-def get_addons_from_paths(paths, exclude):
-    """
-    Build a list of available modules from a list of addons paths.
-    """
-    exclude = exclude or []
-    module_names = []
-    for p in paths:
-        if os.path.exists(p):
-            names = [n for n in os.listdir(p) if os.path.isfile(os.path.join(p, n, '__openerp__.py')) and not n.startswith('.') and n not in exclude]
-            names = filter(lambda a: os.path.isdir(os.path.join(p, a)), names)
-            names = filter(lambda a: os.path.exists(os.path.join(p, a, '__openerp__.py')), names)
-            module_names.extend(names)
-        else:
-            print "The addons path `%s` doesn't exist." % p
-            sys.exit(1)
-    return module_names
-
-def required_or_default(name, h):
-    """
-    Helper to define `argparse` arguments. If the name is the environment,
-    the argument is optional and draw its value from the environment if not
-    supplied on the command-line. If it is not in the environment, make it
-    a mandatory argument.
-    """
-    if os.environ.get('OPENERP_' + name.upper()):
-        d = {'default': os.environ['OPENERP_' + name.upper()]}
-    else:
-        d = {'required': True}
-    d['help'] = h + '. The environment variable OPENERP_' + \
-                name.upper() + ' can be used instead.'
-    return d
-
-class Command(object):
-    """
-    Base class to create command-line tools. It must be inherited and the
-    run() method overriden.
-    """
-
-    command_name = 'stand-alone'
-
-    def __init__(self, subparsers=None):
-        if subparsers:
-            self.parser = parser = subparsers.add_parser(self.command_name,
-	        description=self.__class__.__doc__)
-        else:
-            self.parser = parser = argparse.ArgumentParser(
-                description=self.__class__.__doc__)
-
-        parser.add_argument('-d', '--database', metavar='DATABASE',
-            **required_or_default('DATABASE', 'the database to connect to'))
-        parser.add_argument('-u', '--user', metavar='USER',
-            **required_or_default('USER', 'the user login or ID. When using '
-            'RPC, providing an ID avoid the login() step'))
-        parser.add_argument('-p', '--password', metavar='PASSWORD',
-            **required_or_default('PASSWORD', 'the user password')) # TODO read it from the command line or from file.
-
-        parser.set_defaults(run=self.run_with_args)
-
-    def run_with_args(self, args):
-        self.args = args
-        self.run()
-
-    def run(self):
-        print 'Stub Command.run().'
-
-    @classmethod
-    def stand_alone(cls):
-        """
-        A single Command object is a complete command-line program. See
-        `openerp-command/stand-alone` for an example.
-        """
-        command = cls()
-        args = command.parser.parse_args()
-        args.run(args)
diff --git a/openerpcommand/conf.py b/openerpcommand/conf.py
deleted file mode 100644
index 98237ea5ad8..00000000000
--- a/openerpcommand/conf.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-Display the currently used configuration. The configuration for any
-sub-command is normally given by options. But some options can be specified
-using environment variables. This sub-command shows those variables.
-A `set` sub-command should be provided when the configuration is in a real
-configuration file instead of environment variables.
-"""
-import os
-import sys
-import textwrap
-
-def run(args):
-    for x in ('database', 'addons', 'host', 'port'):
-        x_ = ('openerp_' + x).upper()
-        if x_ in os.environ:
-            print '%s: %s' % (x, os.environ[x_])
-        else:
-            print '%s: <not set>' % (x, )
-    os.environ['OPENERP_DATABASE'] = 'yeah'
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('conf',
-        description='Display the currently used configuration.')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/cron.py b/openerpcommand/cron.py
deleted file mode 100644
index abfe1272b17..00000000000
--- a/openerpcommand/cron.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""
-Run an OpenERP cron process.
-"""
-
-import os
-
-import common
-
-def run(args):
-    import openerp
-    import openerp.cli.server
-    import openerp.tools.config
-    import openerp.service.cron
-    config = openerp.tools.config
-
-    os.environ["TZ"] = "UTC"
-    common.set_addons(args)
-    args.database = args.database or []
-
-    config['log_handler'] = [':WARNING', 'openerp.addons.base.ir.ir_cron:DEBUG']
-
-    openerp.multi_process = True
-    common.setproctitle('openerp-cron [%s]' % ', '.join(args.database))
-
-    openerp.cli.server.check_root_user()
-    openerp.netsvc.init_logger()
-    #openerp.cli.server.report_configuration()
-    openerp.cli.server.setup_signal_handlers(openerp.cli.server.signal_handler)
-    import openerp.addons.base
-    if args.database:
-        for db in args.database:
-            openerp.cli.server.preload_registry(db)
-        openerp.service.cron.start_service()
-        openerp.cli.server.quit_on_signals()
-    else:
-        print "No database given."
-
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('cron',
-        description='Run an OpenERP cron process.')
-    common.add_addons_argument(parser)
-    parser.add_argument('--database', action='append',
-        help='Database for which cron jobs are processed (can be repeated)')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/drop.py b/openerpcommand/drop.py
deleted file mode 100644
index b64442716de..00000000000
--- a/openerpcommand/drop.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-Drop a database.
-"""
-
-import common
-
-# TODO turn template1 in a parameter
-# This should be exposed from openerp (currently in
-# openerp/service/web_services.py).
-def drop_database(database_name):
-    import openerp
-    openerp.netsvc.init_logger()
-    db = openerp.sql_db.db_connect('template1')
-    cr = db.cursor()
-    cr.autocommit(True) # avoid transaction block
-    try:
-        # TODO option for doing this.
-        # Try to terminate all other connections that might prevent
-        # dropping the database
-
-        # PostgreSQL 9.2 renamed pg_stat_activity.procpid to pid:
-        # http://www.postgresql.org/docs/9.2/static/release-9-2.html#AEN110389
-        pid_col = 'pid' if cr._cnx.server_version >= 90200 else 'procpid'
-        try:
-            cr.execute("""SELECT pg_terminate_backend(%(pid_col)s)
-                          FROM pg_stat_activity
-                          WHERE datname = %%s AND 
-                                %(pid_col)s != pg_backend_pid()""" % {'pid_col': pid_col},
-                       (database_name,))
-        except Exception:
-            pass
-
-        try:
-            cr.execute('DROP DATABASE "%s"' % database_name, log_exceptions=False)
-        except Exception, e:
-            print "Can't drop %s" % (database_name,)
-    finally:
-        cr.close()
-
-def run(args):
-    assert args.database
-    drop_database(args.database)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('drop',
-        description='Drop a database.')
-    parser.add_argument('-d', '--database', metavar='DATABASE',
-        **common.required_or_default('DATABASE', 'the database to create'))
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/grunt_tests.py b/openerpcommand/grunt_tests.py
deleted file mode 100644
index db2513f2bc0..00000000000
--- a/openerpcommand/grunt_tests.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-Search for Gruntfile.js files in all the addons and launch them using the 'grunt test' command.
-"""
-
-import common
-import fnmatch
-import os
-import re
-import sys
-import subprocess
-
-def grunt_tester(directories, log = sys.stdout):
-    result = 0
-
-    matches = []
-    for direc in directories:
-        for root, dirnames, filenames in os.walk(direc):
-            for filename in fnmatch.filter(filenames, 'Gruntfile.js'):
-                full = os.path.join(root, filename)
-                if re.match(r"(^.*?/node_modules/.*$)|(^.*?/lib/.*$)", full):
-                    continue
-                matches.append(full)
-
-    for file_ in matches:
-        folder = os.path.dirname(file_)
-        p = subprocess.Popen(['npm', 'install'], cwd=folder)
-        if p.wait() != 0:
-            raise Exception("Failed to install dependencies for Gruntfile located in folder %s" % folder)
-
-        p = subprocess.Popen(['grunt', 'test', '--no-color'], cwd=folder, stdout=log, stderr=log)
-        if p.wait() != 0:
-            result = 1
-
-    return result
-
-def run(args):
-    if args.addons:
-        args.addons = args.addons.split(':')
-    else:
-        args.addons = []
-    result = grunt_tester(args.addons)
-    if result != 0:
-        sys.exit(result)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('grunt-tests',
-        description='Run the tests contained in Gruntfile.js files.')
-    common.add_addons_argument(parser)
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/initialize.py b/openerpcommand/initialize.py
deleted file mode 100644
index cf4e54bfb82..00000000000
--- a/openerpcommand/initialize.py
+++ /dev/null
@@ -1,121 +0,0 @@
-"""
-Install OpenERP on a new (by default) database.
-"""
-import contextlib
-import errno
-import os
-import sys
-import time
-
-import common
-
-# From http://code.activestate.com/recipes/576572/
-@contextlib.contextmanager
-def lock_file(path, wait_delay=.1, max_try=600):
-    attempt = 0
-    while True:
-        attempt += 1
-        if attempt > max_try:
-            raise IOError("Could not lock file %s." % path)
-        try:
-            fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDWR)
-        except OSError, e:
-            if e.errno != errno.EEXIST:
-                raise
-            time.sleep(wait_delay)
-            continue
-        else:
-            break
-    try:
-        yield fd
-    finally:
-        os.close(fd)
-        os.unlink(path)
-
-def run(args):
-    assert args.database
-    assert not (args.module and args.all_modules)
-
-    import openerp
-
-    config = openerp.tools.config
-    config['db_name'] = args.database
-
-    if args.tests:
-        config['log_handler'] = [':INFO']
-        config['test_enable'] = True
-        config['without_demo'] = False
-        if args.port:
-            config['xmlrpc_port'] = int(args.port)
-    else:
-        config['log_handler'] = [':CRITICAL']
-        config['test_enable'] = False
-        config['without_demo'] = True
-
-    if args.addons:
-        args.addons = args.addons.split(':')
-    else:
-        args.addons = []
-    config['addons_path'] = ','.join(args.addons)
-
-    if args.all_modules:
-        module_names = common.get_addons_from_paths(args.addons, args.exclude)
-    elif args.module:
-        module_names = args.module
-    else:
-        module_names = ['base']
-    config['init'] = dict.fromkeys(module_names, 1)
-
-    if args.coverage:
-        import coverage
-        # Without the `include` kwarg, coverage generates 'memory:0xXXXXX'
-        # filenames (which do not exist) and cause it to crash. No idea why.
-        cov = coverage.coverage(branch=True, include='*.py')
-        cov.start()
-    openerp.netsvc.init_logger()
-
-    if not args.no_create:
-        with lock_file('/tmp/global_openerp_create_database.lock'):
-            openerp.service.db._create_empty_database(args.database)
-
-    config['workers'] = False
-
-    rc = openerp.service.server.start(preload=[args.database], stop=True)
-
-    if args.coverage:
-        cov.stop()
-        cov.html_report(directory='coverage')
-        # If we wanted the report on stdout:
-        # cov.report()
-
-    sys.exit(rc)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('initialize',
-        description='Create and initialize a new OpenERP database.')
-    parser.add_argument('-d', '--database', metavar='DATABASE',
-        **common.required_or_default('DATABASE', 'the database to create'))
-    common.add_addons_argument(parser)
-    parser.add_argument('-P', '--port', metavar='PORT',
-        **common.required_or_default('PORT', 'the server port'))
-    parser.add_argument('--module', metavar='MODULE', action='append',
-        help='specify a module to install'
-        ' (this option can be repeated)')
-    parser.add_argument('--all-modules', action='store_true',
-        help='install all visible modules (not compatible with --module)')
-    parser.add_argument('--no-create', action='store_true',
-        help='do not create the database, only initialize it')
-    parser.add_argument('--exclude', metavar='MODULE', action='append',
-        help='exclude a module from installation'
-        ' (this option can be repeated)')
-    parser.add_argument('--tests', action='store_true',
-        help='run the tests as modules are installed'
-        ' (use the `run-tests` command to choose specific'
-        ' tests to run against an existing database).'
-        ' Demo data are installed.')
-    parser.add_argument('--coverage', action='store_true',
-        help='report code coverage (particularly useful with --tests).'
-        ' The report is generated in a coverage directory and you can'
-        ' then point your browser to coverage/index.html.')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/main.py b/openerpcommand/main.py
deleted file mode 100644
index f5a1b03f774..00000000000
--- a/openerpcommand/main.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import openerpcommand
-
-def run():
-    """ Main entry point for the openerp-command tool."""
-    parser = openerpcommand.main_parser()
-    args = parser.parse_args()
-    args.run(args)
diff --git a/openerpcommand/model.py b/openerpcommand/model.py
deleted file mode 100644
index ccd3ae78718..00000000000
--- a/openerpcommand/model.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""
-Display information about a given model.
-"""
-import os
-import sys
-import textwrap
-
-def run(args):
-    assert args.database
-    assert args.model
-    import openerp
-    openerp.tools.config['log_level'] = 100
-    openerp.netsvc.init_logger()
-    registry = openerp.modules.registry.RegistryManager.get(
-        args.database, update_module=False)
-    model = registry[args.model]
-    longest_k = 1
-    longest_string = 1
-    columns = model._columns
-
-    if args.field and args.field not in columns:
-        print "No such field."
-        sys.exit(1)
-        
-    if args.field:
-        columns = { args.field: columns[args.field] }
-    else:
-        print "Fields (model `%s`, database `%s`):" % (args.model, args.database)
-
-    for k, v in columns.items():
-        longest_k = len(k) if longest_k < len(k) else longest_k
-        longest_string = len(v.string) \
-            if longest_string < len(v.string) else longest_string
-    for k, v in sorted(columns.items()):
-        attr = []
-        if v.required:
-            attr.append("Required")
-        if v.readonly:
-            attr.append("Read-only")
-        attr = '/'.join(attr)
-        attr = '(' + attr + ')' if attr else attr
-        if args.verbose:
-            print v.string, '-- ' + k + ', ' + v._type, attr
-        else:
-            print k.ljust(longest_k + 2), v._type, attr
-        if args.verbose and v.help:
-            print textwrap.fill(v.help, initial_indent='    ', subsequent_indent='    ')
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('model',
-        description='Display information about a given model for an existing database.')
-    parser.add_argument('-d', '--database', metavar='DATABASE', required=True,
-        help='the database to connect to')
-    parser.add_argument('-m', '--model', metavar='MODEL', required=True,
-        help='the model for which information should be displayed')
-    parser.add_argument('-v', '--verbose', action='store_true',
-        help='display more information')
-    parser.add_argument('-f', '--field', metavar='FIELD',
-        help='display information only for this particular field')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/module.py b/openerpcommand/module.py
deleted file mode 100644
index 284c0186785..00000000000
--- a/openerpcommand/module.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-Show module information for a given database or from the file-system.
-"""
-import os
-import sys
-import textwrap
-
-from . import common
-
-# TODO provide a --rpc flag to use XML-RPC (with a specific username) instead
-# of server-side library.
-def run(args):
-    assert args.database
-    import openerp
-
-    config = openerp.tools.config
-    config['log_handler'] = [':CRITICAL']
-    if args.addons:
-        args.addons = args.addons.split(':')
-    else:
-        args.addons = []
-    config['addons_path'] = ','.join(args.addons)
-    openerp.netsvc.init_logger()
-
-    if args.filesystem:
-        module_names = common.get_addons_from_paths(args.addons, [])
-        print "Modules (addons path %s):" % (', '.join(args.addons),)
-        for x in sorted(module_names):
-            print x
-    else:
-        registry = openerp.modules.registry.RegistryManager.get(
-            args.database, update_module=False)
- 
-        xs = []
-        ir_module_module = registry.get('ir.module.module')
-        with registry.cursor() as cr:
-            ids = ir_module_module.search(cr, openerp.SUPERUSER_ID, [], {})
-            xs = ir_module_module.read(cr, openerp.SUPERUSER_ID, ids, [], {})
- 
-        if xs:
-            print "Modules (database `%s`):" % (args.database,)
-            for x in xs:
-                if args.short:
-                    print '%3d %s' % (x['id'], x['name'])
-                else:
-                    print '%3d %s %s' % (x['id'], x['name'], {'installed': '(installed)'}.get(x['state'], ''))
-        else:
-            print "No module found (database `%s`)." % (args.database,)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('module',
-        description='Display modules known from a given database or on file-system.')
-    parser.add_argument('-d', '--database', metavar='DATABASE',
-        **common.required_or_default('DATABASE', 'the database to modify'))
-    common.add_addons_argument(parser)
-    parser.add_argument('-m', '--module', metavar='MODULE', required=False,
-        help='the module for which information should be shown')
-    parser.add_argument('-v', '--verbose', action='store_true',
-        help='display more information')
-    parser.add_argument('--short', action='store_true',
-        help='display less information')
-    parser.add_argument('-f', '--filesystem', action='store_true',
-        help='display module in the addons path, not in db')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/oe-bash-completion b/openerpcommand/oe-bash-completion
deleted file mode 100644
index 57a4391d803..00000000000
--- a/openerpcommand/oe-bash-completion
+++ /dev/null
@@ -1,89 +0,0 @@
-_oe()
-{
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-
-    cmd="${COMP_WORDS[0]}"
-    subcmd=""
-    if [[ ${COMP_CWORD} > 0 ]] ; then
-        subcmd="${COMP_WORDS[1]}"
-    fi
-
-    # oe
-
-    opts="initialize model read run-tests scaffold update \
-        call open show consume-nothing consume-memory leak-memory \
-        consume-cpu bench-read bench-fields-view-get bench-dummy bench-login \
-        bench-sale-mrp --help"
-
-    if [[ ${prev} == oe && ${cur} != -* ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # oe call
-
-    opts="--database --user --password --host --port --help"
-
-    if [[ ${subcmd} == call ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # oe initialize
-
-    opts="--database --addons --all-modules --exclude --no-create --help"
-
-    if [[ ${subcmd} == initialize ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # oe model
-
-    opts="--database --model --field --verbose --help"
-
-    if [[ ${subcmd} == model ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # oe read
-
-    opts="--database --model --id --field --verbose --short --help"
-
-    if [[ ${subcmd} == read ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # oe run-tests
-
-    opts="--database --addons --module --dry-run --help"
-
-    if [[ ${subcmd} == run-tests ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # oe scaffold
-
-    opts="--help"
-
-    if [[ ${subcmd} == scaffold ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-    # fallback for unimplemented completion
-
-    opts="--help"
-
-    if [[ true ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-}
-complete -F _oe oe
diff --git a/openerpcommand/read.py b/openerpcommand/read.py
deleted file mode 100644
index 61c05117875..00000000000
--- a/openerpcommand/read.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""
-Read a record.
-"""
-import os
-import sys
-import textwrap
-
-import common
-
-# TODO provide a --rpc flag to use XML-RPC (with a specific username) instead
-# of server-side library.
-def run(args):
-    assert args.database
-    assert args.model
-    import openerp
-    config = openerp.tools.config
-    config['log_handler'] = [':CRITICAL']
-    common.set_addons(args)
-    openerp.netsvc.init_logger()
-    registry = openerp.modules.registry.RegistryManager.get(
-        args.database, update_module=False)
-    model = registry[args.model]
-    field_names = [args.field] if args.field else []
-    if args.short:
-        # ignore --field
-        field_names = ['name']
-    with registry.cursor() as cr:
-        xs = model.read(cr, 1, args.id, field_names, {})
-
-    if xs:
-        print "Records (model `%s`, database `%s`):" % (args.model, args.database)
-        x = xs[0]
-        if args.short:
-            print str(x['id']) + '.', x['name']
-        else:
-            longest_k = 1
-            for k, v in x.items():
-                longest_k = len(k) if longest_k < len(k) else longest_k
-            for k, v in sorted(x.items()):
-                print (k + ':').ljust(longest_k + 2), v
-    else:
-        print "Record not found."
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('read',
-        description='Display a record.')
-    parser.add_argument('-d', '--database', metavar='DATABASE',
-        **common.required_or_default('DATABASE', 'the database to connect to'))
-    common.add_addons_argument(parser)
-    parser.add_argument('-m', '--model', metavar='MODEL', required=True,
-        help='the model for which a record should be read')
-    parser.add_argument('-i', '--id', metavar='RECORDID', required=True,
-        help='the record id')
-    parser.add_argument('-v', '--verbose', action='store_true',
-        help='display more information')
-    parser.add_argument('--short', action='store_true',
-        help='display less information')
-    parser.add_argument('-f', '--field', metavar='FIELD',
-        help='display information only for this particular field')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/scaffold.py b/openerpcommand/scaffold.py
deleted file mode 100644
index 4713f739306..00000000000
--- a/openerpcommand/scaffold.py
+++ /dev/null
@@ -1,131 +0,0 @@
-"""
-Generate an OpenERP module skeleton.
-"""
-
-import functools
-import keyword
-import os
-import re
-import sys
-
-import jinja2
-
-# FIXME: add logging
-def run(args):
-    env = jinja2.Environment(loader=jinja2.PackageLoader(
-        'openerpcommand', 'templates'))
-    env.filters['snake'] = snake
-    args.dependency = 'web' if args.controller else 'base'
-
-    module_name = snake(args.module)
-    module = functools.partial(
-        os.path.join, args.modules_dir, module_name)
-
-    if args.controller is True:
-        args.controller = module_name
-
-    if args.model is True:
-        args.model = module_name
-
-    if os.path.exists(module()):
-        message = "The path `%s` already exists." % module()
-        die(message)
-
-    dump(env, '__openerp__.jinja2', module('__openerp__.py'), config=args)
-    dump(env, '__init__.jinja2', module('__init__.py'), modules=[
-        args.controller and 'controllers',
-        args.model and 'models'
-    ])
-    dump(env, 'ir.model.access.jinja2', module('security', 'ir.model.access.csv'), config=args)
-
-    if args.controller:
-        controller_module = snake(args.controller)
-        dump(env, '__init__.jinja2', module('controllers', '__init__.py'), modules=[controller_module])
-        dump(env, 'controllers.jinja2',
-             module('controllers', '%s.py' % controller_module),
-             config=args)
-
-    if args.model:
-        model_module = snake(args.model)
-        dump(env, '__init__.jinja2', module('models', '__init__.py'), modules=[model_module])
-        dump(env, 'models.jinja2', module('models', '%s.py' % model_module), config=args)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('scaffold',
-        description='Generate an OpenERP module skeleton.')
-    parser.add_argument('module', metavar='MODULE',
-        help='the name of the generated module')
-    parser.add_argument('modules_dir', metavar='DIRECTORY', type=directory,
-        help="Modules directory in which the new module should be generated")
-
-    controller = parser.add_mutually_exclusive_group()
-    controller.add_argument('--controller', type=identifier,
-        help="The name of the controller to generate")
-    controller.add_argument('--no-controller', dest='controller',
-        action='store_const', const=None, help="Do not generate a controller")
-
-    model = parser.add_mutually_exclusive_group()
-    model.add_argument('--model', type=identifier,
-       help="The name of the model to generate")
-    model.add_argument('--no-model', dest='model',
-       action='store_const', const=None, help="Do not generate a model")
-
-    mod = parser.add_argument_group("Module information",
-        "these are added to the module metadata and displayed on e.g. "
-        "apps.openerp.com. For company-backed modules, the company "
-        "information should be used")
-    mod.add_argument('--name', dest='author_name', default="",
-                     help="Name of the module author")
-    mod.add_argument('--website', dest='author_website', default="",
-                     help="Website of the module author")
-    mod.add_argument('--category', default="Uncategorized",
-        help="Broad categories to which the module belongs, used for "
-             "filtering within OpenERP and on apps.openerp.com."
-             "Defaults to %(default)s")
-    mod.add_argument('--summary', default="",
-        help="Short (1 phrase/line) summary of the module's purpose, used as "
-             "subtitle on modules listing or apps.openerp.com")
-
-    parser.set_defaults(run=run, controller=True, model=True)
-
-def snake(s):
-    """ snake cases ``s``
-
-    :param str s:
-    :return: str
-    """
-    # insert a space before each uppercase character preceded by a
-    # non-uppercase letter
-    s = re.sub(r'(?<=[^A-Z])\B([A-Z])', r' \1', s)
-    # lowercase everything, split on whitespace and join
-    return '_'.join(s.lower().split())
-
-def dump(env, template, dest, **kwargs):
-    outdir = os.path.dirname(dest)
-    if not os.path.exists(outdir):
-        os.makedirs(outdir)
-    env.get_template(template).stream(**kwargs).dump(dest)
-    # add trailing newline which jinja removes
-    with open(dest, 'a') as f:
-        f.write('\n')
-
-def identifier(s):
-    if keyword.iskeyword(s):
-        die("%s is a Python keyword and can not be used as a name" % s)
-    if not re.match('[A-Za-z_][A-Za-z0-9_]*', s):
-        die("%s is not a valid Python identifier" % s)
-    return s
-
-def directory(p):
-    expanded = os.path.abspath(
-        os.path.expanduser(
-            os.path.expandvars(p)))
-    if not os.path.exists(expanded):
-        os.makedirs(expanded)
-    if not os.path.isdir(expanded):
-        die("%s exists but is not a directory" % p)
-    return expanded
-
-def die(message, code=1):
-    print >>sys.stderr, message
-    sys.exit(code)
diff --git a/openerpcommand/templates/__init__.jinja2 b/openerpcommand/templates/__init__.jinja2
deleted file mode 100644
index 0124cdd2d93..00000000000
--- a/openerpcommand/templates/__init__.jinja2
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-{% for module in modules if module -%}
-import {{ module }}
-{% endfor %}
diff --git a/openerpcommand/templates/__openerp__.jinja2 b/openerpcommand/templates/__openerp__.jinja2
deleted file mode 100644
index d37a6f33334..00000000000
--- a/openerpcommand/templates/__openerp__.jinja2
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': "{{ config.module }}",
-    # short description, used as subtitles on modules listings
-    'summary': "{{ config.summary }}",
-    # long description of module purpose
-    'description': """
-""",
-    # Who you are
-    'author': "{{ config.author_name }}",
-    'website': "{{ config.author_website }}",
-
-    # categories can be used to filter modules in modules listing
-    'category': '{{ config.category }}',
-    'version': '0.1',
-
-    # any module necessary for this one to work correctly
-    'depends': ['{{ config.dependency }}'],
-    'data': [
-        {{- "'security/ir.model.access.csv'" if config.model -}}
-    ],
-    'tests': [
-    ],
-}
diff --git a/openerpcommand/templates/controllers.jinja2 b/openerpcommand/templates/controllers.jinja2
deleted file mode 100644
index 3cc47365d40..00000000000
--- a/openerpcommand/templates/controllers.jinja2
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp import http
-from openerp.addons.web.controllers import main
-
-class {{ config.controller }}(main.Home):
-    @http.route('/', auth='none')
-    def index(self):
-        return "Hello, world!"
diff --git a/openerpcommand/templates/ir.model.access.jinja2 b/openerpcommand/templates/ir.model.access.jinja2
deleted file mode 100644
index e5e2fb35fe7..00000000000
--- a/openerpcommand/templates/ir.model.access.jinja2
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-{% if config.model -%}
-access_{{ config.module|snake }}_{{ config.model|snake }},{{- '' -}}
-access_{{ config.module|snake }}_{{ config.model|snake }},{{- '' -}}
-model_{{ config.module|snake }}_{{ config.model|snake }},,1,0,0,0
-{%- endif %}
diff --git a/openerpcommand/templates/models.jinja2 b/openerpcommand/templates/models.jinja2
deleted file mode 100644
index 878bf9be4f6..00000000000
--- a/openerpcommand/templates/models.jinja2
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import orm, fields
-
-class {{ config.model }}(orm.Model):
-    _name = "{{ config.module|snake }}.{{ config.model|snake }}"
-
-    _columns = {
-        'name': fields.char(),
-    }
diff --git a/openerpcommand/uninstall.py b/openerpcommand/uninstall.py
deleted file mode 100644
index 244b0575e53..00000000000
--- a/openerpcommand/uninstall.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-Install OpenERP on a new (by default) database.
-"""
-import os
-import sys
-
-import common
-
-# TODO turn template1 in a parameter
-# This should be exposed from openerp (currently in
-# openerp/service/web_services.py).
-def create_database(database_name):
-    import openerp
-    db = openerp.sql_db.db_connect('template1')
-    cr = db.cursor() # TODO `with db as cr:`
-    try:
-        cr.autocommit(True)
-        cr.execute("""CREATE DATABASE "%s"
-            ENCODING 'unicode' TEMPLATE "template1" """ \
-            % (database_name,))
-    finally:
-        cr.close()
-
-def run(args):
-    assert args.database
-    assert args.module
-
-    import openerp
-
-    config = openerp.tools.config
-    config['log_handler'] = [':CRITICAL']
-    if args.addons:
-        args.addons = args.addons.split(':')
-    else:
-        args.addons = []
-    config['addons_path'] = ','.join(args.addons)
-    openerp.netsvc.init_logger()
-
-    # Install the import hook, to import openerp.addons.<module>.
-    openerp.modules.module.initialize_sys_path()
-
-    registry = openerp.modules.registry.RegistryManager.get(
-        args.database, update_module=False)
-
-    ir_module_module = registry.get('ir.module.module')
-    with registry.cursor() as cr:
-        ids = ir_module_module.search(cr, openerp.SUPERUSER_ID, [('name', 'in', args.module), ('state', '=', 'installed')], {})
-        if len(ids) == len(args.module):
-            ir_module_module.button_immediate_uninstall(cr, openerp.SUPERUSER_ID, ids, {})
-        else:
-            print "At least one module not found (database `%s`)." % (args.database,)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('uninstall',
-        description='Uninstall some modules from an OpenERP database.')
-    parser.add_argument('-d', '--database', metavar='DATABASE',
-        **common.required_or_default('DATABASE', 'the database to modify'))
-    common.add_addons_argument(parser)
-    parser.add_argument('--module', metavar='MODULE', action='append',
-        help='specify a module to uninstall'
-        ' (this option can be repeated)')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/update.py b/openerpcommand/update.py
deleted file mode 100644
index 66a47dc5692..00000000000
--- a/openerpcommand/update.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Update an existing OpenERP database.
-"""
-
-def run(args):
-    assert args.database
-    import openerp
-    config = openerp.tools.config
-    config['update']['all'] = 1
-    openerp.modules.registry.RegistryManager.get(
-        args.database, update_module=True)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('update',
-        description='Update an existing OpenERP database.')
-    parser.add_argument('-d', '--database', metavar='DATABASE', required=True,
-        help='the database to update')
-
-    parser.set_defaults(run=run)
diff --git a/openerpcommand/web.py b/openerpcommand/web.py
deleted file mode 100644
index 5d9d429244b..00000000000
--- a/openerpcommand/web.py
+++ /dev/null
@@ -1,93 +0,0 @@
-"""
-Run a normal OpenERP HTTP process.
-"""
-
-import logging
-import os
-import signal
-
-import common
-
-_logger = logging.getLogger(__name__)
-
-def mk_signal_handler(server):
-    def signal_handler(sig, frame):
-        """
-        Specialized signal handler for the evented process.
-        """
-        print "\n\n\nStopping gevent HTTP server...\n\n\n"
-        server.stop()
-    return signal_handler
-
-def setup_signal_handlers(signal_handler):
-    SIGNALS = (signal.SIGINT, signal.SIGTERM)
-    map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
-
-def run(args):
-    # Note that gevent monkey patching must be done before importing the
-    # `threading` module, see http://stackoverflow.com/questions/8774958/.
-    if args.gevent:
-        import gevent
-        import gevent.monkey
-        import gevent.wsgi
-        import psycogreen.gevent
-        gevent.monkey.patch_all()
-        psycogreen.gevent.patch_psycopg()
-    import threading
-    import openerp
-    import openerp.cli.server
-    import openerp.service.wsgi_server
-    import openerp.tools.config
-    config = openerp.tools.config
-
-    os.environ["TZ"] = "UTC"
-    common.set_addons(args)
-
-    openerp.multi_process = True
-    common.setproctitle('openerp-web')
-
-    openerp.cli.server.check_root_user()
-    openerp.netsvc.init_logger()
-    #openerp.cli.server.report_configuration()
-
-    target = openerp.service.wsgi_server.serve
-    if not args.gevent:
-        openerp.evented = False
-        openerp.cli.server.setup_signal_handlers(openerp.cli.server.signal_handler)
-        # TODO openerp.multi_process with a multi-threaded process probably
-        # doesn't work very well (e.g. waiting for all threads to complete
-        # before killing the process is not implemented).
-        arg = (args.interface, int(args.port), args.threaded)
-        threading.Thread(target=target, args=arg).start()
-        openerp.cli.server.quit_on_signals()
-    else:
-        openerp.evented = True
-
-        app = openerp.service.wsgi_server.application
-        server = gevent.wsgi.WSGIServer((args.interface, int(args.port)), app)
-        setup_signal_handlers(mk_signal_handler(server))
-        try:
-            server.serve_forever()
-        except KeyboardInterrupt:
-            try:
-                server.stop()
-                gevent.shutdown()
-            except KeyboardInterrupt:
-                sys.stderr.write("Forced shutdown.\n")
-                gevent.shutdown()
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('web',
-        description='Run a normal OpenERP HTTP process. By default a '
-        'singly-threaded Werkzeug server is used.')
-    common.add_addons_argument(parser)
-    parser.add_argument('--interface', default='0.0.0.0',
-        help='HTTP interface to listen on (default is %(default)s)')
-    parser.add_argument('--port', metavar='INT', default=8069,
-        help='HTTP port to listen on (default is %(default)s)')
-    parser.add_argument('--threaded', action='store_true',
-        help='Use a multithreaded Werkzeug server (incompatible with --gevent)')
-    parser.add_argument('--gevent', action='store_true',
-        help="Use gevent's WSGI server (incompatible with --threaded)")
-
-    parser.set_defaults(run=run)
diff --git a/debian/changelog b/setup/debian/changelog
similarity index 100%
rename from debian/changelog
rename to setup/debian/changelog
diff --git a/debian/compat b/setup/debian/compat
similarity index 100%
rename from debian/compat
rename to setup/debian/compat
diff --git a/debian/control b/setup/debian/control
similarity index 100%
rename from debian/control
rename to setup/debian/control
diff --git a/debian/copyright b/setup/debian/copyright
similarity index 100%
rename from debian/copyright
rename to setup/debian/copyright
diff --git a/debian/openerp.init b/setup/debian/openerp.init
similarity index 100%
rename from debian/openerp.init
rename to setup/debian/openerp.init
diff --git a/debian/openerp.install b/setup/debian/openerp.install
similarity index 100%
rename from debian/openerp.install
rename to setup/debian/openerp.install
diff --git a/debian/openerp.postinst b/setup/debian/openerp.postinst
similarity index 100%
rename from debian/openerp.postinst
rename to setup/debian/openerp.postinst
diff --git a/debian/openerp.postrm b/setup/debian/openerp.postrm
similarity index 100%
rename from debian/openerp.postrm
rename to setup/debian/openerp.postrm
diff --git a/debian/rules b/setup/debian/rules
similarity index 100%
rename from debian/rules
rename to setup/debian/rules
diff --git a/install/openerp-server.1 b/setup/openerp-server.1
similarity index 100%
rename from install/openerp-server.1
rename to setup/openerp-server.1
diff --git a/install/openerp-server.conf b/setup/openerp-server.conf
similarity index 100%
rename from install/openerp-server.conf
rename to setup/openerp-server.conf
diff --git a/install/openerp-server.init b/setup/openerp-server.init
similarity index 100%
rename from install/openerp-server.init
rename to setup/openerp-server.init
diff --git a/install/openerp-server.logrotate b/setup/openerp-server.logrotate
similarity index 100%
rename from install/openerp-server.logrotate
rename to setup/openerp-server.logrotate
diff --git a/install/openerp_serverrc.5 b/setup/openerp_serverrc.5
similarity index 100%
rename from install/openerp_serverrc.5
rename to setup/openerp_serverrc.5
diff --git a/MANIFEST.in b/setup/redhat/MANIFEST.in
similarity index 100%
rename from MANIFEST.in
rename to setup/redhat/MANIFEST.in
diff --git a/history/README.urpmi b/setup/redhat/README.urpmi
similarity index 100%
rename from history/README.urpmi
rename to setup/redhat/README.urpmi
diff --git a/setup.cfg b/setup/redhat/setup.cfg
similarity index 100%
rename from setup.cfg
rename to setup/redhat/setup.cfg
diff --git a/setup_rpm.sh b/setup/redhat/setup_rpm.sh
similarity index 100%
rename from setup_rpm.sh
rename to setup/redhat/setup_rpm.sh
diff --git a/history/run_all_with_tests.sh b/setup/run_all_with_tests.sh
similarity index 100%
rename from history/run_all_with_tests.sh
rename to setup/run_all_with_tests.sh
diff --git a/install/openerp-header.bmp b/setup/windows/openerp-header.bmp
similarity index 100%
rename from install/openerp-header.bmp
rename to setup/windows/openerp-header.bmp
diff --git a/install/openerp-header.png b/setup/windows/openerp-header.png
similarity index 100%
rename from install/openerp-header.png
rename to setup/windows/openerp-header.png
diff --git a/install/openerp-icon.ico b/setup/windows/openerp-icon.ico
similarity index 100%
rename from install/openerp-icon.ico
rename to setup/windows/openerp-icon.ico
diff --git a/install/openerp-icon.png b/setup/windows/openerp-icon.png
similarity index 100%
rename from install/openerp-icon.png
rename to setup/windows/openerp-icon.png
diff --git a/install/openerp-intro.bmp b/setup/windows/openerp-intro.bmp
similarity index 100%
rename from install/openerp-intro.bmp
rename to setup/windows/openerp-intro.bmp
diff --git a/install/openerp-slogan.bmp b/setup/windows/openerp-slogan.bmp
similarity index 100%
rename from install/openerp-slogan.bmp
rename to setup/windows/openerp-slogan.bmp
diff --git a/install/openerp.ico b/setup/windows/openerp.ico
similarity index 100%
rename from install/openerp.ico
rename to setup/windows/openerp.ico
diff --git a/install/openerp.png b/setup/windows/openerp.png
similarity index 100%
rename from install/openerp.png
rename to setup/windows/openerp.png
diff --git a/install/setup.nsi b/setup/windows/setup.nsi
similarity index 100%
rename from install/setup.nsi
rename to setup/windows/setup.nsi
diff --git a/install/win32/OpenERPServerService.py b/setup/windows/win32/OpenERPServerService.py
similarity index 100%
rename from install/win32/OpenERPServerService.py
rename to setup/windows/win32/OpenERPServerService.py
diff --git a/install/win32/setup.py b/setup/windows/win32/setup.py
similarity index 100%
rename from install/win32/setup.py
rename to setup/windows/win32/setup.py

From 6e9edeeb46d4161bf7be02f570073c9c1edf45c7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <lesuisse@gmail.com>
Date: Thu, 29 May 2014 18:51:59 +0200
Subject: [PATCH 18/20] [FIX] odoo.py setup deps and readme.md

---
 README.md            | 51 +++++++++++++++++++++++---------------------
 doc/git.rst          |  5 ++---
 odoo.py              | 19 ++++++++++-------
 setup.py             |  1 -
 setup/debian/control |  1 -
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 6838cb9f39a..0ba3cec010c 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,22 @@
-About Odoo
-==========
-
-Odoo is a suite of open source Business apps.  More info at http://www.odoo.com
-
-Evaluating Odoo
----------------
-
-The easiest way to test Odoo is the free trial, NO email registration is
-required, select "skip this step" to skip it.
-
-    https://www.odoo.com/page/start
+Odoo is a suite of web based open source business apps.  More info at http://www.odoo.com
 
 
-Getting starting with Odoo developement
----------------------------------------
+Testing Odoo
+-------------
 
-If you are a developer type the following command at your terminal:
+The easiest way to test it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, you may click "skip this step" to skip it. 
+
+
+Getting started with Odoo developement
+--------------------------------------
+
+If you are a developer type the following command at your terminal [1]:
 
     wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python
 
-Then follow the tutorial here:
+Then follow <a href="https://doc.openerp.com/trunk/server/howto/howto_website/">the developer tutorial</a>
 
-    https://doc.openerp.com/trunk/server/howto/howto_website/
-
-If you are an Odoo employee type the following to add the odoo-dev remote
-
-    $ cd odoo; ./odoo.py setup_git_dev
+[1] You may want to check the content of the <a href="https://raw.githubusercontent.com/odoo/odoo/master/odoo.py">odoo.py file</a> before executing it.
 
 
 Packages, tarballs and installers
@@ -42,7 +33,19 @@ Packages, tarballs and installers
         $ sudo apt-get update
         $ sudo apt-get install odoo
 
-* Source tarballs http://nightly.openerp.com/
-* Windows installer http://nightly.openerp.com/
-* RPM package http://nightly.openerp.com/
+* <a href="http://nightly.openerp.com/">Source tarballs</a>
+* <a href="http://nightly.openerp.com/">Windows installer</a>
+* <a href="http://nightly.openerp.com/">RPM package</a>
+
+
+For Odoo employees
+------------------
+
+To add the odoo-dev remote use this command:
+
+    $ ./odoo.py setup_git_dev
+
+To fetch odoo merge pull requests refs use this command:
+
+    $ ./odoo.py setup_git_review
 
diff --git a/doc/git.rst b/doc/git.rst
index d66ca33180b..1d2eaf575d0 100644
--- a/doc/git.rst
+++ b/doc/git.rst
@@ -7,8 +7,7 @@ Initializing a working copy
 
 Use the easy-setup shell script::
 
-     curl -O https://raw.githubusercontent.com/odoo/odoo/master/checkout.sh
-     sh checkout.sh
+     curl -O https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python2
 
 it will will ask a few questions and create a local copy.
 
@@ -26,7 +25,7 @@ repository can have any number of remotes. The setup script creates 2 remotes:
     the official repository and main branches, roughly corresponds to the old
     "mainline" branches in bazaar. You should never need to push to it, and by
     default your local copy is configured to forbid it.
-``dev``
+``odoo-dev``
     a grab-bag of development branches, you can push your work to it so other
     coworkers can work with you.
 
diff --git a/odoo.py b/odoo.py
index 54e32726f55..d9a0bedf68f 100755
--- a/odoo.py
+++ b/odoo.py
@@ -25,7 +25,7 @@ GIT_HOOKS_PRE_PUSH = """
 import re
 import sys
 if re.search('github.com[:/]odoo/odoo.git$', sys.argv[2]):
-    print "Pushing to /odoo/odoo.git is forbidden, please push to odoo-dev, use -f to override"
+    print "Pushing to /odoo/odoo.git is forbidden, please push to odoo-dev, use --no-verify to override"
     sys.exit(1)
 """
 
@@ -50,9 +50,11 @@ def git_locate():
     while path != '/':
         gitconfig_path = os.path.join(path, '.git/config')
         if os.path.isfile(gitconfig_path):
-            content = open(gitconfig_path).read()
-            if re.search('github.com[:/]odoo/odoo.git', content):
-                break
+            setup_py = os.path.join(path, 'setup.py')
+            if os.path.isfile(setup_py):
+                content = open(setup_py).read()
+                if content.find('release.py') != -1:
+                    break
         path = os.path.dirname(path)
     if path == '/':
         path = None
@@ -64,7 +66,8 @@ def cmd_setup_git_init():
         printf('git repo found at %s',git_dir)
     else:
         run("git", "init", "odoo")
-        git_dir = os.path.join(os.getcwd(), 'odoo')
+        os.chdir('odoo')
+        git_dir = os.getcwd()
     if git_dir:
         # sane push config for git < 2.0
         run('git','config','push.default','simple')
@@ -92,7 +95,7 @@ def cmd_setup_git_init():
     else:
         printf('no git repo found')
 
-def cmd_setup_git_odoo_dev():
+def cmd_setup_git_dev():
     git_dir = git_locate()
     if git_dir:
         # setup odoo-dev remote
@@ -102,7 +105,7 @@ def cmd_setup_git_odoo_dev():
         run('git','config','--add','remote.odoo-dev.fetch','+refs/pull/*:refs/remotes/odoo-dev/pull/*')
         run('git','remote','update')
 
-def cmd_setup_git_odoo_review():
+def cmd_setup_git_review():
     git_dir = git_locate()
     if git_dir:
         # setup odoo-dev remote
@@ -113,7 +116,7 @@ def cmd_setup_git_odoo_review():
         run('git','config','--add','remote.odoo.fetch','+refs/pull/*:refs/remotes/odoo/pull/*')
 
 def setup_deps_debian(git_dir):
-    debian_control_path = os.path.join(git_dir, 'debian/control')
+    debian_control_path = os.path.join(git_dir, 'setup/debian/control')
     debian_control = open(debian_control_path).read()
     debs = re.findall('python-[0-9a-z]+',debian_control)
     proc = subprocess.Popen(['sudo','apt-get','install'] + debs, stdin=open('/dev/tty'))
diff --git a/setup.py b/setup.py
index 353239ab686..ba29cb51c9b 100644
--- a/setup.py
+++ b/setup.py
@@ -174,7 +174,6 @@ setuptools.setup(
           'python-openid',
           'pytz',
           'pyusb >= 1.0.0b1',
-          'pywebdav < 0.9.8',
           'pyyaml',
           'qrcode',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab
diff --git a/setup/debian/control b/setup/debian/control
index 7f7786ee98d..ced6043a650 100644
--- a/setup/debian/control
+++ b/setup/debian/control
@@ -54,7 +54,6 @@ Recommends:
  ghostscript,
  postgresql,
  python-gevent,
- python-matplotlib,
  poppler-utils
 Description: OpenERP Enterprise Resource Management
  OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main

From c05584a4d9f57906c5f3d165ce6e88dd75aea96d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 29 May 2014 23:19:24 +0200
Subject: [PATCH 19/20] [FIX] website_sale and website_event imports

missing import prevent cli help display
---
 addons/website_event/controllers/main.py      | 21 +++++++++----------
 .../website_sale_delivery/controllers/main.py |  5 +++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 2e7d56eb546..16a6bd24edf 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -19,23 +19,22 @@
 #
 ##############################################################################
 
-from openerp import SUPERUSER_ID
-from openerp.addons.web import http
-from openerp.addons.web.http import request
-from openerp.tools.translate import _
-from openerp.addons.website.controllers.main import Website as controllers
-controllers = controllers()
-
 import logging
-_logger = logging.getLogger(__name__)
-
-from datetime import datetime, timedelta
 import time
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
-from openerp import tools
+
 import werkzeug.urls
+
+from openerp import SUPERUSER_ID
+from openerp import http
+from openerp import tools
+from openerp.http import request
+from openerp.tools.translate import _
 from openerp.addons.website.models.website import slug
 
+_logger = logging.getLogger(__name__)
+
 try:
     import GeoIP
 except ImportError:
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 9204a8b9655..fef661e5c40 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 import openerp
-from openerp.addons.web import http
-from openerp.addons.web.http import request
+from openerp import http
 from openerp import SUPERUSER_ID
+from openerp.http import request
+import openerp.addons.website_sale.controllers.main
 
 class website_sale(openerp.addons.website_sale.controllers.main.website_sale):
 

From 2f4984b8381c6407a720b122733242e6cf3101da Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 30 May 2014 01:52:07 +0200
Subject: [PATCH 20/20] [IMP] packaging v8 part1, tgz deb and rpm

---
 README.md                                     |  11 +-
 setup/{redhat => }/MANIFEST.in                |   9 +-
 setup/{redhat => }/README.urpmi               |   0
 setup/debian/copyright                        | 185 +------
 setup/{ => debian}/openerp-server.conf        |   0
 setup/debian/openerp.install                  |   4 +-
 .../openerp.logrotate}                        |   0
 setup/{ => debian}/run_all_with_tests.sh      |   0
 setup/openerp-server.1                        | 218 --------
 setup/openerp-server.init                     | 147 ------
 setup/openerp_serverrc.5                      | 113 ----
 setup/package.py                              | 264 ++++++++++
 setup/{redhat => }/setup.cfg                  |   0
 setup.py => setup/setup.py                    |   4 +-
 setup/{redhat => }/setup_rpm.sh               |   0
 .../win32/OpenERPServerService.py             |   0
 setup/{windows => }/win32/setup.py            |   0
 setup/windows/LICENSE                         | 189 +++++++
 setup/windows/License.rtf                     | 192 +++++++
 setup/windows/Makefile                        |  37 ++
 setup/windows/pg_hba.conf                     |  73 +++
 setup/windows/postgresql.conf                 | 493 ++++++++++++++++++
 setup/windows/setup.nsi                       | 284 ++++++----
 23 files changed, 1444 insertions(+), 779 deletions(-)
 rename setup/{redhat => }/MANIFEST.in (62%)
 rename setup/{redhat => }/README.urpmi (100%)
 rename setup/{ => debian}/openerp-server.conf (100%)
 rename setup/{openerp-server.logrotate => debian/openerp.logrotate} (100%)
 rename setup/{ => debian}/run_all_with_tests.sh (100%)
 delete mode 100644 setup/openerp-server.1
 delete mode 100644 setup/openerp-server.init
 delete mode 100644 setup/openerp_serverrc.5
 create mode 100755 setup/package.py
 rename setup/{redhat => }/setup.cfg (100%)
 rename setup.py => setup/setup.py (99%)
 rename setup/{redhat => }/setup_rpm.sh (100%)
 rename setup/{windows => }/win32/OpenERPServerService.py (100%)
 rename setup/{windows => }/win32/setup.py (100%)
 create mode 100644 setup/windows/LICENSE
 create mode 100644 setup/windows/License.rtf
 create mode 100644 setup/windows/Makefile
 create mode 100644 setup/windows/pg_hba.conf
 create mode 100644 setup/windows/postgresql.conf
 mode change 100644 => 100755 setup/windows/setup.nsi

diff --git a/README.md b/README.md
index 0ba3cec010c..c400772c2ba 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
+Odoo
+----
+
 Odoo is a suite of web based open source business apps.  More info at http://www.odoo.com
 
-
-Testing Odoo
--------------
-
-The easiest way to test it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, you may click "skip this step" to skip it. 
+The easiest way to play with it is the <a href="https://www.odoo.com/page/start">Odoo free trial</a>, email registration is NOT required, use the "skip this step" link on the registration page to skip it.
 
 
 Getting started with Odoo developement
@@ -34,7 +33,9 @@ Packages, tarballs and installers
         $ sudo apt-get install odoo
 
 * <a href="http://nightly.openerp.com/">Source tarballs</a>
+
 * <a href="http://nightly.openerp.com/">Windows installer</a>
+
 * <a href="http://nightly.openerp.com/">RPM package</a>
 
 
diff --git a/setup/redhat/MANIFEST.in b/setup/MANIFEST.in
similarity index 62%
rename from setup/redhat/MANIFEST.in
rename to setup/MANIFEST.in
index af66a5a5bca..e5cb508559b 100644
--- a/setup/redhat/MANIFEST.in
+++ b/setup/MANIFEST.in
@@ -1,12 +1,9 @@
 graft debian
 graft doc
-graft install
+graft setup
 graft openerp
-graft win32
-include README
+include README.md
 include LICENSE
-include MANIFEST.in
 include openerp-*
-include oe*
-include setup*
+include odoo*
 global-exclude *pyc *~    # Exclude possible garbage from previous graft.
diff --git a/setup/redhat/README.urpmi b/setup/README.urpmi
similarity index 100%
rename from setup/redhat/README.urpmi
rename to setup/README.urpmi
diff --git a/setup/debian/copyright b/setup/debian/copyright
index e477adb524d..b596794dd13 100644
--- a/setup/debian/copyright
+++ b/setup/debian/copyright
@@ -1,7 +1,7 @@
 Upstream-Contact: OpenERP <info@openerp.com>
 Upstream-Homepage: http://www.openerp.com/
 Maintainer-Contact: Debian OpenERP Maintainers <gnunet@lists.debian-maintainers.org>
-Maintainer-Homepage: http://open-object.debian-maintainers.org/
+Maintainer-Homepage: http://www.odoo.com/
 
 Files: *
 Copyright: (C) 2004-2011 OpenERP SA. (www.openerp.com)
@@ -22,186 +22,3 @@ License: GPL-3+
  On Debian systems, the complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-3 file.
 
-Files:
- bin/addons/account/report/general_ledger.py
- bin/addons/account/report/general_ledger_landscape.py
- bin/addons/account/wizard/wizard_statement_from_invoice.py
-Copyright: (C) 2005-2008 CamptoCamp
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: bin/addons/auction/barcode/*
-Copyright: (C) 2000 Tyler C. Sarna <tsarna@sarna.org>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
-    must display the following acknowledgement:
-    This product includes software developed by Tyler C. Sarna.
- 4. Neither the name of the author nor the names of contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-Files:
- bin/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl
- bin/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
-Copyright: (C) 2005 Martin Simon
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU Library General Public License
- can be found in /usr/share/common-licenses/LGPL-2.1 file.
-
-Files: bin/addons/document/ftpserver/*
-Copyright:
- (C) 2007 Giampaolo Rodola <g.rodola@gmail.com>
- (C) 2008 Fabien Pinckaers <fp@tinyerp.com>
-License: MIT
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose and without fee is hereby
- granted, provided that the above copyright notice appear in all
- copies and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of
- Giampaolo Rodola' not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission.
- .
- Giampaolo Rodola' DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- NO EVENT Giampaolo Rodola' BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Files: bin/addons/hr_holidays/*
-Copyright:
- (C) 2004-2008 Tiny.be <info@tiny.be>
- (C) 2005-2006 Axelor SARL. <http://www.axelor.com/>
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: bin/addons/l10n_uk/*
-Copyright:
- (C) 2004-2008 Tiny.be <info@tiny.be>
- (C) 2004-2008 Seath Solutions Ltd.
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
-
-Files: bin/tools/threadinglocal.py
-Copyright: (C) 2004-2005 CherryPy Team <team@cherrypy.org>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- * Neither the name of the CherryPy Team nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: bin/tools/decimal.py
-Copyright: (C) 2004 Python Software Foundation.
-License: other
- This file is distributed under the Python Software License
- (http://www.python.org/2.3/license.html).
- .
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Stichting Mathematisch
- Centrum or CWI not be used in advertising or publicity pertaining to
- distribution of the software without specific, written prior
- permission.
-
diff --git a/setup/openerp-server.conf b/setup/debian/openerp-server.conf
similarity index 100%
rename from setup/openerp-server.conf
rename to setup/debian/openerp-server.conf
diff --git a/setup/debian/openerp.install b/setup/debian/openerp.install
index c632929a148..94d4cfee3e0 100644
--- a/setup/debian/openerp.install
+++ b/setup/debian/openerp.install
@@ -1,2 +1,2 @@
-install/openerp-server.conf /etc/openerp
-README /usr/share/doc/openerp
+debian/openerp-server.conf /etc/openerp
+README.md /usr/share/doc/openerp
diff --git a/setup/openerp-server.logrotate b/setup/debian/openerp.logrotate
similarity index 100%
rename from setup/openerp-server.logrotate
rename to setup/debian/openerp.logrotate
diff --git a/setup/run_all_with_tests.sh b/setup/debian/run_all_with_tests.sh
similarity index 100%
rename from setup/run_all_with_tests.sh
rename to setup/debian/run_all_with_tests.sh
diff --git a/setup/openerp-server.1 b/setup/openerp-server.1
deleted file mode 100644
index 6529e7315b1..00000000000
--- a/setup/openerp-server.1
+++ /dev/null
@@ -1,218 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH OPENERP "1" "December 2010" "OpenERP Server 6.0.0-rc1" "User Commands"
-.SH NAME
-OpenERP \- manual page for OpenERP Server 6.0.0-rc1
-.SH SYNOPSIS
-.B openerp-server.py
-[\fIoptions\fR]
-.SH OPTIONS
-.TP
-\fB\-\-version\fR
-show program's version number and exit
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-show this help message and exit
-.TP
-\fB\-c\fR CONFIG, \fB\-\-config\fR=\fICONFIG\fR
-specify alternate config file
-.TP
-\fB\-s\fR, \fB\-\-save\fR
-save configuration to ~/.openerp_serverrc
-.TP
-\fB\-\-pidfile\fR=\fIPIDFILE\fR
-file where the server pid will be stored
-.TP
-\fB\-i\fR INIT, \fB\-\-init\fR=\fIINIT\fR
-init a module (use "all" for all modules)
-.TP
-\fB\-\-without\-demo\fR=\fIWITHOUT_DEMO\fR
-load demo data for a module (use "all" for all
-modules)
-.TP
-\fB\-u\fR UPDATE, \fB\-\-update\fR=\fIUPDATE\fR
-update a module (use "all" for all modules)
-.TP
-\fB\-\-cache\-timeout\fR=\fICACHE_TIMEOUT\fR
-set the timeout for the cache system
-.TP
-\fB\-t\fR TIMEZONE, \fB\-\-timezone\fR=\fITIMEZONE\fR
-specify reference timezone for the server (e.g.
-Europe/Brussels
-.TP
-\fB\-\-stop\-after\-init\fR
-stop the server after it initializes
-.TP
-\fB\-\-debug\fR
-enable debug mode
-.TP
-\fB\-\-assert\-exit\-level\fR=\fIASSERT_EXIT_LEVEL\fR
-specify the level at which a failed assertion will
-stop the server. Accepted values: ['info',
-\&'debug_rpc', 'warn', 'test', 'critical', 'debug_sql',
-\&'error', 'debug', 'debug_rpc_answer', 'notset']
-.IP
-XML\-RPC Configuration:
-.TP
-\fB\-\-xmlrpc\-interface\fR=\fIXMLRPC_INTERFACE\fR
-specify the TCP IP address for the XML\-RPC protocol
-.TP
-\fB\-\-xmlrpc\-port\fR=\fIXMLRPC_PORT\fR
-specify the TCP port for the XML\-RPC protocol
-.TP
-\fB\-\-no\-xmlrpc\fR
-disable the XML\-RPC protocol
-.IP
-XML\-RPC Secure Configuration:
-.TP
-\fB\-\-xmlrpcs\-interface\fR=\fIXMLRPCS_INTERFACE\fR
-specify the TCP IP address for the XML\-RPC Secure
-protocol
-.TP
-\fB\-\-xmlrpcs\-port\fR=\fIXMLRPCS_PORT\fR
-specify the TCP port for the XML\-RPC Secure protocol
-.TP
-\fB\-\-no\-xmlrpcs\fR
-disable the XML\-RPC Secure protocol
-.TP
-\fB\-\-cert\-file\fR=\fISECURE_CERT_FILE\fR
-specify the certificate file for the SSL connection
-.TP
-\fB\-\-pkey\-file\fR=\fISECURE_PKEY_FILE\fR
-specify the private key file for the SSL connection
-.IP
-Static HTTP service:
-.TP
-\fB\-\-static\-http\-enable\fR
-enable static HTTP service for serving plain HTML
-files
-.TP
-\fB\-\-static\-http\-document\-root\fR=\fISTATIC_HTTP_DOCUMENT_ROOT\fR
-specify the directory containing your static HTML
-files (e.g '/var/www/')
-.TP
-\fB\-\-static\-http\-url\-prefix\fR=\fISTATIC_HTTP_URL_PREFIX\fR
-specify the URL root prefix where you want web
-browsers to access your static HTML files (e.g '/')
-.IP
-Testing Configuration:
-.TP
-\fB\-\-test\-file\fR=\fITEST_FILE\fR
-Launch a YML test file.
-.TP
-\fB\-\-test\-report\-directory\fR=\fITEST_REPORT_DIRECTORY\fR
-If set, will save sample of all reports in this
-directory.
-.TP
-\fB\-\-test\-disable\fR
-Disable loading test files.
-.TP
-\fB\-\-test\-commit\fR
-Commit database changes performed by tests.
-.IP
-Logging Configuration:
-.TP
-\fB\-\-logfile\fR=\fILOGFILE\fR
-file where the server log will be stored
-.TP
-\fB\-\-no\-logrotate\fR
-do not rotate the logfile
-.TP
-\fB\-\-syslog\fR
-Send the log to the syslog server
-.TP
-\fB\-\-log\-level\fR=\fILOG_LEVEL\fR
-specify the level of the logging. Accepted values:
-['info', 'debug_rpc', 'warn', 'test', 'critical',
-\&'debug_sql', 'error', 'debug', 'debug_rpc_answer',
-\&'notset']
-.IP
-SMTP Configuration:
-.TP
-\fB\-\-email\-from\fR=\fIEMAIL_FROM\fR
-specify the SMTP email address for sending email
-.TP
-\fB\-\-smtp\fR=\fISMTP_SERVER\fR
-specify the SMTP server for sending email
-.TP
-\fB\-\-smtp\-port\fR=\fISMTP_PORT\fR
-specify the SMTP port
-.TP
-\fB\-\-smtp\-ssl\fR
-specify the SMTP server support SSL or not
-.TP
-\fB\-\-smtp\-user\fR=\fISMTP_USER\fR
-specify the SMTP username for sending email
-.TP
-\fB\-\-smtp\-password\fR=\fISMTP_PASSWORD\fR
-specify the SMTP password for sending email
-.IP
-Database related options:
-.TP
-\fB\-d\fR DB_NAME, \fB\-\-database\fR=\fIDB_NAME\fR
-specify the database name
-.TP
-\fB\-r\fR DB_USER, \fB\-\-db_user\fR=\fIDB_USER\fR
-specify the database user name
-.TP
-\fB\-w\fR DB_PASSWORD, \fB\-\-db_password\fR=\fIDB_PASSWORD\fR
-specify the database password
-.TP
-\fB\-\-pg_path\fR=\fIPG_PATH\fR
-specify the pg executable path
-.TP
-\fB\-\-db_host\fR=\fIDB_HOST\fR
-specify the database host
-.TP
-\fB\-\-db_port\fR=\fIDB_PORT\fR
-specify the database port
-.TP
-\fB\-\-db_maxconn\fR=\fIDB_MAXCONN\fR
-specify the the maximum number of physical connections
-to posgresql
-.TP
-\fB\-P\fR IMPORT_PARTIAL, \fB\-\-import\-partial\fR=\fIIMPORT_PARTIAL\fR
-Use this for big data importation, if it crashes you
-will be able to continue at the current state. Provide
-a filename to store intermediate importation states.
-.IP
-Internationalisation options:
-.IP
-Use these options to translate OpenERP to another language.See i18n
-section of the user manual. Option '\-d' is mandatory.Option '\-l' is
-mandatory in case of importation
-.TP
-\fB\-l\fR LANGUAGE, \fB\-\-language\fR=\fILANGUAGE\fR
-specify the language of the translation file. Use it
-with \fB\-\-i18n\-export\fR or \fB\-\-i18n\-import\fR
-.TP
-\fB\-\-i18n\-export\fR=\fITRANSLATE_OUT\fR
-export all sentences to be translated to a CSV file, a
-PO file or a TGZ archive and exit
-.TP
-\fB\-\-i18n\-import\fR=\fITRANSLATE_IN\fR
-import a CSV or a PO file with translations and exit.
-The '\-l' option is required.
-.TP
-\fB\-\-modules\fR=\fITRANSLATE_MODULES\fR
-specify modules to export. Use in combination with
-\fB\-\-i18n\-export\fR
-.TP
-\fB\-\-addons\-path\fR=\fIADDONS_PATH\fR
-specify an alternative addons path.
-.IP
-Security\-related options:
-.TP
-\fB\-\-no\-database\-list\fR
-disable the ability to return the list of databases
-.SH "SEE ALSO"
-The full documentation for
-.B OpenERP
-is maintained as a Texinfo manual.  If the
-.B info
-and
-.B OpenERP
-programs are properly installed at your site, the command
-.IP
-.B info OpenERP
-.PP
-should give you access to the complete manual.
diff --git a/setup/openerp-server.init b/setup/openerp-server.init
deleted file mode 100644
index 41efb5c35ce..00000000000
--- a/setup/openerp-server.init
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-# openerp-server        This shell script takes care of starting and stopping
-#                       OpenERP server
-#
-# chkconfig: 345 95 05
-# description: OpenERP server
-#
-# pidfile: /var/run/openerp-server.pid
-# config: /etc/openerp-server.conf
-
-### BEGIN INIT INFO
-# Provides: openerp-server
-# Required-Start: postgresql
-# Required-Stop: postgresql
-# Should-Start: $network harddrake
-# Default-Start: 345
-# Short-Description: Launches the OpenERP server.
-# Description: This startup script launches the OpenERP server.
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-PIDFILE=/var/run/openerp/openerp-server.pid
-LOCKFILE=/var/lock/subsys/openerp-server
-LOGFILE=/var/log/openerp/openerp-server.log
-
-OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE"
-
-prog="openerp-server"
-desc="OpenERP Server Daemon"
-
-# check if the openerp-server conf file is present, then use it
-if [ -f /etc/openerp-server.conf ]; then
-    OPTS="$OPTS -c /etc/openerp-server.conf"
-fi
-
-# Source function library
-if [ -f /etc/init.d/functions ] ; then
-    . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-    . /etc/rc.d/init.d/functions
-else
- exit 0
-fi
-
-# check the existence of the openerp-server script
-[ -z "/usr/bin/openerp-server" ] && exit 0
-
-RETVAL=0
-
-start() {
-    if [ -d /etc/openerp/start.d ] ; then
-        echo -n $"Preparing $desc: "
-        run-parts --exit-on-error /etc/openerp/start.d
-        RETVAL=$?
-        echo
-        [ $RETVAL -ne 0 ] && return $RETVAL
-    fi
-    
-    echo -n $"Starting $desc ($prog): "
-    daemon --user openerp --check openerp-server \
-    "/usr/bin/setsid /usr/bin/openerp-server \
-    -c /etc/openerp-server.conf \
-    --pidfile=$PIDFILE \
-    --logfile=$LOGFILE &"
-
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch $LOCKFILE
-    return $RETVAL
-}
-
-stop() {
-    echo -n $"Stopping $desc ($prog): "
-    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
-    RETVAL=$?
-    if [ $RETVAL -eq 0 ] ; then
-        rm -f $LOCKFILE
-
-        echo_success
-        echo
-    else
-        echo_failure
-        echo
-    fi
-    if [ -d /etc/openerp/stop.d ] ; then
-        echo -n $"Clearing $desc: "
-        run-parts /etc/openerp/stop.d
-        echo
-    fi
-    return $RETVAL
-}
-
-restart() {
-    stop
-    start
-}    
-
-condrestart() {
-    [ -e $LOCKFILE ] && restart || :
-}
-
-status() { 
-    if [ -f $PIDFILE ] ; then
-        checkpid `cat $PIDFILE`
-        RETVAL=$?
-        if [ $RETVAL -eq 0 ] ; then
-            echo  $"$prog is running..."
-        else
-            echo  $"$prog is stopped"
-        fi
-    else
-        echo  $"$prog is stopped"
-    fi
-    return $RETVAL
-}
-
-case "$1" in
-start)
-    start
-    ;;
-
-stop)
-    stop
-    ;;
-
-restart|reload)
-    restart
-    ;;
-
-condrestart)
-    condrestart
-    ;;
-
-status)
-    status
-    ;;
-
-probe)
-    exit 0
-    ;;
-
-*)
-    echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-    exit 1
-esac
diff --git a/setup/openerp_serverrc.5 b/setup/openerp_serverrc.5
deleted file mode 100644
index e43f9b5a668..00000000000
--- a/setup/openerp_serverrc.5
+++ /dev/null
@@ -1,113 +0,0 @@
-.TH openerp_serverrc 5
-
-.SH NAME
-openerp_serverrc \- configuration file for OpenERP
-
-.SH SYNOPSIS
-[options]
-.br
-$option\ =\ " someValue "
-.br
- ...
-
-.SH DESCRIPTION
-A setup file consists of a section, lead by a "[options]" header,
-.br
-and followed by "option_name = value" entries, with continuations and such in
-.br
-the style of RFC 822.
-
-.SH OPTIONS
-.TP
-.IR verbose
-Enable the debugging mode
-.br
-(default False)
-.TP
-.IR pidfile
-The file where the server pid will be stored
-.br
-(default False)
-.TP
-.IR logfile
-The file where the server log will be stored
-.br
-(default False)
-.TP
-.IR interface
-The IP address on which the server will bind.
-.br
-If empty, it will bind on all interfaces (default empty)
-.TP
-.IR port
-The TCP port on which the server will listen.
-.br
-(default 8069)
-.TP
-.IR debug_mode
-Enable debug mode
-.br
-(default False)
-.TP
-.IR secure
-Launch server over https instead of http.
-.br
-(default False)
-.TP
-.IR smtp_server
-Specify the SMTP server for sending email.
-.br
-(default localhost)
-.TP
-.IR smtp_user
-Specify the SMTP user for sending email.
-.br
-(default False)
-.TP
-.IR smtp_password
-Specify the SMTP password for sending email.
-.br
-(default False)
-.TP
-.IR db_name
-Specify the database name.
-.TP
-.IR db_user
-Specify the database user name.
-.br
-(default None)
-.TP
-.IR db_password
-Specify the database password for db_user.
-.br
-(default None)
-.TP
-.IR pg_path
-Specify the PostgreSQL executable path.
-.br
-(default None)
-.TP
-.IR db_host
-Specify the database host.
-.br
-(default localhost)
-.TP
-.IR db_port
-Specify the database port.
-.br
-(default None)
-.TP
-.IR price_accuracy
-Specify the price accuracy.
-.br
-
-.SH AUTHORS
-
-OpenERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR)
-
-.SH SEE ALSO
-openerp-server(1)
-.br
-\fIhttp://www.openerp.com\fR : Open ERP official website
-.br
-\fIhttp://doc.openerp.com\fR : Open ERP documentation
diff --git a/setup/package.py b/setup/package.py
new file mode 100755
index 00000000000..45670312a97
--- /dev/null
+++ b/setup/package.py
@@ -0,0 +1,264 @@
+#!/usr/bin/env python2
+import glob
+import os
+import optparse
+import signal
+import shutil
+import socket
+import subprocess
+import time
+import xmlrpclib
+
+#----------------------------------------------------------
+# Utils
+#----------------------------------------------------------
+join = os.path.join
+
+def mkdir(d):
+    if not os.path.isdir(d):
+        os.makedirs(d)
+
+def system(l,chdir=None):
+    print l
+    if chdir:
+        cwd = os.getcwd()
+        os.chdir(chdir)
+    if isinstance(l,list):
+        rc=os.spawnvp(os.P_WAIT, l[0], l)
+    elif isinstance(l,str):
+        tmp=['sh','-c',l]
+        rc=os.spawnvp(os.P_WAIT, tmp[0], tmp)
+    if chdir:
+        os.chdir(cwd)
+    return rc
+
+#----------------------------------------------------------
+# Stages
+#----------------------------------------------------------
+
+def rsync(o):
+    pre = 'rsync -a --exclude .bzr --exclude .git --exclude *.pyc'
+    cmd = pre.split(' ')
+    system(cmd + ['%s/'%o.root, o.build])
+    for i in glob.glob(join(o.build,'addons/*')):
+        shutil.move(i, join(o.build,'openerp/addons'))
+    for i in glob.glob(join(o.build,'setup/*')):
+        shutil.move(i, join(o.build))
+    open(join(o.build,'openerp','release.py'),'a').write('version = "%s-%s"\n'%(o.version,o.timestamp))
+
+def publish_move(o,srcs,dest):
+    for i in srcs:
+        shutil.move(i,dest)
+        # do the symlink
+        bn = os.path.basename(i)
+        latest = bn.replace(o.timestamp,'latest')
+        latest_full = join(dest,latest)
+        if bn != latest:
+            if os.path.islink(latest_full):
+                os.unlink(latest_full)
+            os.symlink(bn,latest_full)
+
+def sdist(o):
+    cmd=['python2','setup.py', '--quiet', 'sdist']
+    system(cmd,o.build)
+    #l = glob.glob(join(o.pkg,'*%s*.tar.gz'%o.timestamp))
+    #publish_move(o,l,join(o.pub,'src'))
+
+def bdist_rpm(o):
+    cmd=['python2','setup.py', '--quiet', 'bdist_rpm']
+    system(cmd,o.build)
+    #l = glob.glob(join(o.build,'dist/*%s-1*.rpm'%o.timestamp.replace('-','_')))
+    #publish_move(o,l,join(o.pub,'rpm'))
+
+def debian(o):
+    cmd=['sed','-i','1s/^.*$/openerp (%s-%s-1) testing; urgency=low/'%(o.version,o.timestamp),'debian/changelog']
+    system(cmd,o.build)
+    cmd=['dpkg-buildpackage','-rfakeroot']
+    system(cmd,o.build)
+
+    #l = glob.glob(join(o.pkg,'*_*%s-1*'%o.timestamp))
+    #publish_move(o,l,join(o.pub,'deb'))
+    #system('dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz',join(o.pub,'deb'))
+
+class KVM(object):
+    def __init__(self, o, image, ssh_key='', login='openerp'):
+        self.o = o
+        self.image = image
+        self.ssh_key = ssh_key
+        self.login = login
+
+    def timeout(self,signum,frame):
+        print "vm timeout kill",self.pid
+        os.kill(self.pid,15)
+
+    def start(self):
+        l="kvm -net nic -net user,hostfwd=tcp:127.0.0.1:10022-:22,hostfwd=tcp:127.0.0.1:18069-:8069,hostfwd=tcp:127.0.0.1:15432-:5432 -drive".split(" ")
+        #l.append('file=%s,if=virtio,index=0,boot=on,snapshot=on'%self.image)
+        l.append('file=%s,snapshot=on'%self.image)
+        #l.extend(['-vnc','127.0.0.1:1'])
+        l.append('-nographic')
+        print " ".join(l)
+        self.pid=os.spawnvp(os.P_NOWAIT, l[0], l)
+        time.sleep(10)
+        signal.alarm(2400)
+        signal.signal(signal.SIGALRM, self.timeout)
+        try:
+            self.run()
+        finally:
+            signal.signal(signal.SIGALRM, signal.SIG_DFL)
+            os.kill(self.pid,15)
+            time.sleep(10)
+
+    def ssh(self,cmd):
+        l=['ssh','-o','UserKnownHostsFile=/dev/null','-o','StrictHostKeyChecking=no','-p','10022','-i',self.ssh_key,'%s@127.0.0.1'%self.login,cmd]
+        system(l)
+
+    def rsync(self,args,options='--delete --exclude .bzrignore'):
+        cmd ='rsync -rt -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022 -i %s" %s %s' % (self.ssh_key, options, args)
+        system(cmd)
+
+    def run(self):
+        pass
+
+class KVMDebianTestTgz(KVM):
+    def run(self):
+        l = glob.glob(join(self.o.pkg,'*%s.tar.gz'%self.o.timestamp))
+        self.rsync('%s openerp@127.0.0.1:src/'%l[0])
+        script = """
+            tar xzvf src/*.tar.gz
+            cd openerp*
+            sudo python setup.py install
+            sudo su - postgres -c "createuser -s $USER"
+            createdb t1
+            openerp-server --stop-after-init -d t1 -i ` python -c "import os;print ','.join([i for i in os.listdir('openerp/addons') if i not in ['auth_openid','caldav','document_ftp','base_gengo', 'im', 'im_livechat'] and not i.startswith('hw_')]),;" `
+        """
+        self.ssh(script)
+        self.ssh('nohup openerp-server >/dev/null 2>&1 &')
+        time.sleep(5)
+        l = xmlrpclib.ServerProxy('http://127.0.0.1:18069/xmlrpc/object').execute('t1',1,'admin','ir.module.module','search',[('state','=','installed')])
+        i = len(l)
+        if i >= 190:
+            print "Tgz install: ",i," module installed"
+        else:
+            raise Exception("Tgz install failed only %s installed"%i)
+        time.sleep(2)
+
+class KVMDebianTestDeb(KVM):
+    def run(self):
+        l = glob.glob(join(self.o.pkg,'*%s*.deb'%self.o.timestamp))
+        self.rsync('%s openerp@127.0.0.1:deb/'%l[0])
+        script = """
+            sudo dpkg -i deb/*
+            sudo su - postgres -c "createuser -s $USER"
+            createdb t1
+            openerp-server --stop-after-init -d t1 -i base
+        """
+        #` python -c "import os;print ','.join([i for i in os.listdir('/usr/share/pyshared/openerp/addons') if i not in ['auth_openid','caldav','document_ftp', 'base_gengo'] and not i.startswith('hw_')]),;" `
+        self.ssh(script)
+        time.sleep(5)
+        l = xmlrpclib.ServerProxy('http://127.0.0.1:18069/xmlrpc/object').execute('t1',1,'admin','ir.module.module','search',[('state','=','installed')])
+        i = len(l)
+        if i >= 1:
+            print "Deb install: ",i," module installed"
+        else:
+            raise Exception("Tgz install failed only %s installed"%i)
+        time.sleep(2)
+
+class KVMWinBuildExe(KVM):
+    def run(self):
+        self.ssh("mkdir -p build")
+        self.rsync('%s/ %s@127.0.0.1:build/server/' % (self.o.build, self.login))
+        with open('windows/Makefile.version', 'w') as f:
+            f.write("VERSION=%s\n" % self.o.version_full)
+        with open('windows/Makefile.python', 'w') as f:
+            f.write("PYTHON_VERSION=%s\n" % self.o.vm_win_python_version.replace('.', ''))
+        self.rsync('windows/ %s@127.0.0.1:build/windows/' % self.login)
+        self.rsync('windows/wkhtmltopdf/ %s@127.0.0.1:build/server/win32/wkhtmltopdf/' % self.login)
+        self.ssh("cd build/windows;time make allinone;")
+        self.rsync('%s@127.0.0.1:build/windows/files/ %s/' % (self.login, self.o.pkg), '')
+        print "KVMWinBuildExe.run(): done"
+
+class KVMWinTestExe(KVM):
+    def run(self):
+        setuppath = "%s/openerp-allinone-setup-%s.exe" % (self.o.pkg, self.o.version_full)
+        setuplog = setuppath.replace('exe','log')
+        self.rsync('"%s" %s@127.0.0.1:' % (setuppath, self.login))
+        self.ssh("TEMP=/tmp ./openerp-allinone-setup-%s.exe /S" % self.o.version_full)
+        self.ssh('ls /cygdrive/c/"Program Files"/"OpenERP %s"/' % self.o.version_full)
+        self.rsync('"repo/lpopenerp_openobject-addons_7.0/" %s@127.0.0.1:/cygdrive/c/Program?Files/OpenERP?%s/Server/server/openerp/addons/' % (self.login, self.o.version_full), options='--exclude .bzrignore --exclude .bzr')
+        self.ssh('ls /cygdrive/c/"Program Files"/"OpenERP %s"/Server/server/openerp/addons/' % self.o.version_full)
+
+        self.ssh('PGPASSWORD=openpgpwd /cygdrive/c/"Program Files"/"OpenERP %s"/PostgreSQL/bin/createdb.exe -e -U openpg pack' % self.o.version_full)
+        self.ssh('net stop "PostgreSQL_For_OpenERP"')
+        self.ssh('net start "PostgreSQL_For_OpenERP"')
+        self.ssh('mkdir test-reports')
+
+        self.ssh('/cygdrive/c/"Program Files"/"OpenERP %s"/Server/server/openerp-server.exe -d pack -i base,report_webkit,product --stop-after-init --test-enable --log-level=test --test-report-directory=test-reports'%self.o.version_full)
+        self.rsync('%s@127.0.0.1:/cygdrive/c/Program?Files/OpenERP?%s/Server/server/openerp-server.log "%s"' % (self.login, self.o.version_full, setuplog))
+        self.rsync('%s@127.0.0.1:test-reports/ "%s"' % (self.login, self.o.pkg), options='')
+
+#----------------------------------------------------------
+# Options and Main
+#----------------------------------------------------------
+
+def options():
+    op = optparse.OptionParser()
+    timestamp = time.strftime("%Y%m%d-%H%M%S",time.gmtime())
+    root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+    build = "%s-%s" % (root, timestamp)
+
+    op.add_option("-b", "--build", default=build, help="build directory (%default)", metavar="DIR")
+    op.add_option("-p", "--pub", default=None, help="pub directory (%default)", metavar="DIR")
+    op.add_option("-v", "--version", default='7.0', help="version (%default)")
+
+    op.add_option("", "--vm-debian-image", default='/home/odoo/vm/debian6/debian6.vmdk', help="%default")
+    op.add_option("", "--vm-debian-ssh-key", default='/home/odoo/vm/debian6/debian6_id_rsa', help="%default")
+    op.add_option("", "--vm-debian-login", default='openerp', help="Debian login (%default)")
+
+    op.add_option("", "--vm-winxp-image", default='/home/odoo/vm/winxp26/winxp26.vdi', help="%default")
+    op.add_option("", "--vm-winxp-ssh-key", default='/home/odoo/vm/winxp26/id_rsa', help="%default")
+    op.add_option("", "--vm-win-login", default='Naresh', help="Windows login (%default)")
+    op.add_option("", "--vm-win-python-version", default='2.6', help="Windows Python version installed in the VM (default: %default)")
+
+    op.add_option("", "--no-debian", action="store_true", help="don't build the debian package")
+    op.add_option("", "--no-rpm", action="store_true", help="don't build the rpm package")
+    op.add_option("", "--no-tarball", action="store_true", help="don't build the tarball")
+    op.add_option("", "--no-windows", action="store_true", help="don't build the windows package")
+
+    (o, args) = op.parse_args()
+    # derive other options
+    o.root = root
+    o.timestamp = timestamp
+    o.version_full = '%s-%s'%(o.version,o.timestamp)
+    return o
+
+def main():
+    o = options()
+    rsync(o)
+    try:
+        # tgz
+        sdist(o)
+        if os.path.isfile(o.vm_debian_image):
+            KVMDebianTestTgz(o, o.vm_debian_image, o.vm_debian_ssh_key, o.vm_debian_login).start()
+
+        # deb
+        debian(o)
+        if os.path.isfile(o.vm_debian_image):
+            KVMDebianTestDeb(o, o.vm_debian_image, o.vm_debian_ssh_key, o.vm_debian_login).start()
+
+        # exe
+        if os.path.isfile(o.vm_winxp_image):
+            KVMWinBuildExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_win_login).start()
+            KVMWinTestExe(o, o.vm_winxp_image, o.vm_winxp_ssh_key, o.vm_win_login).start()
+            l = glob.glob(join(o.pkg,'*all*%s*.exe'%o.timestamp))
+            publish_move(o,l,join(o.pub,'exe'))
+
+        # rpm
+        bdist_rpm(o)
+
+    finally:
+        #shutil.rmtree(o.build)
+        pass
+
+if __name__ == '__main__':
+    main()
diff --git a/setup/redhat/setup.cfg b/setup/setup.cfg
similarity index 100%
rename from setup/redhat/setup.cfg
rename to setup/setup.cfg
diff --git a/setup.py b/setup/setup.py
similarity index 99%
rename from setup.py
rename to setup/setup.py
index ba29cb51c9b..f26abc26e40 100644
--- a/setup.py
+++ b/setup/setup.py
@@ -71,7 +71,7 @@ def py2exe_options():
         return {
             "console" : [ { "script": "openerp-server", "icon_resources": [(1, join("install","openerp-icon.ico"))], },
                           { "script": "openerp-gevent" },
-                          { "script": "oe" },
+                          { "script": "odoo.py" },
             ],
             'options' : {
                 "py2exe": {
@@ -146,7 +146,7 @@ setuptools.setup(
       author_email     = author_email,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
-      scripts          = ['openerp-server', 'openerp-gevent', 'oe'],
+      scripts          = ['openerp-server', 'openerp-gevent', 'odoo.py'],
       data_files       = data(),
       packages         = setuptools.find_packages(),
       dependency_links = ['http://download.gna.org/pychart/'],
diff --git a/setup/redhat/setup_rpm.sh b/setup/setup_rpm.sh
similarity index 100%
rename from setup/redhat/setup_rpm.sh
rename to setup/setup_rpm.sh
diff --git a/setup/windows/win32/OpenERPServerService.py b/setup/win32/OpenERPServerService.py
similarity index 100%
rename from setup/windows/win32/OpenERPServerService.py
rename to setup/win32/OpenERPServerService.py
diff --git a/setup/windows/win32/setup.py b/setup/win32/setup.py
similarity index 100%
rename from setup/windows/win32/setup.py
rename to setup/win32/setup.py
diff --git a/setup/windows/LICENSE b/setup/windows/LICENSE
new file mode 100644
index 00000000000..1faf49eac2e
--- /dev/null
+++ b/setup/windows/LICENSE
@@ -0,0 +1,189 @@
+GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+Preamble
+
+The GNU General Public License is a free, copyleft license for software and other kinds of works.
+
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification follow.
+TERMS AND CONDITIONS
+0. Definitions.
+
+“This License” refers to version 3 of the GNU General Public License.
+
+“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+
+To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+
+A “covered work” means either the unmodified Program or a work based on the Program.
+
+To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+1. Source Code.
+
+The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+
+A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+    * a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+    * b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+    * c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+    * d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+    * a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+    * b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+    * c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+    * d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+    * e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+7. Additional Terms.
+
+“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+    * a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+    * b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+    * c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+    * d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+    * e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+    * f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+11. Patents.
+
+A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+
+A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
diff --git a/setup/windows/License.rtf b/setup/windows/License.rtf
new file mode 100644
index 00000000000..251844038fc
--- /dev/null
+++ b/setup/windows/License.rtf
@@ -0,0 +1,192 @@
+{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fcharset0 Arial;}}
+{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1033\f0\fs20 GNU GENERAL PUBLIC LICENSE\par
+\par
+Version 3, 29 June 2007\par
+\par
+Copyright \'a9 2007 Free Software Foundation, Inc. <http://fsf.org/>\par
+\par
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par
+Preamble\par
+\par
+The GNU General Public License is a free, copyleft license for software and other kinds of works.\par
+\par
+The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\par
+\par
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\par
+\par
+To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\par
+\par
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par
+\par
+Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\par
+\par
+For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\par
+\par
+Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\par
+\par
+Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\par
+\par
+The precise terms and conditions for copying, distribution and modification follow.\par
+TERMS AND CONDITIONS\par
+0. Definitions.\par
+\par
+\ldblquote This License\rdblquote  refers to version 3 of the GNU General Public License.\par
+\par
+\ldblquote Copyright\rdblquote  also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\par
+\par
+\ldblquote The Program\rdblquote  refers to any copyrightable work licensed under this License. Each licensee is addressed as \ldblquote you\rdblquote . \ldblquote Licensees\rdblquote  and \ldblquote recipients\rdblquote  may be individuals or organizations.\par
+\par
+To \ldblquote modify\rdblquote  a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \ldblquote modified version\rdblquote  of the earlier work or a work \ldblquote based on\rdblquote  the earlier work.\par
+\par
+A \ldblquote covered work\rdblquote  means either the unmodified Program or a work based on the Program.\par
+\par
+To \ldblquote propagate\rdblquote  a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\par
+\par
+To \ldblquote convey\rdblquote  a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\par
+\par
+An interactive user interface displays \ldblquote Appropriate Legal Notices\rdblquote  to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\par
+1. Source Code.\par
+\par
+The \ldblquote source code\rdblquote  for a work means the preferred form of the work for making modifications to it. \ldblquote Object code\rdblquote  means any non-source form of a work.\par
+\par
+A \ldblquote Standard Interface\rdblquote  means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\par
+\par
+The \ldblquote System Libraries\rdblquote  of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \ldblquote Major Component\rdblquote , in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\par
+\par
+The \ldblquote Corresponding Source\rdblquote  for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\par
+\par
+The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\par
+\par
+The Corresponding Source for a work in source code form is that same work.\par
+2. Basic Permissions.\par
+\par
+All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\par
+\par
+You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\par
+\par
+Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\par
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.\par
+\par
+No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\par
+\par
+When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\par
+4. Conveying Verbatim Copies.\par
+\par
+You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\par
+\par
+You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\par
+5. Conveying Modified Source Versions.\par
+\par
+You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\par
+\par
+    * a) The work must carry prominent notices stating that you modified it, and giving a relevant date.\par
+    * b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \ldblquote keep intact all notices\rdblquote .\par
+    * c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\par
+    * d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\par
+\par
+A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \ldblquote aggregate\rdblquote  if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\par
+6. Conveying Non-Source Forms.\par
+\par
+You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\par
+\par
+    * a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\par
+    * b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\par
+    * c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\par
+    * d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\par
+    * e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\par
+\par
+A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\par
+\par
+A \ldblquote User Product\rdblquote  is either (1) a \ldblquote consumer product\rdblquote , which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \ldblquote normally used\rdblquote  refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\par
+\par
+\ldblquote Installation Information\rdblquote  for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\par
+\par
+If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\par
+\par
+The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\par
+\par
+Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\par
+7. Additional Terms.\par
+\par
+\ldblquote Additional permissions\rdblquote  are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\par
+\par
+When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\par
+\par
+Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\par
+\par
+    * a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\par
+    * b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\par
+    * c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\par
+    * d) Limiting the use for publicity purposes of names of licensors or authors of the material; or\par
+    * e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\par
+    * f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\par
+\par
+All other non-permissive additional terms are considered \ldblquote further restrictions\rdblquote  within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\par
+\par
+If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\par
+\par
+Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\par
+8. Termination.\par
+\par
+You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\par
+\par
+However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\par
+\par
+Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\par
+\par
+Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\par
+9. Acceptance Not Required for Having Copies.\par
+\par
+You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\par
+10. Automatic Licensing of Downstream Recipients.\par
+\par
+Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\par
+\par
+An \ldblquote entity transaction\rdblquote  is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\par
+\par
+You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\par
+11. Patents.\par
+\par
+A \ldblquote contributor\rdblquote  is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \ldblquote contributor version\rdblquote .\par
+\par
+A contributor's \ldblquote essential patent claims\rdblquote  are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \ldblquote control\rdblquote  includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\par
+\par
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\par
+\par
+In the following three paragraphs, a \ldblquote patent license\rdblquote  is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \ldblquote grant\rdblquote  such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\par
+\par
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \ldblquote Knowingly relying\rdblquote  means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\par
+\par
+If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\par
+\par
+A patent license is \ldblquote discriminatory\rdblquote  if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\par
+\par
+Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\par
+12. No Surrender of Others' Freedom.\par
+\par
+If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\par
+13. Use with the GNU Affero General Public License.\par
+\par
+Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\par
+14. Revised Versions of this License.\par
+\par
+The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par
+\par
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \ldblquote or any later version\rdblquote  applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\par
+\par
+If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\par
+\par
+Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\par
+15. Disclaimer of Warranty.\par
+\par
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \ldblquote AS IS\rdblquote  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par
+16. Limitation of Liability.\par
+\par
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par
+17. Interpretation of Sections 15 and 16.\par
+\par
+If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\par
+\par
+END OF TERMS AND CONDITIONS\par
+}
+
\ No newline at end of file
diff --git a/setup/windows/Makefile b/setup/windows/Makefile
new file mode 100644
index 00000000000..603951b6cd0
--- /dev/null
+++ b/setup/windows/Makefile
@@ -0,0 +1,37 @@
+include Makefile.version
+include Makefile.python
+
+SERVER_DIRECTORY=../server
+FILES_DIRECTORY=files
+
+LAUNCH_PY2EXE=/cygdrive/c/python${PYTHON_VERSION}/python.exe setup.py py2exe
+
+MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION)
+
+LAUNCH_MAKENSIS=/cygdrive/c/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi
+
+default: allinone
+
+clean: server_clean
+	rm -rf $(FILES_DIRECTORY)/*.exe
+	rm -rf *.exe
+
+server_clean:
+	rm -rf $(SERVER_DIRECTORY)/dist 
+	rm -rf $(SERVER_DIRECTORY)/build
+	rm -rf $(SERVER_DIRECTORY)/win32/dist 
+	rm -rf $(SERVER_DIRECTORY)/win32/build
+	rm -rf $(SERVER_DIRECTORY)/*.exe
+	rm -rf $(SERVER_DIRECTORY)/.cyg*
+
+server: server_clean
+	(cd $(SERVER_DIRECTORY)/win32 && $(LAUNCH_PY2EXE))
+	(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE))
+	rm -rf `/usr/bin/find ${SERVER_DIRECTORY}/dist/openerp/addons -maxdepth 1 -mindepth 1 -not -name "web_*" -and -not -name "base" -and -not -name "web" -type d | xargs rm -rf`
+	(cd $(SERVER_DIRECTORY) && $(LAUNCH_MAKENSIS))
+	cp $(SERVER_DIRECTORY)/openerp-*.exe $(FILES_DIRECTORY)/openerp-server-setup-$(VERSION).exe
+
+allinone: server
+	$(LAUNCH_MAKENSIS)
+	cp ./openerp-*.exe $(FILES_DIRECTORY)/openerp-allinone-setup-$(VERSION).exe
+
diff --git a/setup/windows/pg_hba.conf b/setup/windows/pg_hba.conf
new file mode 100644
index 00000000000..74be6913f55
--- /dev/null
+++ b/setup/windows/pg_hba.conf
@@ -0,0 +1,73 @@
+# PostgreSQL Client Authentication Configuration File
+# ===================================================
+#
+# Refer to the PostgreSQL Administrator's Guide, chapter "Client
+# Authentication" for a complete description.  A short synopsis
+# follows.
+#
+# This file controls: which hosts are allowed to connect, how clients
+# are authenticated, which PostgreSQL user names they can use, which
+# databases they can access.  Records take one of these forms:
+#
+# local      DATABASE  USER  METHOD  [OPTION]
+# host       DATABASE  USER  CIDR-ADDRESS  METHOD  [OPTION]
+# hostssl    DATABASE  USER  CIDR-ADDRESS  METHOD  [OPTION]
+# hostnossl  DATABASE  USER  CIDR-ADDRESS  METHOD  [OPTION]
+#
+# (The uppercase items must be replaced by actual values.)
+#
+# The first field is the connection type: "local" is a Unix-domain socket,
+# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an
+# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket.
+#
+# DATABASE can be "all", "sameuser", "samerole", a database name, or
+# a comma-separated list thereof.
+#
+# USER can be "all", a user name, a group name prefixed with "+", or
+# a comma-separated list thereof.  In both the DATABASE and USER fields
+# you can also write a file name prefixed with "@" to include names from
+# a separate file.
+#
+# CIDR-ADDRESS specifies the set of hosts the record matches.
+# It is made up of an IP address and a CIDR mask that is an integer
+# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies
+# the number of significant bits in the mask.  Alternatively, you can write
+# an IP address and netmask in separate columns to specify the set of hosts.
+#
+# METHOD can be "trust", "reject", "md5", "crypt", "password",
+# "krb5", "ident", or "pam".  Note that "password" sends passwords
+# in clear text; "md5" is preferred since it sends encrypted passwords.
+#
+# OPTION is the ident map or the name of the PAM service, depending on METHOD.
+#
+# Database and user names containing spaces, commas, quotes and other special
+# characters must be quoted. Quoting one of the keywords "all", "sameuser" or
+# "samerole" makes the name lose its special character, and just match a
+# database or username with that name.
+#
+# This file is read on server startup and when the postmaster receives
+# a SIGHUP signal.  If you edit the file on a running system, you have
+# to SIGHUP the postmaster for the changes to take effect.  You can use
+# "pg_ctl reload" to do that.
+
+# Put your actual configuration here
+# ----------------------------------
+#
+# If you want to allow non-local connections, you need to add more
+# "host" records. In that case you will also need to make PostgreSQL listen
+# on a non-local interface via the listen_addresses configuration parameter,
+# or via the -i or -h command line switches.
+#
+
+
+
+# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD
+
+# IPv4 local connections:
+host    all         all         127.0.0.1/32          trust
+# IPv6 local connections:
+#host    all         all         ::1/128               md5
+
+# foreign connections
+host	all	all		0.0.0.0/0			md5
+host  all   all         ::/0                    md5
diff --git a/setup/windows/postgresql.conf b/setup/windows/postgresql.conf
new file mode 100644
index 00000000000..7255b232c77
--- /dev/null
+++ b/setup/windows/postgresql.conf
@@ -0,0 +1,493 @@
+# -----------------------------
+# PostgreSQL configuration file
+# -----------------------------
+#
+# This file consists of lines of the form:
+#
+#   name = value
+#
+# (The "=" is optional.)  Whitespace may be used.  Comments are introduced with
+# "#" anywhere on a line.  The complete list of parameter names and allowed
+# values can be found in the PostgreSQL documentation.
+#
+# The commented-out settings shown in this file represent the default values.
+# Re-commenting a setting is NOT sufficient to revert it to the default value;
+# you need to reload the server.
+#
+# This file is read on server startup and when the server receives a SIGHUP
+# signal.  If you edit the file on a running system, you have to SIGHUP the
+# server for the changes to take effect, or use "pg_ctl reload".  Some
+# parameters, which are marked below, require a server shutdown and restart to
+# take effect.
+#
+# Any parameter can also be given as a command-line option to the server, e.g.,
+# "postgres -c log_connections=on".  Some paramters can be changed at run time
+# with the "SET" SQL command.
+#
+# Memory units:  kB = kilobytes MB = megabytes GB = gigabytes
+# Time units:    ms = milliseconds s = seconds min = minutes h = hours d = days
+
+
+#------------------------------------------------------------------------------
+# FILE LOCATIONS
+#------------------------------------------------------------------------------
+
+# The default values of these variables are driven from the -D command-line
+# option or PGDATA environment variable, represented here as ConfigDir.
+
+#data_directory = 'ConfigDir'		# use data in another directory
+					# (change requires restart)
+#hba_file = 'ConfigDir/pg_hba.conf'	# host-based authentication file
+					# (change requires restart)
+#ident_file = 'ConfigDir/pg_ident.conf'	# ident configuration file
+					# (change requires restart)
+
+# If external_pid_file is not explicitly set, no extra PID file is written.
+#external_pid_file = '(none)'		# write an extra PID file
+					# (change requires restart)
+
+
+#------------------------------------------------------------------------------
+# CONNECTIONS AND AUTHENTICATION
+#------------------------------------------------------------------------------
+
+# - Connection Settings -
+
+listen_addresses = '*'		# what IP address(es) to listen on;
+					# comma-separated list of addresses;
+					# defaults to 'localhost', '*' = all
+					# (change requires restart)
+port = 5432				# (change requires restart)
+max_connections = 100			# (change requires restart)
+# Note:  Increasing max_connections costs ~400 bytes of shared memory per 
+# connection slot, plus lock space (see max_locks_per_transaction).  You might
+# also need to raise shared_buffers to support more connections.
+#superuser_reserved_connections = 3	# (change requires restart)
+#unix_socket_directory = ''		# (change requires restart)
+#unix_socket_group = ''			# (change requires restart)
+#unix_socket_permissions = 0777		# begin with 0 to use octal notation
+					# (change requires restart)
+#bonjour_name = ''			# defaults to the computer name
+					# (change requires restart)
+
+# - Security and Authentication -
+
+#authentication_timeout = 1min		# 1s-600s
+#ssl = off				# (change requires restart)
+#ssl_ciphers = 'ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
+					# (change requires restart)
+#password_encryption = on
+#db_user_namespace = off
+
+# Kerberos and GSSAPI
+#krb_server_keyfile = ''		# (change requires restart)
+#krb_srvname = 'postgres'		# (change requires restart, Kerberos only)
+#krb_server_hostname = ''		# empty string matches any keytab entry
+					# (change requires restart, Kerberos only)
+#krb_caseins_users = off		# (change requires restart)
+#krb_realm = ''           		# (change requires restart)
+
+# - TCP Keepalives -
+# see "man 7 tcp" for details
+
+#tcp_keepalives_idle = 0		# TCP_KEEPIDLE, in seconds;
+					# 0 selects the system default
+#tcp_keepalives_interval = 0		# TCP_KEEPINTVL, in seconds;
+					# 0 selects the system default
+#tcp_keepalives_count = 0		# TCP_KEEPCNT;
+					# 0 selects the system default
+
+
+#------------------------------------------------------------------------------
+# RESOURCE USAGE (except WAL)
+#------------------------------------------------------------------------------
+
+# - Memory -
+
+shared_buffers = 32MB			# min 128kB or max_connections*16kB
+					# (change requires restart)
+#temp_buffers = 8MB			# min 800kB
+#max_prepared_transactions = 5		# can be 0 or more
+					# (change requires restart)
+# Note:  Increasing max_prepared_transactions costs ~600 bytes of shared memory
+# per transaction slot, plus lock space (see max_locks_per_transaction).
+#work_mem = 1MB				# min 64kB
+#maintenance_work_mem = 16MB		# min 1MB
+#max_stack_depth = 2MB			# min 100kB
+
+# - Free Space Map -
+
+max_fsm_pages = 204800			# min max_fsm_relations*16, 6 bytes each
+					# (change requires restart)
+#max_fsm_relations = 1000		# min 100, ~70 bytes each
+					# (change requires restart)
+
+# - Kernel Resource Usage -
+
+#max_files_per_process = 1000		# min 25
+					# (change requires restart)
+shared_preload_libraries = '$libdir/plugins/plugin_debugger.dll'		# (change requires restart)
+
+# - Cost-Based Vacuum Delay -
+
+#vacuum_cost_delay = 0			# 0-1000 milliseconds
+#vacuum_cost_page_hit = 1		# 0-10000 credits
+#vacuum_cost_page_miss = 10		# 0-10000 credits
+#vacuum_cost_page_dirty = 20		# 0-10000 credits
+#vacuum_cost_limit = 200		# 1-10000 credits
+
+# - Background Writer -
+
+#bgwriter_delay = 200ms			# 10-10000ms between rounds
+#bgwriter_lru_maxpages = 100		# 0-1000 max buffers written/round
+#bgwriter_lru_multiplier = 2.0		# 0-10.0 multipler on buffers scanned/round
+
+
+#------------------------------------------------------------------------------
+# WRITE AHEAD LOG
+#------------------------------------------------------------------------------
+
+# - Settings -
+
+#fsync = on				# turns forced synchronization on or off
+#synchronous_commit = on		# immediate fsync at commit
+#wal_sync_method = fsync		# the default is the first option 
+					# supported by the operating system:
+					#   open_datasync
+					#   fdatasync
+					#   fsync
+					#   fsync_writethrough
+					#   open_sync
+#full_page_writes = on			# recover from partial page writes
+#wal_buffers = 64kB			# min 32kB
+					# (change requires restart)
+#wal_writer_delay = 200ms		# 1-10000 milliseconds
+
+#commit_delay = 0			# range 0-100000, in microseconds
+#commit_siblings = 5			# range 1-1000
+
+# - Checkpoints -
+
+#checkpoint_segments = 3		# in logfile segments, min 1, 16MB each
+#checkpoint_timeout = 5min		# range 30s-1h
+#checkpoint_completion_target = 0.5	# checkpoint target duration, 0.0 - 1.0
+#checkpoint_warning = 30s		# 0 is off
+
+# - Archiving -
+
+#archive_mode = off		# allows archiving to be done
+				# (change requires restart)
+#archive_command = ''		# command to use to archive a logfile segment
+#archive_timeout = 0		# force a logfile segment switch after this
+				# time; 0 is off
+
+
+#------------------------------------------------------------------------------
+# QUERY TUNING
+#------------------------------------------------------------------------------
+
+# - Planner Method Configuration -
+
+#enable_bitmapscan = on
+#enable_hashagg = on
+#enable_hashjoin = on
+#enable_indexscan = on
+#enable_mergejoin = on
+#enable_nestloop = on
+#enable_seqscan = on
+#enable_sort = on
+#enable_tidscan = on
+
+# - Planner Cost Constants -
+
+#seq_page_cost = 1.0			# measured on an arbitrary scale
+#random_page_cost = 4.0			# same scale as above
+#cpu_tuple_cost = 0.01			# same scale as above
+#cpu_index_tuple_cost = 0.005		# same scale as above
+#cpu_operator_cost = 0.0025		# same scale as above
+#effective_cache_size = 128MB
+
+# - Genetic Query Optimizer -
+
+#geqo = on
+#geqo_threshold = 12
+#geqo_effort = 5			# range 1-10
+#geqo_pool_size = 0			# selects default based on effort
+#geqo_generations = 0			# selects default based on effort
+#geqo_selection_bias = 2.0		# range 1.5-2.0
+
+# - Other Planner Options -
+
+#default_statistics_target = 10		# range 1-1000
+#constraint_exclusion = off
+#from_collapse_limit = 8
+#join_collapse_limit = 8		# 1 disables collapsing of explicit 
+					# JOIN clauses
+
+
+#------------------------------------------------------------------------------
+# ERROR REPORTING AND LOGGING
+#------------------------------------------------------------------------------
+
+# - Where to Log -
+
+log_destination = 'stderr'		# Valid values are combinations of
+					# stderr, csvlog, syslog and eventlog,
+					# depending on platform.  csvlog
+					# requires logging_collector to be on.
+
+# This is used when logging to stderr:
+logging_collector = on		# Enable capturing of stderr and csvlog
+					# into log files. Required to be on for
+					# csvlogs.
+					# (change requires restart)
+
+# These are only used if logging_collector is on:
+#log_directory = 'pg_log'		# directory where log files are written,
+					# can be absolute or relative to PGDATA
+#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log'	# log file name pattern,
+					# can include strftime() escapes
+#log_truncate_on_rotation = off		# If on, an existing log file of the
+					# same name as the new log file will be
+					# truncated rather than appended to.
+					# But such truncation only occurs on
+					# time-driven rotation, not on restarts
+					# or size-driven rotation.  Default is
+					# off, meaning append to existing files
+					# in all cases.
+#log_rotation_age = 1d			# Automatic rotation of logfiles will
+					# happen after that time.  0 to disable.
+#log_rotation_size = 10MB		# Automatic rotation of logfiles will 
+					# happen after that much log output.
+					# 0 to disable.
+
+# These are relevant when logging to syslog:
+#syslog_facility = 'LOCAL0'
+#syslog_ident = 'postgres'
+
+
+# - When to Log -
+
+#client_min_messages = notice		# values in order of decreasing detail:
+					#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+					#   log
+					#   notice
+					#   warning
+					#   error
+
+#log_min_messages = notice		# values in order of decreasing detail:
+					#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+					#   info
+					#   notice
+					#   warning
+					#   error
+					#   log
+					#   fatal
+					#   panic
+
+#log_error_verbosity = default		# terse, default, or verbose messages
+
+#log_min_error_statement = error	# values in order of decreasing detail:
+				 	#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+				 	#   info
+					#   notice
+					#   warning
+					#   error
+					#   log
+					#   fatal
+					#   panic (effectively off)
+
+#log_min_duration_statement = -1	# -1 is disabled, 0 logs all statements
+					# and their durations, > 0 logs only
+					# statements running at least this time.
+
+#silent_mode = off			# DO NOT USE without syslog or
+					# logging_collector
+					# (change requires restart)
+
+# - What to Log -
+
+#debug_print_parse = off
+#debug_print_rewritten = off
+#debug_print_plan = off
+#debug_pretty_print = off
+#log_checkpoints = off
+#log_connections = off
+#log_disconnections = off
+#log_duration = off
+#log_hostname = off
+log_line_prefix = '%t '			# special values:
+					#   %u = user name
+					#   %d = database name
+					#   %r = remote host and port
+					#   %h = remote host
+					#   %p = process ID
+					#   %t = timestamp without milliseconds
+					#   %m = timestamp with milliseconds
+					#   %i = command tag
+					#   %c = session ID
+					#   %l = session line number
+					#   %s = session start timestamp
+					#   %v = virtual transaction ID
+					#   %x = transaction ID (0 if none)
+					#   %q = stop here in non-session
+					#        processes
+					#   %% = '%'
+					# e.g. '<%u%%%d> '
+#log_lock_waits = off			# log lock waits >= deadlock_timeout
+#log_statement = 'none'			# none, ddl, mod, all
+#log_temp_files = -1			# log temporary files equal or larger
+					# than specified size;
+					# -1 disables, 0 logs all temp files
+#log_timezone = unknown			# actually, defaults to TZ environment
+					# setting
+
+
+#------------------------------------------------------------------------------
+# RUNTIME STATISTICS
+#------------------------------------------------------------------------------
+
+# - Query/Index Statistics Collector -
+
+#track_activities = on
+#track_counts = on
+#update_process_title = on
+
+
+# - Statistics Monitoring -
+
+#log_parser_stats = off
+#log_planner_stats = off
+#log_executor_stats = off
+#log_statement_stats = off
+
+
+#------------------------------------------------------------------------------
+# AUTOVACUUM PARAMETERS
+#------------------------------------------------------------------------------
+
+#autovacuum = on			# Enable autovacuum subprocess?  'on' 
+					# requires track_counts to also be on.
+#log_autovacuum_min_duration = -1	# -1 disables, 0 logs all actions and
+					# their durations, > 0 logs only
+					# actions running at least that time.
+#autovacuum_max_workers = 3		# max number of autovacuum subprocesses
+#autovacuum_naptime = 1min		# time between autovacuum runs
+#autovacuum_vacuum_threshold = 50	# min number of row updates before
+					# vacuum
+#autovacuum_analyze_threshold = 50	# min number of row updates before 
+					# analyze
+#autovacuum_vacuum_scale_factor = 0.2	# fraction of table size before vacuum
+#autovacuum_analyze_scale_factor = 0.1	# fraction of table size before analyze
+#autovacuum_freeze_max_age = 200000000	# maximum XID age before forced vacuum
+					# (change requires restart)
+#autovacuum_vacuum_cost_delay = 20	# default vacuum cost delay for
+					# autovacuum, -1 means use
+					# vacuum_cost_delay
+#autovacuum_vacuum_cost_limit = -1	# default vacuum cost limit for
+					# autovacuum, -1 means use
+					# vacuum_cost_limit
+
+
+#------------------------------------------------------------------------------
+# CLIENT CONNECTION DEFAULTS
+#------------------------------------------------------------------------------
+
+# - Statement Behavior -
+
+#search_path = '"$user",public'		# schema names
+#default_tablespace = ''		# a tablespace name, '' uses the default
+#temp_tablespaces = ''			# a list of tablespace names, '' uses
+					# only default tablespace
+#check_function_bodies = on
+#default_transaction_isolation = 'read committed'
+#default_transaction_read_only = off
+#session_replication_role = 'origin'
+#statement_timeout = 0			# 0 is disabled
+#vacuum_freeze_min_age = 100000000
+#xmlbinary = 'base64'
+#xmloption = 'content'
+
+# - Locale and Formatting -
+
+datestyle = 'iso, mdy'
+#timezone = unknown			# actually, defaults to TZ environment
+					# setting
+#timezone_abbreviations = 'Default'     # Select the set of available time zone
+					# abbreviations.  Currently, there are
+					#   Default
+					#   Australia
+					#   India
+					# You can create your own file in
+					# share/timezonesets/.
+#extra_float_digits = 0			# min -15, max 2
+#client_encoding = sql_ascii		# actually, defaults to database
+					# encoding
+
+# These settings are initialized by initdb, but they can be changed.
+lc_messages = 'C'			# locale for system error message
+					# strings
+lc_monetary = 'C'			# locale for monetary formatting
+lc_numeric = 'C'			# locale for number formatting
+lc_time = 'C'				# locale for time formatting
+
+# default configuration for text search
+default_text_search_config = 'pg_catalog.english'
+
+# - Other Defaults -
+
+#explain_pretty_print = on
+#dynamic_library_path = '$libdir'
+#local_preload_libraries = ''
+
+
+#------------------------------------------------------------------------------
+# LOCK MANAGEMENT
+#------------------------------------------------------------------------------
+
+#deadlock_timeout = 1s
+#max_locks_per_transaction = 64		# min 10
+					# (change requires restart)
+# Note:  Each lock table slot uses ~270 bytes of shared memory, and there are
+# max_locks_per_transaction * (max_connections + max_prepared_transactions)
+# lock table slots.
+
+
+#------------------------------------------------------------------------------
+# VERSION/PLATFORM COMPATIBILITY
+#------------------------------------------------------------------------------
+
+# - Previous PostgreSQL Versions -
+
+#add_missing_from = off
+#array_nulls = on
+#backslash_quote = safe_encoding	# on, off, or safe_encoding
+#default_with_oids = off
+#escape_string_warning = on
+#regex_flavor = advanced		# advanced, extended, or basic
+#sql_inheritance = on
+#standard_conforming_strings = off
+#synchronize_seqscans = on
+
+# - Other Platforms and Clients -
+
+#transform_null_equals = off
+
+
+#------------------------------------------------------------------------------
+# CUSTOMIZED OPTIONS
+#------------------------------------------------------------------------------
+
+#custom_variable_classes = ''		# list of custom variable class names
diff --git a/setup/windows/setup.nsi b/setup/windows/setup.nsi
old mode 100644
new mode 100755
index 859ebdb39e2..b2129584cef
--- a/setup/windows/setup.nsi
+++ b/setup/windows/setup.nsi
@@ -21,26 +21,73 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #####################################################################################
 
+# TODO: Avoid to uninstall the database
+# TODO: We can update the server or the clients without to uninstall the all-in-one
+
 !include 'MUI2.nsh'
 !include 'FileFunc.nsh'
 !include 'LogicLib.nsh'
 !include 'Sections.nsh'
+!include 'LogicLib.nsh'
+
+!macro IfKeyExists ROOT MAIN_KEY KEY
+    # This macro comes from http://nsis.sourceforge.net/Check_for_a_Registry_Key
+    Push $R0
+    Push $R1
+    Push $R2
+ 
+    # XXX bug if ${ROOT}, ${MAIN_KEY} or ${KEY} use $R0 or $R1
+ 
+    StrCpy $R1 "0" # loop index
+    StrCpy $R2 "0" # not found
+ 
+    ${Do}
+        EnumRegKey $R0 ${ROOT} "${MAIN_KEY}" "$R1"
+        ${If} $R0 == "${KEY}"
+            StrCpy $R2 "1" # found
+            ${Break}
+        ${EndIf}
+        IntOp $R1 $R1 + 1
+    ${LoopWhile} $R0 != ""
+ 
+    ClearErrors
+ 
+    Exch 2
+    Pop $R0
+    Pop $R1
+    Exch $R2
+!macroend
 
 !define PUBLISHER 'OpenERP S.A.'
 
-!ifndef VERSION
-    !define VERSION '0'
+!ifndef MAJOR_VERSION
+    !define MAJOR_VERSION '7'
 !endif
-#!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"
 
-!define PRODUCT_NAME "OpenERP Server"
-!define DISPLAY_NAME "${PRODUCT_NAME} ${VERSION}"
+!ifndef MINOR_VERSION
+    !define MINOR_VERSION '0'
+!endif
 
-!define UNINSTALL_REGISTRY_ROOT HKLM
-!define UNINSTALL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DISPLAY_NAME}"
+!ifndef REVISION_VERSION
+    !define REVISION_VERSION '0'
+!endif
+
+!ifndef VERSION
+    !define VERSION "0"
+#!define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-r${REVISION_VERSION}"
+!endif
+
+!define PRODUCT_NAME "OpenERP"
+!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"
+
+!define REGISTRY_ROOT HKLM
+!define UNINSTALL_BASE_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"
+!define UNINSTALL_REGISTRY_KEY "${UNINSTALL_BASE_REGISTRY_KEY}\${DISPLAY_NAME}"
+
+!define UNINSTALL_REGISTRY_KEY_SERVER "${UNINSTALL_BASE_REGISTRY_KEY}\OpenERP Server ${VERSION}"
 
 !define REGISTRY_KEY "Software\${DISPLAY_NAME}"
 
@@ -51,9 +98,9 @@
 
 Name '${DISPLAY_NAME}'
 Caption "${PRODUCT_NAME} ${VERSION} Setup"
-OutFile "openerp-server-setup-${VERSION}.exe"
-SetCompressor /final /solid lzma
-SetCompress auto
+OutFile "openerp-allinone-setup-${VERSION}.exe"
+#SetCompressor /final /solid lzma
+#SetCompress auto
 ShowInstDetails show
 
 XPStyle on
@@ -90,33 +137,36 @@ Var HWNDPostgreSQLPort
 Var HWNDPostgreSQLUsername
 Var HWNDPostgreSQLPassword
 
-Var MUI_TEMP
-Var STARTMENU_FOLDER
+!define STATIC_PATH "static"
+!define PIXMAPS_PATH "${STATIC_PATH}\pixmaps"
+!define POSTGRESQL_EXE "${STATIC_PATH}\postgresql-8.3-int.msi"
+
+!define OPENERP_SERVER_SETUP 'openerp-server-setup-${VERSION}.exe'
 
 !define MUI_ABORTWARNING
-!define MUI_ICON ".\install\openerp-icon.ico"
+!define MUI_ICON "${PIXMAPS_PATH}\openerp-icon.ico"
 
-!define MUI_WELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\install\openerp-intro.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${PIXMAPS_PATH}\openerp-intro.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${PIXMAPS_PATH}\openerp-intro.bmp"
 !define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP ".\install\openerp-slogan.bmp"
+!define MUI_HEADERIMAGE_BITMAP "${PIXMAPS_PATH}\openerp-slogan.bmp"
 !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
 !define MUI_HEADER_TRANSPARENT_TEXT ""
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE ".\LICENSE"
+!insertmacro MUI_PAGE_LICENSE "${STATIC_PATH}\doc\LICENSE"
 !define MUI_COMPONENTSPAGE_SMALLDESC
-!insertmacro MUI_PAGE_DIRECTORY
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE ComponentLeave
+!insertmacro MUI_PAGE_COMPONENTS
 Page Custom ShowPostgreSQL LeavePostgreSQL
-
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${REGISTRY_KEY}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${DISPLAY_NAME}"
-
-!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+!insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
 !define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_CHECKED
+!define MUI_FINISHPAGE_RUN_TEXT "$(DESC_FinishPageText)"
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
 !define MUI_FINISHPAGE_LINK $(DESC_FinishPage_Link) 
 !define MUI_FINISHPAGE_LINK_LOCATION "http://www.openerp.com/contact"
 !insertmacro MUI_PAGE_FINISH
@@ -130,12 +180,12 @@ Page Custom ShowPostgreSQL LeavePostgreSQL
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_RESERVEFILE_LANGDLL
 
-!macro CreateInternetShortcut FILENAME URL
-	WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
-!macroend
-
 ; English
+LangString DESC_OpenERP_Server ${LANG_ENGLISH} "Install the OpenERP Server with all the OpenERP standard modules."
+LangString DESC_PostgreSQL ${LANG_ENGLISH} "Install the PostgreSQL RDBMS used by OpenERP."
 LangString DESC_FinishPage_Link ${LANG_ENGLISH} "Contact OpenERP for Partnership and/or Support"
+LangString DESC_AtLeastOneComponent ${LANG_ENGLISH} "You have to choose at least one component"
+LangString DESC_CanNotInstallPostgreSQL ${LANG_ENGLISH} "You can not install the PostgreSQL database without the OpenERP Server"
 LangString WARNING_HostNameIsEmpty ${LANG_ENGLISH} "The hostname for the connection to the PostgreSQL Server is empty"
 LangString WARNING_UserNameIsEmpty ${LANG_ENGLISH} "The username for the connection to the PostgreSQL Server is empty"
 LangString WARNING_PasswordIsEmpty ${LANG_ENGLISH} "The password for the connection to the PostgreSQL Server is empty"
@@ -145,10 +195,18 @@ LangString DESC_PostgreSQL_Hostname ${LANG_ENGLISH} "Hostname"
 LangString DESC_PostgreSQL_Port ${LANG_ENGLISH} "Port"
 LangString DESC_PostgreSQL_Username ${LANG_ENGLISH} "Username"
 LangString DESC_PostgreSQL_Password ${LANG_ENGLISH} "Password"
-
+LangString Profile_AllInOne ${LANG_ENGLISH} "All In One"
+LangString Profile_Server ${LANG_ENGLISH} "Server only"
+LangString TITLE_OpenERP_Server ${LANG_ENGLISH} "OpenERP Server"
+LangString TITLE_PostgreSQL ${LANG_ENGLISH} "PostgreSQL Database"
+LangString DESC_FinishPageText ${LANG_ENGLISH} "Start OpenERP"
 
 ; French
+LangString DESC_OpenERP_Server ${LANG_FRENCH} "Installation du Serveur OpenERP avec tous les modules OpenERP standards."
+LangString DESC_PostgreSQL ${LANG_FRENCH} "Installation de la base de donn?es PostgreSQL utilis?e par OpenERP."
 LangString DESC_FinishPage_Link ${LANG_FRENCH} "Contactez OpenERP pour un Partenariat et/ou du Support"
+LangString DESC_AtLeastOneComponent ${LANG_FRENCH} "Vous devez choisir au moins un composant"
+LangString DESC_CanNotInstallPostgreSQL ${LANG_FRENCH} "Vous ne pouvez pas installer la base de donn?es PostgreSQL sans le serveur OpenERP"
 LangString WARNING_HostNameIsEmpty ${LANG_FRENCH} "L'adresse pour la connection au serveur PostgreSQL est vide"
 LangString WARNING_UserNameIsEmpty ${LANG_FRENCH} "Le nom d'utilisateur pour la connection au serveur PostgreSQL est vide"
 LangString WARNING_PasswordIsEmpty ${LANG_FRENCH} "Le mot de passe pour la connection au serveur PostgreSQL est vide"
@@ -158,59 +216,70 @@ LangString DESC_PostgreSQL_Hostname ${LANG_FRENCH} "H?te"
 LangString DESC_PostgreSQL_Port ${LANG_FRENCH} "Port"
 LangString DESC_PostgreSQL_Username ${LANG_FRENCH} "Utilisateur"
 LangString DESC_PostgreSQL_Password ${LANG_FRENCH} "Mot de passe"
+LangString Profile_AllInOne ${LANG_FRENCH} "All In One"
+LangString Profile_Server ${LANG_FRENCH} "Seulement le serveur"
+LangString TITLE_OpenERP_Server ${LANG_FRENCH} "Serveur OpenERP"
+LangString TITLE_PostgreSQL ${LANG_FRENCH} "Installation du serveur de base de donn?es PostgreSQL"
+LangString DESC_FinishPageText ${LANG_FRENCH} "Lancer OpenERP"
 
-Section -StopService
-    nsExec::Exec "net stop openerp-server-7.0"
-    sleep 2
-SectionEnd
+InstType $(Profile_AllInOne)
+InstType $(Profile_Server)
 
-Section OpenERP_Server SectionOpenERP_Server
-    SetOutPath '$INSTDIR\server'
-
-    File /r "dist\*"
-    File /r "win32\wkhtmltopdf\*"
-
-    SetOutPath "$INSTDIR\service"
-    File /r "win32\dist\*"
-    File "win32\start.bat"
-    File "win32\stop.bat"
-
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        ;Create shortcuts
-        CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-        !insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\OpenERP" "http://localhost:8069/"
-    !insertmacro MUI_STARTMENU_WRITE_END
-
-
-    FileOpen $9 '$INSTDIR\install.log' w
-    FileWrite $9 "INSTDIR $INSTDIR$\r$\n"
-    FileWrite $9 "Hostname $TextPostgreSQLHostname$\r$\n"
-    FileWrite $9 "Port $TextPostgreSQLPort$\r$\n"
-    FileWrite $9 "Username $TextPostgreSQLUsername$\r$\n"
-    FileWrite $9 "Password $TextPostgreSQLPassword$\r$\n"
-    FileClose $9
+Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
+    SectionIn 1 2
+    SetOutPath "$TEMP"
+    File "files\${OPENERP_SERVER_SETUP}"
+    ExecWait '"$TEMP\${OPENERP_SERVER_SETUP}" /S /D=$INSTDIR\Server'
 
 # If there is a previous install of the OpenERP Server, keep the login/password from the config file
-    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname
-    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
-    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
-    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
-    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
+    WriteIniStr "$INSTDIR\Server\server\openerp-server.conf" "options" "db_host" $TextPostgreSQLHostname
+    WriteIniStr "$INSTDIR\Server\server\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername
+    WriteIniStr "$INSTDIR\Server\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
+    WriteIniStr "$INSTDIR\Server\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
 
-    nsExec::Exec '"$INSTDIR\server\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\server\openerp-server.log" -s'
-    nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'
-SectionEnd
+    # if we've going to install postgresql force it's path,
+    # otherwise we consider it's always done and/or correctly tune by users
+    ${If} $HasPostgreSQL == 0
+        WriteIniStr "$INSTDIR\Server\server\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"
+    ${EndIf}
+
+    nsExec::Exec "net stop openerp-server-7.0"
+    sleep 2
 
-Section -RestartServer
     nsExec::Exec "net start openerp-server-7.0"
     sleep 2
+
+SectionEnd
+    
+Section $(TITLE_PostgreSQL) SectionPostgreSQL
+    SectionIn 1 2
+    SetOutPath '$TEMP'
+    nsExec::Exec 'net user openpgsvc /delete'
+
+    File "postgresql-9.2.2-1-windows.exe"
+
+    ReadRegStr $0 HKLM "System\CurrentControlSet\Control\ComputerName\ActiveComputerName" "ComputerName"
+    StrCmp $0 "" win9x
+    Goto done
+    win9x:
+        ReadRegStr $0 HKLM "System\CurrentControlSet\Control\ComputerName\ComputerName" "ComputerName"
+    done:
+    Rmdir /r "$INSTDIR\PostgreSQL"
+    ExecWait '"$TEMP\postgresql-9.2.2-1-windows.exe" \
+        --mode unattended \
+        --prefix "$INSTDIR\PostgreSQL" \
+        --datadir "$INSTDIR\PostgreSQL\data" \
+        --servicename "PostgreSQL_For_OpenERP" \
+        --serviceaccount "openpgsvc" --servicepassword "0p3npgsvcPWD" \
+        --superaccount "$TextPostgreSQLUsername" --superpassword "$TextPostgreSQLPassword" \
+        --serverport $TextPostgreSQLPort'
 SectionEnd
 
 Section -Post
-    WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\server\Uninstall.exe"
+    WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
     WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "InstallLocation" "$INSTDIR"
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayName" "${DISPLAY_NAME}"
-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${VERSION}"
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${MAJOR_VERSION}.${MINOR_VERSION}"
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${PUBLISHER}"
 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"
 ;    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"
@@ -221,40 +290,24 @@ Section -Post
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Contact" "sales@openerp.com"
     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoModify" "1"
     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "NoRepair" "1"
-    WriteUninstaller "$INSTDIR\server\Uninstall.exe"
+    WriteUninstaller "$INSTDIR\Uninstall.exe"
 SectionEnd
 
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${SectionOpenERP_Server} $(DESC_OpenERP_Server)
+    !insertmacro MUI_DESCRIPTION_TEXT ${SectionPostgreSQL} $(DESC_PostgreSQL)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
 Section "Uninstall"
-    ; Stop the NT Service
-    nsExec::Exec "net stop openerp-server-7.0"
-    sleep 2
+    # Check if the server is installed
+    !insertmacro IfKeyExists "HKLM" "${UNINSTALL_REGISTRY_KEY_SERVER}" "UninstallString"
+    Pop $R0
+    ReadRegStr $0 HKLM "${UNINSTALL_REGISTRY_KEY_SERVER}" "UninstallString"
+    ExecWait '"$0" /S'
 
-    ; Uninstall the OpenERP Service
-    nsExec::Exec '"$INSTDIR\..\service\OpenERPServerService.exe" -remove'
-    sleep 2
-
-    Rmdir /r "$INSTDIR\service"
     Rmdir /r "$INSTDIR\server"
+    Rmdir /r "$INSTDIR\service"
 
-    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-    Delete "$SMPROGRAMS\$MUI_TEMP\OpenERP.url"
-    ;
-    ;Delete empty start menu parent diretories
-    StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-    startMenuDeleteLoop:
-        ClearErrors
-        RMDir $MUI_TEMP
-        GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-
-        IfErrors startMenuDeleteLoopDone
-
-        StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
-
-    startMenuDeleteLoopDone:
-
-    ; Clean the Registry
     DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}"
 SectionEnd
 
@@ -295,10 +348,19 @@ Function .onInit
     IfErrors DoInstallPostgreSQL 0
     StrCmp $0 "" DoInstallPostgreSQL
     StrCpy $HasPostgreSQL 1
+    #SectionSetText ${SectionPostgreSQL} ""
+    !insertmacro UnselectSection ${SectionPostgreSQL}
+    SectionSetFlags ${SectionPostgreSQL} ${SF_RO}
 
     DoInstallPostgreSQL:
 FunctionEnd
 
+Function .onSelChange
+    ${If} $HasPostgreSQL == 1
+        !insertmacro UnselectSection ${SectionPostgreSQL}
+    ${EndIf}
+FunctionEnd
+
 Function PostgreSQLOnBack
 FunctionEnd
 
@@ -344,14 +406,10 @@ Function ShowPostgreSQL
 FunctionEnd
 
 Function LeavePostgreSQL
-    # Before to leave the PostgreSQL configuration screen, we check the values
-    # from the inputs, to be sure we have the right values
-
     ${NSD_GetText} $HWNDPostgreSQLHostname $TextPostgreSQLHostname
     ${NSD_GetText} $HWNDPostgreSQLPort $TextPostgreSQLPort
     ${NSD_GetText} $HWNDPostgreSQLUsername $TextPostgreSQLUsername
     ${NSD_GetText} $HWNDPostgreSQLPassword $TextPostgreSQLPassword
-
     StrLen $1 $TextPostgreSQLHostname
     ${If} $1 == 0
         MessageBox MB_ICONEXCLAMATION|MB_OK $(WARNING_HostNameIsEmpty)
@@ -377,3 +435,25 @@ Function LeavePostgreSQL
     ${EndIf}
 FunctionEnd
 
+Function ComponentLeave
+    SectionGetFlags ${SectionOpenERP_Server} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+    IntCmp $0 ${SF_SELECTED} Done
+
+    SectionGetFlags ${SectionPostgreSQL} $0
+    IntOp $0 $0 & ${SF_SELECTED}
+    IntCmp $0 ${SF_SELECTED} DontInstallPostgreSQL
+
+    ChooseAtLeastOneComponent:
+        MessageBox MB_ICONEXCLAMATION|MB_OK $(DESC_AtLeastOneComponent)
+        Abort
+
+    DontInstallPostgreSQL:
+        MessageBox MB_ICONEXCLAMATION|MB_OK $(DESC_CanNotInstallPostgreSQL)
+        Abort
+    Done:
+FunctionEnd
+
+Function LaunchLink
+    ExecShell "open" "http://localhost:8069/"
+FunctionEnd