From 0ac081ca597c9b491dc50f9c3acee92ef9869e02 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 9 May 2012 16:26:41 +0530
Subject: [PATCH 001/128] [FIX]stock: fix the issue of return picking wizard

lp bug: https://launchpad.net/bugs/997028 fixed

bzr revid: mma@tinyerp.com-20120509105641-9ijemxgekhif76zc
---
 addons/stock/wizard/stock_return_picking.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 689f17cd9b9..8cfe4342327 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,7 +100,8 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                if return_history:
+                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
                         valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))

From f9c2437959fba731b808208e184d86f51f2db600 Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Fri, 18 May 2012 16:05:41 +0530
Subject: [PATCH 002/128] [FIX] account : Add access rules for entry analysis
 report

lp bug: https://launchpad.net/bugs/999506 fixed

bzr revid: amp@tinyerp.com-20120518103541-vfp9bh4p9dqwbr18
---
 addons/account/security/account_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index e1a29a6edfb..997918650a5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -107,6 +107,13 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record id="entry_analysis_comp_rule" model="ir.rule">
+        <field name="name">Entries Analysis multi-company</field>
+        <field model="ir.model" name="model_id" ref="model_account_entries_report"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>

From 738040e15b9cd49fdf313a0f3c729cc9581e206d Mon Sep 17 00:00:00 2001
From: vivisci <>
Date: Thu, 16 Aug 2012 12:08:08 +0530
Subject: [PATCH 003/128] [FIX] the issue of not showing data on bilan report
 and compute resultant report

lp bug: https://launchpad.net/bugs/1036943 fixed

bzr revid: rmu@tinyerp.com-20120816063808-3jw4q056p9nfm911
---
 addons/l10n_fr/wizard/fr_report_bilan.py             | 4 ++--
 addons/l10n_fr/wizard/fr_report_compute_resultant.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index cec2e513a6a..adeab4f0ab4 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -49,9 +49,9 @@ class account_bilan_report(osv.osv_memory):
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
 
 account_bilan_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index d90466ea6c4..f3833b372c4 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -49,9 +49,9 @@ class account_cdr_report(osv.osv_memory):
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
 
 account_cdr_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 0195eb407d8f71b7adc878f9bc39d14de8bde38b Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Wed, 22 Aug 2012 11:55:55 +0530
Subject: [PATCH 004/128] [FIX] mail_template : Fixes the duplication problem
 on email template

lp bug: https://launchpad.net/bugs/1039645 fixed

bzr revid: amp@tinyerp.com-20120822062555-d7thh474wn5lisnv
---
 addons/email_template/email_template.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index b43b7d19b85..6f48d37c714 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -236,6 +236,10 @@ class email_template(osv.osv):
             default = {}
         default = default.copy()
         default['name'] = template.name + _('(copy)')
+        default.update({
+            'ref_ir_act_window': False,
+            'ref_ir_value': False,
+        })
         return super(email_template, self).copy(cr, uid, id, default, context)
 
     def build_expression(self, field_name, sub_field_name, null_value):

From 815ea021d8cec91331c2815cc1a9812a2eb1750c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 27 Aug 2012 16:40:13 +0530
Subject: [PATCH 005/128] [IMP]stock:improve condition

bzr revid: mma@tinyerp.com-20120827111013-x5xlu56cxtm5lqf0
---
 addons/stock/wizard/stock_return_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 8cfe4342327..203db7232f1 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,7 +100,7 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if return_history:
+                if return_history and return_history.get(m.id):
                     if m.product_qty * m.product_uom.factor > return_history[m.id]:
                         valid_lines += 1
             if not valid_lines:

From 0a9c1b54ca80d0cc942f99cd18539b89d5385449 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 10 Sep 2012 16:14:22 +0530
Subject: [PATCH 006/128] [IMP]stock : improve code which is more batter for
 return picking

bzr revid: mma@tinyerp.com-20120910104422-1s9h1fq25ud2iwvs
---
 addons/stock/wizard/stock_return_picking.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index bc6acfaa1cc..80cc5a4a368 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,8 +100,7 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if return_history and return_history.get(m.id):
-                    if m.product_qty * m.product_uom.factor > return_history[m.id]:
+                 if (return_history.get(m.id) is not None) and (m.product_qty * m.product_uom.factor > return_history[m.id]):
                         valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning!'), _("No products to return (only lines in Done state and not fully returned yet can be returned)!"))

From af1df4d5cd44a176b1ea933c18963bd8b36f0db9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 11 Sep 2012 14:09:19 +0530
Subject: [PATCH 007/128] [FIX]product:search method added for searching
 products by category

bzr revid: kbh@tinyerp.com-20120911083919-cwenu6oum79oa7do
---
 addons/product/product.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/product/product.py b/addons/product/product.py
index c9345a22103..ac62ef129c4 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -743,6 +743,14 @@ class product_product(osv.osv):
         else:
             return super(product_product, self).copy(cr, uid, id, default=default,
                     context=context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context and context.get('search_default_categ_id', False):
+            args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
+        return super(product_product, self).search(cr, uid, args, offset, limit, order, context, count)
+
 product_product()
 
 class product_packaging(osv.osv):

From 6fca7f4abef5e4a54b77de1ec49a2c351ca8f63e Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 11 Sep 2012 18:57:24 +0530
Subject: [PATCH 008/128] [IMP] improve the placeholder text

bzr revid: rma@tinyerp.com-20120911132724-nc201qmgoicvknmt
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index a79610b7a18..6b8354214bf 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -216,7 +216,7 @@
                             </field>
                         </page>
                         <page string="Internal Notes">
-                            <field name="comment" placeholder="Internal notes about this customer..."/>
+                            <field name="comment" placeholder="Put an internal note..."/>
                         </page>
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
                             <group>

From c0a3cbac504d4ad35b6f5111e2b235dfaab31dd8 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 14 Sep 2012 15:49:47 +0530
Subject: [PATCH 009/128] [IMP]stock : set a proper indentation

bzr revid: mma@tinyerp.com-20120914101947-cbrdfp0iatq6r0a6
---
 addons/stock/wizard/stock_return_picking.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 80cc5a4a368..bc4cf652cdb 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -100,8 +100,8 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                 if (return_history.get(m.id) is not None) and (m.product_qty * m.product_uom.factor > return_history[m.id]):
-                        valid_lines += 1
+                if (return_history.get(m.id) is not None) and (m.product_qty * m.product_uom.factor > return_history[m.id]):
+                    valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning!'), _("No products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res

From 0e3577dcbfc0a4aad725cf51c7919d7ce3136b08 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 11:23:57 +0530
Subject: [PATCH 010/128] [IMP] crm_claim, crm_helpdesk : After Sales Service
 menu (helpdesk and claims) moved from Project to Sales menu.

bzr revid: mdi@tinyerp.com-20120917055357-q7c144zboqzg74jf
---
 addons/crm_claim/crm_claim_menu.xml       | 2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index bb881d62a58..3782a3a7c00 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -10,7 +10,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
-            parent="base.menu_main_pm" sequence="2" />
+            parent="base.menu_base_partner" sequence="2" />
 
         <!-- Claims Menu -->
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index b70662e3339..0a9644ff8f9 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -3,11 +3,11 @@
     <data noupdate="1">
 
         <!-- Top menu item -->
-        <menuitem name="Project"
-            id="base.menu_main_pm"
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
             sequence="90"/>
 
-        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" />
 
         <!-- Help Desk (menu) -->
 

From a49acd9fcadc6c0ed4bb39489ace3dd0c36f6315 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 17 Sep 2012 11:53:26 +0530
Subject: [PATCH 011/128] [IMP] stock: update warning message for stock in
 serial number

bzr revid: cha@tinyerp.com-20120917062326-ony3gx9k2o871kq3
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 31d5a68c9fe..9cdbc97c115 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1804,8 +1804,8 @@ class stock_move(osv.osv):
         warning = {}
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
-                'title': _('Insufficient Stock in Lot !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available in this lot.') % (product_qty, uom.name, amount_actual, uom.name)
+                'title': _('Insufficient Stock in Serial Number !'),
+                'message': _('You are moving %.2f %s products but only %.2f %s available in this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 

From ba4857238c07c105016f8de070c3e5f42aea94d6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 12:20:22 +0530
Subject: [PATCH 012/128] [IMP] Customer form view: uncheck Customer, how to
 check again? Sales & Purchases disappears.

bzr revid: mdi@tinyerp.com-20120917065022-h7gtgv9rf3s62fge
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 906232c86ab..51e17fab088 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -249,7 +249,7 @@
                         <page string="Internal Notes">
                             <field name="comment" placeholder="Internal notes about this customer..."/>
                         </page>
-                        <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
+                        <page string="Sales &amp; Purchases">
                             <group>
                                 <group>
                                     <field name="user_id"/>

From c8e57c8c059bf842fdeae0fc813fb2ae1c970ef8 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 17 Sep 2012 12:23:36 +0530
Subject: [PATCH 013/128] [IMP] stock: change string for ok button & add cancel
 button in wizard

bzr revid: cha@tinyerp.com-20120917065336-f1yw01itbx2ka32o
---
 addons/stock/wizard/stock_move_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 3df336b5e30..5dc0d0d824c 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -109,7 +109,9 @@
                         </form>
                     </field>
                     <footer>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        <button name="split_lot" string="Split" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
                 </field>

From 066b30e5c8ec5a19e331b2f41237f8443bb77c6c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 14:14:36 +0530
Subject: [PATCH 014/128] [IMP] base_calendar : Improved the  Invitation Wizard
 View.

bzr revid: mdi@tinyerp.com-20120917084436-00kqv09ueod3h709
---
 .../base_calendar_invite_attendee_view.xml    | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 5510259a7a7..e3f07fee833 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -9,27 +9,28 @@
             <field name="model">base_calendar.invite.attendee</field>
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
-                    <separator string="Invite People" colspan="4"/>
-                    <field name="type"/>
-                    <field name="send_mail"/>
-                    <notebook colspan="4">
-                        <page string="Data">
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
-                                <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
-                                <separator string="Users" colspan="4"/>
-                                <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
-                                <newline/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
-                                <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
-                                <newline/>
-                                <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <group>
+                        <group>
+                            <field name="type"/>
+                        </group>
+                        <group>
+                            <field name="send_mail"/>
+                        </group>
+                    </group>
+                    <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
+                        <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
+                    </group>
+                    <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
+                        <separator string="Users" colspan="4"/>
+                        <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
+                        <newline/>
+                    </group>
+                    <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
+                        <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
+                        <newline/>
+                        <separator string="Partner Contacts" colspan="6"/>
+                        <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
+                    </group>
                     <footer>
                         <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
                         or

From 0db8c15411af2ddcf45b70e4d1f3381bd4c4ec59 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 17 Sep 2012 15:00:53 +0530
Subject: [PATCH 015/128] [IMP] HR : Empty message added like in My Dashboard
 while only hr module installed

bzr revid: rpr@tinyerp.com-20120917093053-ugvbfy5hpf9zxgs0
---
 addons/hr/board_hr_view.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 4d01038b671..06f66054254 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -22,6 +22,20 @@
         <field name="view_mode">form</field>
         <field name="usage">menu</field>
         <field name="view_id" ref="board_hr_form"/>
+            <field name="help" type="html">
+              <div>
+                  <p>
+                    <b>Your personal dashboard is empty.</b>
+                  </p><p>
+                    To add your first report into this dashboard, go to any
+                    menu, switch to list or graph view, and click <i>'Add to
+                    Dashboard'</i> in the extended search options.
+                  </p><p>
+                    You can filter and group data before inserting into the
+                    dashboard using the search options.
+                  </p>
+              </div>
+            </field>
     </record>
     <menuitem id="menu_hr_dashboard" 
               parent="base.menu_reporting_dashboard" 

From 3bdedaeb248e1a8528408cec2c98fa9da63804f7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 15:20:53 +0530
Subject: [PATCH 016/128] [IMP] crm : Calls, Opportunities, Leads should be
 restricted to the group Sales/User see all leads.

bzr revid: mdi@tinyerp.com-20120917095053-1v2b71j9b4cl8hxe
---
 addons/crm/crm_lead_menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 04758f4ffe0..34b1f28169d 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -82,8 +82,8 @@
      </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman"/>
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman"/>
 
 </data>
 </openerp>

From ff4347bebdde5462755a940413c6fcab7e89d246 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 15:41:09 +0530
Subject: [PATCH 017/128] [FIX] crm_helpdesk : Send Reminder doesn't work.

bzr revid: mdi@tinyerp.com-20120917101109-owcdooikeo6ecv23
---
 addons/base_status/base_stage.py    | 2 +-
 addons/crm_helpdesk/crm_helpdesk.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 529e70fdb49..5f9fd57ffe5 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -297,7 +297,7 @@ class base_stage(object):
                 destination=False)
 
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        if 'message_post' in self:
+        if hasattr(self, 'message_post'):
             for case in self.browse(cr, uid, ids, context=context):
                 if destination:
                     recipient_id = case.user_id.partner_id.id
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 612537bdb77..9bd56cf3944 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from base_status.base_state import base_state
+from base_status.base_stage import base_stage
 from crm import crm
 from osv import fields, osv
 import tools
@@ -31,7 +32,7 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_helpdesk(base_state, osv.osv):
+class crm_helpdesk(base_state, base_stage, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"

From c4166b869ac223014b1d63f6f15ef3ce6b285871 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 17 Sep 2012 16:05:10 +0530
Subject: [PATCH 018/128] [IMP] product: made little change to get proper view

bzr revid: cha@tinyerp.com-20120917103510-crlrfrqo2rem5izd
---
 addons/product/product_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 13474351744..fc511d20a62 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -447,9 +447,9 @@
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
                             <field name="rounding"/>
                             <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>

From ba567b3850fc2c9efb876dbe3160d4561d23e64c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 17 Sep 2012 17:01:13 +0530
Subject: [PATCH 019/128] [IMP]purchase : added name field in analytic
 plan,improve string of dashboard and invoice control, make purchase line
 editable when analytic distribution is available, added act_window of create
 invoice for incoming shipment

bzr revid: mma@tinyerp.com-20120917113113-irc6taebmwqrfxys
---
 .../account_analytic_plans.py                 |  1 +
 .../account_analytic_plans_view.xml           |  4 +++
 addons/purchase/purchase.py                   |  2 +-
 addons/purchase/purchase_view.xml             |  2 +-
 .../purchase_analytic_plans_view.xml          | 25 +++++++++++++++++++
 .../board_purchase_view.xml                   |  4 +--
 .../wizard/stock_invoice_onshipping_view.xml  | 10 ++++++++
 7 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 234d6fe0cf8..46a06b45547 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -263,6 +263,7 @@ class account_analytic_plan_instance_line(osv.osv):
     _name = "account.analytic.plan.instance.line"
     _description = "Analytic Instance Line"
     _columns = {
+        'name': fields.char('Plan Name', size=64),
         'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),
         'rate': fields.float('Rate (%)', required=True),
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 76d6aeed7b8..17eb61148b3 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -112,10 +112,12 @@
                 </group>
                 <field name="account_ids">
                     <tree string="Analytic Distribution" editable="bottom">
+                        <field name="name"/>
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </tree>
                     <form string="Analytic Distribution" version="7.0">
+                        <field name="name"/>
                         <field name="rate"/>
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     </form>
@@ -159,6 +161,7 @@
         <field name="arch" type="xml">
             <form string="Analytic Distribution Line" version="7.0">
                 <group col="4">
+                    <field name="name"/>
                     <field name="plan_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="rate"/>
@@ -172,6 +175,7 @@
         <field name="model">account.analytic.plan.instance.line</field>
         <field name="arch" type="xml">
             <tree string="Analytic Distribution Lines">
+                <field name="name"/>
                 <field name="plan_id"/>
                 <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="rate"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1f6279af3ad..90105468dda 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -179,7 +179,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Bases on incoming shipments')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Bases on incoming shipments: let you create an invoice when receptions are validated."
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 53f27245e7e..a46eaf7ab96 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -346,7 +346,7 @@
             <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="context">{'search_default_draft': 1}</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_to_approve': 1}</field>
             <field name="domain">[('state','in',('draft','sent','confirmed'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index d224b9800f7..6feb6d27bf2 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -13,5 +13,30 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="purchase_order_form_analytic_inherit">
+        <field name="name">purchase.order.form.analytic.inherit</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- inherited view to make the purchase order lines list in the form non-editable
+             for the members of some usability groups -->
+    <record id="view_purchase_order_form_editable_list" model="ir.ui.view">
+        <field name="name">purchase.order.form.editable.list</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="groups_id" eval="[(6, 0, [ref('product.group_uom'), ref('purchase.group_analytic_accounting')])]"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+        </field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/purchase_double_validation/board_purchase_view.xml b/addons/purchase_double_validation/board_purchase_view.xml
index 0557963fcb1..c2cc4df88b8 100644
--- a/addons/purchase_double_validation/board_purchase_view.xml
+++ b/addons/purchase_double_validation/board_purchase_view.xml
@@ -3,7 +3,7 @@
     <data>
  
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
+            <field name="name">Purchase Orders Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -17,7 +17,7 @@
             <field name="inherit_id" ref="purchase.board_purchase_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column/action[@string='Request for Quotations']" position="after">
-                    <action name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"/>
+                    <action name="%(purchase_waiting)d" string="Purchase Orders Waiting Approval"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 10d748624fc..4dd139aa40a 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -30,5 +30,15 @@
             view_type="form"
             target="new"
             id="action_stock_invoice_onshipping"/>
+
+        <act_window name="Create invoice"
+            res_model="stock.invoice.onshipping"
+            src_model="stock.picking.in"
+            key2="client_action_multi"
+            multi="True"
+            view_mode="form"
+            view_type="form"
+            target="new"
+            id="action_stock_invoice_onshipping"/>
     </data>
 </openerp>

From e21d8c69685ff69527946855b6a68d73eeda1195 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 17:01:14 +0530
Subject: [PATCH 020/128] [IMP] product : Put Pricelists menu under
 Sales/Configuration/Pricelists.

bzr revid: mdi@tinyerp.com-20120917113114-s81w72chvmh63o1e
---
 addons/product/pricelist_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index dc120660c43..01cb4dc54eb 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -219,7 +219,7 @@
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
-            parent="base.menu_base_config" sequence="20" groups="product.group_sale_pricelist"/>
+            parent="product.menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
 
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>

From 34935043bc8c4e6d5ef0d357ec5f67ae1e8d7e84 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 12:48:15 +0530
Subject: [PATCH 021/128] [IMP] crm : when lead has already a customer assigned
 to it and we click on convert to opp, it should not propose to create new
 customer in that wizard, it should give option 'Link to an Existing Customer'
 with the customer assigned to that lead.

bzr revid: mdi@tinyerp.com-20120918071815-n1x7v0wvaarpyc1r
---
 addons/crm/wizard/crm_lead_to_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index a9e74f306e5..c354c8eccc8 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -60,7 +60,7 @@ class crm_lead2partner(osv.osv_memory):
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
-        if not this.partner_id and this.partner_name:
+        if this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]

From 172c4371e0255f9e5e1cc8848be9421816db10a5 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Tue, 18 Sep 2012 13:01:54 +0530
Subject: [PATCH 022/128] [IMP] sale : payment mode menu moved to leads &
 opportunities configuration

bzr revid: rpr@tinyerp.com-20120918073154-r1ihk9568zywacuq
---
 addons/crm/crm_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 4f4d73d5f43..f13b4934ac0 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -447,12 +447,10 @@
             <field name="view_mode">tree,form</field>
         </record>
         
-        <menuitem id="menu_crm_payment_mode" name="Fund Raising"
-            parent="base.menu_base_config" sequence="85" groups="crm.group_fund_raising"/>
             
         <menuitem action="action_crm_payment_mode"
             id="menu_crm_payment_mode_act"
             name="Payment Modes"
-            parent="menu_crm_payment_mode" />
+            parent="base.menu_crm_config_lead" />
     </data>
 </openerp>

From e88e7b3f2c5f2d9e2ce4f36147764a04b223a0ad Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 14:05:35 +0530
Subject: [PATCH 023/128] [IMP] crm : when selecting a customer, his adress
 appears in the lead view but not the phone & email.

bzr revid: mdi@tinyerp.com-20120918083535-ul2dp0h6rbbj5scv
---
 addons/base_status/base_stage.py | 1 +
 addons/crm/crm_lead.py           | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 5f9fd57ffe5..f6ce6a4d79b 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -92,6 +92,7 @@ class base_stage(object):
         if  part:
             addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        print "----------data---------------------",data
         return {'value': data}
 
     def _get_default_section_id(self, cr, uid, context=None):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index fff47205582..550dc04e6d9 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -300,6 +300,10 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'city' : partner.city,
                 'state_id' : partner.state_id and partner.state_id.id or False,
                 'country_id' : partner.country_id and partner.country_id.id or False,
+                'email_from' : partner.email,
+                'phone' : partner.phone,
+                'mobile' : partner.mobile,
+                'fax' : partner.fax,
             }
         return {'value' : values}
 

From 6c6f9671ce3280e59826dbfd13c08aa699d237fb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 14:13:42 +0530
Subject: [PATCH 024/128] [FIX] crm_profiling : View type 'form' is not
 supported in One2Many.

bzr revid: mdi@tinyerp.com-20120918084342-o6sh8kn8oj755m32
---
 addons/crm_profiling/wizard/open_questionnaire_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 8da8533f494..d51d36425d0 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Open Questionnaire" version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree" width="550" height="200"/>
                     <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or

From dc3907e51471cb1a3e9173a3c1d8e32590d8364e Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 18 Sep 2012 14:24:58 +0530
Subject: [PATCH 025/128] [IMP]project,portal : set appropriate priority on
 kanban and fix the issue of add team member in project

bzr revid: mma@tinyerp.com-20120918085458-dnn1h1nw5sbhq967
---
 addons/portal_project_issue/portal_project_issue_view.xml | 1 +
 addons/project/project_view.xml                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 5d0b4ce081e..b4bff8a158a 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -5,6 +5,7 @@
         <record id="portal_project_issue_kanban_view" model="ir.ui.view">
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_portal_project_issue">
                     <field name="priority"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ff8ac943a67..a5fd28fc06a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -104,7 +104,7 @@
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
-                                <kanban quick_create="true" create="false">
+                                <kanban quick_create="false" create="true">
                                     <field name="name"/>
                                     <templates>
                                         <t t-name="kanban-box">

From 67f1ac5053c4afe72aa7b3ba284cf6ba82575e21 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 16:28:56 +0530
Subject: [PATCH 026/128] [ADD] google_map : Added a functionality to open a
 google map based on partner's address.

bzr revid: mdi@tinyerp.com-20120918105856-gyam9rsxo3jp4okr
---
 addons/google_map/__openerp__.py      |  4 +++-
 addons/google_map/google_map_view.xml | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 addons/google_map/google_map_view.xml

diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index f5577b17994..36a10355990 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -33,7 +33,9 @@ Using this you can directly open Google Map from the URL widget.""",
     'website': 'http://www.openerp.com',
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
-    'data': [],
+    'data': [
+        'google_map_view.xml'
+    ],
     'demo': [],
     'js': ['static/src/js/google_map.js'],
     'installable': True,
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
new file mode 100644
index 00000000000..46cf9d48807
--- /dev/null
+++ b/addons/google_map/google_map_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_partner_google_map_inherit">
+            <field name="name">res.partner.google.map.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="website" position="before">
+                    <label for="open_map" string="Open Google Map"/>
+                    <div>
+                        <button name="open_map"
+                        string="Map" type="object"/>
+                    </div>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+

From f9c2b3796bcd3621f5c4e0a6a23f235c259a2ed7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 16:33:03 +0530
Subject: [PATCH 027/128] [REM] google_map : Removed unneccessary object
 references.

bzr revid: mdi@tinyerp.com-20120918110303-d72pun3jc7hq0ski
---
 addons/google_map/google_map_launch.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
index 8ee9a16fb0a..1298fac7e6f 100644
--- a/addons/google_map/google_map_launch.py
+++ b/addons/google_map/google_map_launch.py
@@ -25,8 +25,7 @@ class launch_map(osv.osv):
     _inherit = "res.partner"
 
     def open_map(self, cr, uid, ids, context=None):
-        address_obj= self.pool.get('res.partner')
-        partner = address_obj.browse(cr, uid, ids, context=context)[0]
+        partner = self.browse(cr, uid, ids, context=context)[0]
         url="http://maps.google.com/maps?oi=map&q="
         if partner.street:
             url+=partner.street.replace(' ','+')

From db39306c85cdf5e209529685390fa674548b30fc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 16:49:29 +0530
Subject: [PATCH 028/128] [IMP] google_map : Improved the identation.

bzr revid: mdi@tinyerp.com-20120918111929-m90m7fy6gqwi3380
---
 addons/google_map/google_map_launch.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
index 1298fac7e6f..f3ac20ac734 100644
--- a/addons/google_map/google_map_launch.py
+++ b/addons/google_map/google_map_launch.py
@@ -38,9 +38,9 @@ class launch_map(osv.osv):
         if partner.zip:
             url+='+'+partner.zip.replace(' ','+')
         return {
-        'type': 'ir.actions.act_url',
-        'url':url,
-        'target': 'new'
+            'type': 'ir.actions.act_url',
+            'url':url,
+            'target': 'new'
         }
 
 launch_map()

From 573cad0c9f0447442cae68778d043dc0a79070e5 Mon Sep 17 00:00:00 2001
From: Amit Patel <apa@tinyerp.com>
Date: Tue, 18 Sep 2012 16:55:03 +0530
Subject: [PATCH 029/128] [IMP]:demo and data for product category

bzr revid: apa@tinyerp.com-20120918112503-q82c8ry6omoj8uyq
---
 addons/product/product_data.xml | 6 +++++-
 addons/product/product_demo.xml | 6 +-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 5ae76a87695..9808fa732e9 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -7,7 +7,11 @@
         <record id="product_category_all" model="product.category">
             <field name="name">All products</field>
         </record>
-
+        <record id="product_category_1" model="product.category">
+            <field name="parent_id" ref="product_category_all"/>
+            <field name="name">Saleable</field>
+        </record>
+        
         <record id="product_uom_categ_unit" model="product.uom.categ">
             <field name="name">Unit</field>
         </record>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 97d6e03205c..6676a79dfe6 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -9,11 +9,7 @@
         <!--
     Resource: product.category
     -->
-
-        <record id="product_category_1" model="product.category">
-            <field name="parent_id" ref="product.product_category_all"/>
-            <field name="name">Saleable</field>
-        </record>
+ 
         <record id="product_category_2" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Internal</field>

From dc00c1ea7892a4baf24a38a021a5defb64888c49 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 18 Sep 2012 16:57:52 +0530
Subject: [PATCH 030/128] [IMP] stock: solved issue of return shipment

bzr revid: cha@tinyerp.com-20120918112752-8uxqchz0dxjt6vhj
---
 addons/stock/wizard/stock_return_picking.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index bc4cf652cdb..22bee56903e 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -72,9 +72,10 @@ class stock_return_picking(osv.osv_memory):
                     res.update({'invoice_state': 'none'})
             return_history = self.get_return_history(cr, uid, record_id, context)       
             for line in pick.move_lines:
-                qty = line.product_qty - return_history[line.id]
-                if qty > 0:
-                    result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
+                if (return_history.get(line.id) is not None) and (line.product_qty * line.product_uom.factor > return_history[line.id]):
+                    qty = line.product_qty - return_history[line.id]
+                    if qty > 0:
+                        result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
             if 'product_return_moves' in fields:
                 res.update({'product_return_moves': result1})
         return res

From c3a5df8eacd4a8c270bf096ec3bb45a30c9352bd Mon Sep 17 00:00:00 2001
From: Amit Patel <apa@tinyerp.com>
Date: Tue, 18 Sep 2012 16:59:41 +0530
Subject: [PATCH 031/128] [IMP]:improved code

bzr revid: apa@tinyerp.com-20120918112941-7k31spiybf37ulb1
---
 addons/product/product_demo.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 6676a79dfe6..66b86fc7b63 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -19,27 +19,27 @@
             <field name="name">Other Products</field>
         </record>
         <record id="product_category_4" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Computers</field>
         </record>
         <record id="product_category_5" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Services</field>
         </record>
         <record id="product_category_6" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">External Devices</field>
         </record>
         <record id="product_category_7" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Accessories</field>
         </record>
         <record id="product_category_8" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Components</field>
         </record>
         <record id="product_category_9" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Softwares</field>
         </record>
         <record id="product_category_10" model="product.category">

From 7eeeb908396b7c58073c4e723f54f5ea43205d40 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 17:19:12 +0530
Subject: [PATCH 032/128] [IMP] base_status : Removed the print statement.

bzr revid: mdi@tinyerp.com-20120918114912-4o119iwbkojdgl94
---
 addons/base_status/base_stage.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index f6ce6a4d79b..5f9fd57ffe5 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -92,7 +92,6 @@ class base_stage(object):
         if  part:
             addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        print "----------data---------------------",data
         return {'value': data}
 
     def _get_default_section_id(self, cr, uid, context=None):

From 4715e84fc385febf1b5a9993dafd12b55465f098 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 18 Sep 2012 17:52:36 +0530
Subject: [PATCH 033/128] [IMP]warning : fix the issue of product on change and
  add a warning for picking.in and picking.out method

bzr revid: mma@tinyerp.com-20120918122236-ii8umd942sp3b1o5
---
 addons/warning/warning.py | 66 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 62 insertions(+), 4 deletions(-)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index f04f97d6f8a..00e56de8eca 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -174,6 +174,64 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+# FIXME:(class stock_picking_in and stock_picking_out) this is a temporary workaround because of a framework bug (ref: lp:996816). 
+# It should be removed as soon as the bug is fixed
+class stock_picking_in(osv.osv):
+    _inherit = 'stock.picking.in'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
+stock_picking_in()
+
+class stock_picking_out(osv.osv):
+    _inherit = 'stock.picking.out'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
+stock_picking_out()
+
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
@@ -228,8 +286,8 @@ sale_order_line()
 
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
-    def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+    def onchange_product_id(self,cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
@@ -247,8 +305,8 @@ class purchase_order_line(osv.osv):
             warning['title'] = title
             warning['message'] = message
 
-        result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order, fiscal_position)
+        result =  super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order, fiscal_position_id)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']

From 87ae883d52fbb53515c2258b5dba31df396d9e20 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 19 Sep 2012 11:19:33 +0530
Subject: [PATCH 034/128] [IMP]purchase_requisition : remove dependency mrp
 from purchase_requisition

bzr revid: mma@tinyerp.com-20120919054933-lw5myhphzix1qt3j
---
 addons/purchase_requisition/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index f2492b207c0..30af4699c48 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -32,7 +32,7 @@ When a purchase order is created, you now have the opportunity to save the
 related requisition. This new object will regroup and will allow you to easily
 keep track and order all your purchase orders.
 """,
-    'depends' : ['purchase','mrp'],
+    'depends' : ['purchase'],
     'demo': ['purchase_requisition_demo.xml'],
     'data': ['security/purchase_tender.xml',
               'wizard/purchase_requisition_partner_view.xml',

From 527e1558c935450229456f438c7d7befba3f0be6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 19 Sep 2012 15:17:51 +0530
Subject: [PATCH 035/128] [ADD] product : Added a constraint to check Minimum
 Margin must be lower than Maximum Margin.

bzr revid: mdi@tinyerp.com-20120919094751-3pjr3h9cuar3wgh5
---
 addons/product/pricelist.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index c333000621a..7af572bf411 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -423,6 +423,9 @@ class product_pricelist_item(osv.osv):
             readonly=True, relation='res.company', string='Company', store=True)
     }
 
+    _sql_constraints = [
+        ('check_margin', 'CHECK (price_min_margin <= price_max_margin)', 'Minimum Margin must be lower than Maximum Margin !'),
+    ]
     _constraints = [
         (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
     ]

From c31eb654b2efa794a233b84301bc99fdaced15b0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 19 Sep 2012 16:35:40 +0530
Subject: [PATCH 036/128] [ADD] Added a tooltip for pricelist rule.

bzr revid: mdi@tinyerp.com-20120919110540-w4jdpozlsk173gv3
---
 addons/product/pricelist.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 7af572bf411..9b37dc0fe07 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -401,13 +401,13 @@ class product_pricelist_item(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
         'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
 
-        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
+        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells quantity equal to or more than this quantity set."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
         'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add(or substract, if negative) to the amount calculated with the discount.'),
         'price_discount': fields.float('Price Discount', digits=(16,4)),
         'price_round': fields.float('Price Rounding',
             digits_compute= dp.get_precision('Product Price'),
@@ -416,9 +416,9 @@ class product_pricelist_item(osv.osv):
               "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
             ),
         'price_min_margin': fields.float('Min. Price Margin',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the minimum amount of margin over the base price.'),
         'price_max_margin': fields.float('Max. Price Margin',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the maximum amount of margin over the base price.'),
         'company_id': fields.related('price_version_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }

From 728383c97a5baa388ea27363dbb0552d0c56275a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 19 Sep 2012 17:11:52 +0530
Subject: [PATCH 037/128] [IMP]stock : improve typo

bzr revid: mma@tinyerp.com-20120919114152-8yvsserlmzjtnm9e
---
 addons/stock/wizard/stock_invoice_onshipping_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 4dd139aa40a..423a1fc29e8 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -21,7 +21,7 @@
         </record>
 
 
-        <act_window name="Create invoice"
+        <act_window name="Create Invoice"
             res_model="stock.invoice.onshipping"
             src_model="stock.picking.out"
             key2="client_action_multi"
@@ -31,7 +31,7 @@
             target="new"
             id="action_stock_invoice_onshipping"/>
 
-        <act_window name="Create invoice"
+        <act_window name="Create Invoice"
             res_model="stock.invoice.onshipping"
             src_model="stock.picking.in"
             key2="client_action_multi"

From 05c9def924282ed828e600e58c5576ac664b77b3 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Wed, 19 Sep 2012 17:38:18 +0530
Subject: [PATCH 038/128] [IMP] stock: improve helptext for field
 'stock_available'

bzr revid: cha@tinyerp.com-20120919120818-aejvs1qdn68tcoiq
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9cdbc97c115..8fa28f42ee4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1485,7 +1485,7 @@ class stock_production_lot(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'date': fields.datetime('Creation Date', required=True),
         'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
-            help="Current quantity of products with this Production Lot Number available in company warehouses",
+            help="Current quantity of products with this Serial Number available in company warehouses",
             digits_compute=dp.get_precision('Product Unit of Measure')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),

From 2218b02926142ab97dab4f8aeaeebc53a3d3d88e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 19 Sep 2012 18:43:05 +0530
Subject: [PATCH 039/128] [FIX] product : Improved the test cases.

bzr revid: mdi@tinyerp.com-20120919131305-gyn847qpagdujq0h
---
 addons/product/product_pricelist_demo.yml | 2 +-
 addons/product/test/product_pricelist.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml
index 39f6cfc16b2..efb812ad5e2 100644
--- a/addons/product/product_pricelist_demo.yml
+++ b/addons/product/product_pricelist_demo.yml
@@ -47,7 +47,7 @@
             - name: 20% Discount given by my supplier
               sequence: 1
               price_min_margin: 2
-              price_max_margin: -5
+              price_max_margin: 5
               product_id: product_product_6
               base: -2
 -
diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml
index 85230261312..66e256d4cd1 100644
--- a/addons/product/test/product_pricelist.yml
+++ b/addons/product/test/product_pricelist.yml
@@ -49,14 +49,14 @@
   !python {model: product.product}: |
     context.update({'quantity':1, 'date': False, 'partner': ref('base.res_partner_4'), 'pricelist': ref("supplier_pricelist")})
     product = self.browse(cr, uid, ref("product_product_6"), context=context)
-    assert product.price == 785, "cost price is not correspond."
+    assert product.price == 792, "cost price is not correspond."
 -
   I check cost price of LCD Monitor if more than 3 Unit.
 -
   !python {model: product.product}: |
     context.update({'quantity':3})
     product = self.browse(cr, uid, ref("product_product_6"), context=context)
-    assert product.price == 780, "cost price is not correspond."
+    assert product.price == 787, "cost price is not correspond."
 
 -
  I print the sale prices report.

From 3c084ff4aa99b95601419912a94cbc772e9985ee Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 11:58:21 +0530
Subject: [PATCH 040/128] [IMP] stock: solve the issue of getting state as
 delivered

bzr revid: cha@tinyerp.com-20120921062821-jhzcvnz3k44hjs54
---
 addons/stock/stock.py       | 13 +++++++++++--
 addons/stock/stock_view.xml |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 30bd70b9728..2d3acaae0e7 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -761,6 +761,15 @@ class stock_picking(osv.osv):
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
         return True
+    
+    def button_cancel(self, cr, uid, ids, *args):
+        """ Changes state of picking to cancel.
+        @return: True
+        """
+        wf_service = netsvc.LocalService("workflow")
+        for pick in self.browse(cr, uid, ids):
+            wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+        return True
 
     def draft_force_assign(self, cr, uid, ids, *args):
         """ Confirms picking directly from draft state.
@@ -1141,7 +1150,7 @@ class stock_picking(osv.osv):
             for move in pick.move_lines:
                 if move.state not in ('cancel','done'):
                     return False
-                if move.state=='done':
+                if move.state=='done' and not move.scrapped:
                     ok = True
         return ok
 
@@ -1160,7 +1169,7 @@ class stock_picking(osv.osv):
             if not pick.move_lines:
                 return True
             for move in pick.move_lines:
-                if move.state == 'done':
+                if move.state == 'done' and not move.scrapped:
                     raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
         return True
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 83fed186f42..411c57aeede 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -754,7 +754,7 @@
                         <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
                         <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
                         <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
-                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                        <button name="button_cancel" type="object" states="assigned,confirmed,draft" string="_Cancel"/>
                     </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>

From 258d72812e8a6b02d7bb4968f52c33d036b42ef6 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 21 Sep 2012 12:10:59 +0530
Subject: [PATCH 041/128] [IMP] Event : Traceback removed of confirm event
 button while moodle installed

bzr revid: rpr@tinyerp.com-20120921064059-g16iuqs0jfy79f5q
---
 addons/event_moodle/event_moodle.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index 19e763e91b0..f36b1cd2d62 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -101,6 +101,8 @@ class event_moodle(osv.osv):
         """
         #connect to moodle
         url = self.browse(cr, uid, id, context=context).url
+        if not url:
+            raise osv.except_osv(('Error!'),("First configure your moodle connection."))
         sock = xmlrpclib.ServerProxy(url)
         return sock.core_course_create_courses(courses)
 

From ab6d0e8b1f3535088b6ed03c7e51793747926344 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 21 Sep 2012 12:48:18 +0530
Subject: [PATCH 042/128] [IMP] HR : background image class added and personal
 message modified

bzr revid: rpr@tinyerp.com-20120921071818-f15mh3d8p0roj019
---
 addons/hr/board_hr_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 06f66054254..84db6128f41 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -23,9 +23,9 @@
         <field name="usage">menu</field>
         <field name="view_id" ref="board_hr_form"/>
             <field name="help" type="html">
-              <div>
+              <div class="oe_empty_custom_dashboard">
                   <p>
-                    <b>Your personal dashboard is empty.</b>
+                    <b>Human Resources dashboard is empty.</b>
                   </p><p>
                     To add your first report into this dashboard, go to any
                     menu, switch to list or graph view, and click <i>'Add to

From 8ec05330975d0796c525fdc0d845a29ac3e867ec Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 21 Sep 2012 14:27:34 +0530
Subject: [PATCH 043/128] [IMP] base_calendar : Hide the 'remainder' field from
 Meeting and Event Form View.

bzr revid: mdi@tinyerp.com-20120921085734-iijxvz7pg65f2rbc
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 addons/base_calendar/crm_meeting_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d374c2e6d88..285898f299a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -207,7 +207,7 @@
                             on_change="onchange_dates(date,False,date_deadline)"/>
                         <field name="location"/>
                         <field name="alarm_id" string="Reminder"
-                            widget="selection"/>
+                            widget="selection" invisible="1"/>
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>
                         </group>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b963de68130..29cf0d29576 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -116,7 +116,7 @@
                                         attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
                             </group>
                             <group>
-                                <field name="alarm_id" widget="selection" />
+                                <field name="alarm_id" widget="selection" invisible="1"/>
                                 <field name="class"/>
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>

From 779b1aea56f64cc5a7b6f7b5eabd979e54f843bf Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 21 Sep 2012 14:41:16 +0530
Subject: [PATCH 044/128] [IMP] base_calendar : Unhide the 'remainder' field
 from Event Form View.

bzr revid: mdi@tinyerp.com-20120921091116-3hedoofp7p3w7bvy
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 285898f299a..d374c2e6d88 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -207,7 +207,7 @@
                             on_change="onchange_dates(date,False,date_deadline)"/>
                         <field name="location"/>
                         <field name="alarm_id" string="Reminder"
-                            widget="selection" invisible="1"/>
+                            widget="selection"/>
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>
                         </group>

From 2ad80397112d5fb8187fc3159434f4e8e52983b9 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 15:38:50 +0530
Subject: [PATCH 045/128] [IMP] stock: update warning message for serial number

bzr revid: cha@tinyerp.com-20120921100850-bvrgytvux9650tzp
---
 addons/stock/stock.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bbda0f468ca..c76c3dc5f67 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1836,8 +1836,8 @@ class stock_move(osv.osv):
         warning = {}
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
-                'title': _('Insufficient Stock in Serial Number !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available in this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
+                'title': _('Insufficient Stock for Serial Number !'),
+                'message': _('You are moving %.2f %s products but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 

From 47791d5c37ac6324937ce141160d3bd3f6b1b797 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 21 Sep 2012 16:30:47 +0530
Subject: [PATCH 046/128] [IMP]open right view on click of back order of
 stock.picking

bzr revid: sgo@tinyerp.com-20120921110047-zv86z0bfjf44bg9z
---
 addons/stock/stock.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 89cb3d1f647..e2f0d1baf05 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -709,6 +709,15 @@ class stock_picking(osv.osv):
             for move in picking_obj.move_lines:
                 move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False, 'move_history_ids2': [(6, 0, [])], 'move_history_ids': [(6, 0, [])]})
         return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if view_type =='form':
+            mod_obj = self.pool.get('ir.model.data')
+            if self._name == "stock.picking.in":
+                model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+            if self._name == "stock.picking.out":
+                model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
+        return super(stock_picking,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
     def onchange_partner_in(self, cr, uid, context=None, partner_id=None):
         return {}
@@ -2939,6 +2948,7 @@ class stock_picking_in(osv.osv):
         return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
 
     _columns = {
+        'backorder_id': fields.many2one('stock.picking.in', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),
@@ -2983,6 +2993,7 @@ class stock_picking_out(osv.osv):
         return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
 
     _columns = {
+        'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),

From f59b82e4cf0a4f264535b39e5e5059f63c203aa4 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 21 Sep 2012 17:11:03 +0530
Subject: [PATCH 047/128] [IMP] purchase : add a label on cr_ids and dr_ids

bzr revid: mma@tinyerp.com-20120921114103-rv5w09nx9z72v21r
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index c41ed6d5577..6daa930ff50 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -71,6 +71,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
+                        	<label for="line_dr_ids"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -84,6 +85,7 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
+                            <label for="line_cr_ids"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -155,6 +157,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
+                        	<label for="line_dr_ids"/>
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -170,6 +173,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
+                            <label for="line_cr_ids"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -328,6 +332,7 @@
 
                     <notebook>
                         <page string="Payment Information" groups="base.group_user">
+                        	<label for="line_cr_ids"/>
                             <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -344,6 +349,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
+                            <label for="line_dr_ids"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"

From 434e4ad7c22681440fbd002bb235343eac78cb80 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 21 Sep 2012 17:16:00 +0530
Subject: [PATCH 048/128] [IMP]improvement

bzr revid: sgo@tinyerp.com-20120921114600-a4t3hnc1hjhcawob
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e2f0d1baf05..98ae0ce8961 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -711,7 +711,7 @@ class stock_picking(osv.osv):
         return res
     
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
-        if view_type =='form':
+        if view_type == 'form' and not view_id:
             mod_obj = self.pool.get('ir.model.data')
             if self._name == "stock.picking.in":
                 model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')

From 694743bbf3d1106f2978af399f74df1ea17b1dad Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 18:17:34 +0530
Subject: [PATCH 049/128] [IMP] stock: made changes to do auto cancel

bzr revid: cha@tinyerp.com-20120921124734-9x0m4dtkv08jsw37
---
 addons/stock/stock.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c76c3dc5f67..03d8a802f4f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1160,6 +1160,8 @@ class stock_picking(osv.osv):
         """
         for pick in self.browse(cr, uid, ids, context=context):
             for move in pick.move_lines:
+                if move.state == 'done' and move.scrapped:
+                    return True
                 if move.state not in ('cancel',):
                     return False
         return True
@@ -2205,7 +2207,7 @@ class stock_move(osv.osv):
         self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False})
         if not context.get('call_unlink',False):
             for pick in self.pool.get('stock.picking').browse(cr, uid, list(pickings), context=context):
-                if all(move.state == 'cancel' for move in pick.move_lines):
+                if all(move.state == 'cancel' or move.scrapped for move in pick.move_lines):
                     self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'})
 
         wf_service = netsvc.LocalService("workflow")

From 6e148eb8356934c9981f3117e010385935699fdb Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 21 Sep 2012 18:46:25 +0530
Subject: [PATCH 050/128] [IMP] HR : solved the issue of warning to related
 user field

bzr revid: rpr@tinyerp.com-20120921131625-yj4jkwlbcdkuivka
---
 addons/hr/hr_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5d4c2ae9d45..e98ce8b2389 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -48,7 +48,7 @@
                                     </group>
                                     <group>
                                         <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                        <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
+                                        <field name="user_id" widget="selection" on_change="onchange_user(user_id)" string="Related User"/>
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
                                     </group>
                                 </group>

From e28904b96fd226ef45bc19f59b0de2c3637c5c67 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 21 Sep 2012 18:54:31 +0530
Subject: [PATCH 051/128] [IMP] stock: solve the issue of openchatter for
 Incoming shipment, delivery order

bzr revid: cha@tinyerp.com-20120921132431-p5jv6tdfi5lug584
---
 addons/stock/stock.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 30bd70b9728..295cee2c583 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -723,6 +723,8 @@ class stock_picking(osv.osv):
         self.write(cr, uid, ids, {'state': 'confirmed'})
         todo = []
         for picking in self.browse(cr, uid, ids, context=context):
+            if picking.state == 'confirmed':
+                self.confirm_send_note(cr, uid, ids, context=context)
             for r in picking.move_lines:
                 if r.state == 'draft':
                     todo.append(r.id)
@@ -1376,6 +1378,12 @@ class stock_picking(osv.osv):
     # OpenChatter methods and notifications
     # -----------------------------------------
 
+    def _get_thread_model(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            if obj.type in ('out', 'in'):
+                context.update({'thread_model': 'stock.picking.' + obj.type})
+        return True
+
     def _get_document_type(self, type):
         type_dict = {
                 'out': 'Delivery order',
@@ -1385,13 +1393,25 @@ class stock_picking(osv.osv):
         return type_dict.get(type, 'Stock picking')
 
     def create_send_note(self, cr, uid, ids, context=None):
+        context = context or {}
+        self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
+    def confirm_send_note(self, cr, uid, ids, context=None):
+        context = context or {}
+        self._get_thread_model(cr, uid, ids, context=context)
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>confirmed</b>.") % (self._get_document_type(obj.type)), context=context)
+
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
+        context = context or {}
+        self._get_thread_model(cr, uid, ids, context=context)
         return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
 
     def back_order_send_note(self, cr, uid, ids, back_name, context=None):
+        context = context or {}
+        self._get_thread_model(cr, uid, ids, context=context)
         return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
 
     def ship_done_send_note(self, cr, uid, ids, context=None):
@@ -1400,10 +1420,14 @@ class stock_picking(osv.osv):
                 'in': 'received',
                 'internal': 'moved',
         }
+        context = context or {}
+        self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
+        context = context or {}
+        self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
 

From 34326cebfcccee169a500865e5dc91c8fc82054a Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Fri, 21 Sep 2012 19:07:04 +0530
Subject: [PATCH 052/128] [IMP] purchase : add a label on cr_ids and dr_ids
 improve with attrs

bzr revid: mma@tinyerp.com-20120921133704-l1v2t311ozzrna8u
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 6daa930ff50..65bcdad8a9b 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -71,7 +71,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
-                        	<label for="line_dr_ids"/>
+                        	<label for="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -85,7 +85,7 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
-                            <label for="line_cr_ids"/>
+                            <label for="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -173,7 +173,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
-                            <label for="line_cr_ids"/>
+                            <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -349,7 +349,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
-                            <label for="line_dr_ids"/>
+                            <label for="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"

From 4679680dba42a4071c8fbbc43a33e2e61bdb812e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 22 Sep 2012 12:51:07 +0200
Subject: [PATCH 053/128] manual merge of multicorn

bzr revid: al@openerp.com-20120922105107-q02ogtsfudphzkl6
---
 gunicorn.conf.py                              |  63 ---
 openerp-server                                |  26 +-
 openerp-wsgi.py                               |  53 +++
 openerp/__init__.py                           |  12 +-
 openerp/addons/base/ir/ir_cron.py             |  99 +++++
 openerp/db/__init__.py                        |  30 --
 openerp/service/__init__.py                   |  45 ++-
 openerp/service/netrpc_server.py              |   4 +-
 .../netrpc_socket.py}                         |   5 +-
 openerp/service/workers.py                    | 368 ++++++++++++++++++
 .../{wsgi/core.py => service/wsgi_server.py}  | 131 +------
 openerp/tools/config.py                       |  47 +--
 openerp/wsgi/__init__.py                      |  33 --
 openerp/wsgi/proxied.py                       |  34 --
 14 files changed, 618 insertions(+), 332 deletions(-)
 delete mode 100644 gunicorn.conf.py
 create mode 100644 openerp-wsgi.py
 delete mode 100644 openerp/db/__init__.py
 rename openerp/{tiny_socket.py => service/netrpc_socket.py} (98%)
 create mode 100644 openerp/service/workers.py
 rename openerp/{wsgi/core.py => service/wsgi_server.py} (79%)
 delete mode 100644 openerp/wsgi/__init__.py
 delete mode 100644 openerp/wsgi/proxied.py

diff --git a/gunicorn.conf.py b/gunicorn.conf.py
deleted file mode 100644
index 0f1d93a8638..00000000000
--- a/gunicorn.conf.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Gunicorn sample configuration file.
-# See http://gunicorn.org/configure.html for more details.
-#
-# To run the OpenERP server via Gunicorn, change the appropriate
-# settings below, in order to provide the parameters that
-# would normally be passed in the command-line,
-# (at least `bind` and `conf['addons_path']`), then execute:
-#   $ gunicorn openerp:wsgi.core.application -c gunicorn.conf.py
-# or if you want to run it behind a reverse proxy, add the line
-#   import openerp.wsgi.proxied
-# in this file and execute:
-#   $ gunicorn openerp:wsgi.proxied.application -c gunicorn.conf.py
-
-import openerp
-
-# Standard OpenERP XML-RPC port is 8069
-bind = '127.0.0.1:8069'
-
-pidfile = '.gunicorn.pid'
-
-# Gunicorn recommends 2-4 x number_of_cpu_cores, but
-# you'll want to vary this a bit to find the best for your
-# particular work load.
-workers = 4
-
-# Some application-wide initialization is needed.
-on_starting = openerp.wsgi.core.on_starting
-when_ready = openerp.wsgi.core.when_ready
-pre_request = openerp.wsgi.core.pre_request
-post_request = openerp.wsgi.core.post_request
-
-# openerp request-response cycle can be quite long for
-# big reports for example
-timeout = 240
-
-max_requests = 2000
-
-# Equivalent of --load command-line option
-openerp.conf.server_wide_modules = ['web']
-
-# internal TODO: use openerp.conf.xxx when available
-conf = openerp.tools.config
-
-# Path to the OpenERP Addons repository (comma-separated for
-# multiple locations)
-conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons'
-
-# Optional database config if not using local socket
-#conf['db_name'] = 'mycompany'
-#conf['db_host'] = 'localhost'
-#conf['db_user'] = 'foo'
-#conf['db_port'] = 5432
-#conf['db_password'] = 'secret'
-
-# OpenERP Log Level
-# DEBUG=10, DEBUG_RPC=8, DEBUG_RPC_ANSWER=6, DEBUG_SQL=5, INFO=20,
-# WARNING=30, ERROR=40, CRITICAL=50
-# conf['log_level'] = 20
-
-# If --static-http-enable is used, path for the static web directory
-#conf['static_http_document_root'] = '/var/www'
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp-server b/openerp-server
index 5d717c834de..5222de88eb4 100755
--- a/openerp-server
+++ b/openerp-server
@@ -110,7 +110,6 @@ def run_test_file(dbname, test_file):
     except Exception:
         _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)
 
-
 def export_translation():
     config = openerp.tools.config
     dbname = config['db_name']
@@ -205,6 +204,7 @@ def quit_on_signals():
     except KeyboardInterrupt:
         pass
 
+    config = openerp.tools.config
     if config['pidfile']:
         os.unlink(config['pidfile'])
 
@@ -217,8 +217,7 @@ def configure_babel_localedata_path():
         import babel
         babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
 
-if __name__ == "__main__":
-
+def main():
     os.environ["TZ"] = "UTC"
 
     check_root_user()
@@ -247,20 +246,13 @@ if __name__ == "__main__":
         sys.exit(0)
 
     if not config["stop_after_init"]:
+        setup_pid_file()
         # Some module register themselves when they are loaded so we need the
         # services to be running before loading any registry.
-        openerp.service.start_services()
-
-    for m in openerp.conf.server_wide_modules:
-        try:
-            openerp.modules.module.load_openerp_module(m)
-        except Exception:
-            msg = ''
-            if m == 'web':
-                msg = """
-The `web` module is provided by the addons found in the `openerp-web` project.
-Maybe you forgot to add those addons in your addons_path configuration."""
-            _logger.exception('Failed to load server-wide module `%s`.%s', m, msg)
+        if config['workers']:
+            openerp.service.start_services_workers()
+        else:
+            openerp.service.start_services()
 
     if config['db_name']:
         for dbname in config['db_name'].split(','):
@@ -269,8 +261,10 @@ Maybe you forgot to add those addons in your addons_path configuration."""
     if config["stop_after_init"]:
         sys.exit(0)
 
-    setup_pid_file()
     _logger.info('OpenERP server is running, waiting for connections...')
     quit_on_signals()
 
+if __name__ == "__main__":
+    main()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp-wsgi.py b/openerp-wsgi.py
new file mode 100644
index 00000000000..7382b90d3b7
--- /dev/null
+++ b/openerp-wsgi.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+# WSGI Handler sample configuration file.
+#
+# Change the appropriate settings below, in order to provide the parameters
+# that would normally be passed in the command-line.
+# (at least conf['addons_path'])
+#
+# For generic wsgi handlers a global application is defined.
+# For uwsgi this should work:
+#   $ uwsgi --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
+#
+# For gunicorn additional globals need to be defined in the Gunicorn section.
+# Then the following command should run:
+#   $ gunicorn openerp:wsgi.core.application -c gunicorn.conf.py
+
+import openerp
+
+#----------------------------------------------------------
+# Common
+#----------------------------------------------------------
+# Equivalent of --load command-line option
+openerp.conf.server_wide_modules = ['web']
+conf = openerp.tools.config
+
+# Path to the OpenERP Addons repository (comma-separated for
+# multiple locations)
+conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons'
+conf['addons_path'] = '/home/wis/stuff/version/openerp/source/addons/6.1,/home/wis/stuff/version/openerp/source/web/6.1/addons'
+
+
+# Optional database config if not using local socket
+#conf['db_name'] = 'mycompany'
+#conf['db_host'] = 'localhost'
+#conf['db_user'] = 'foo'
+#conf['db_port'] = 5432
+#conf['db_password'] = 'secret'
+
+#----------------------------------------------------------
+# Generic WSGI handlers application
+#----------------------------------------------------------
+application = openerp.service.wsgi_server.application
+
+#----------------------------------------------------------
+# Gunicorn
+#----------------------------------------------------------
+# Standard OpenERP XML-RPC port is 8069
+bind = '127.0.0.1:8069'
+pidfile = '.gunicorn.pid'
+workers = 4
+timeout = 240
+max_requests = 2000
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/__init__.py b/openerp/__init__.py
index 5827b744cf8..2fd2a9812f9 100644
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -38,11 +38,19 @@ import run_tests
 import service
 import sql_db
 import test
-import tiny_socket
 import tools
 import wizard
 import workflow
-import wsgi
+# backward compatilbility
+# TODO: This is for the web addons, can be removed later.
+wsgi = service
+wsgi.register_wsgi_handler = wsgi.wsgi_server.register_wsgi_handler
+# Is the server running in multi-process mode (e.g. behind Gunicorn).
+# If this is True, the processes have to communicate some events,
+# e.g. database update or cache invalidation. Each process has also
+# its own copy of the data structure and we don't need to care about
+# locks between threads.
+multi_process = True
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index 3c437c93282..dbc89278ece 100644
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -266,6 +266,105 @@ class ir_cron(osv.osv):
             cr.commit()
             cr.close()
 
+    def _process_job(self, cr, job):
+        """ Run a given job taking care of the repetition.
+
+        The cursor has a lock on the job (aquired by _acquire_job()).
+
+        :param job: job to be run (as a dictionary).
+        """
+        try:
+            now = datetime.now() 
+            nextcall = datetime.strptime(job['nextcall'], DEFAULT_SERVER_DATETIME_FORMAT)
+            numbercall = job['numbercall']
+
+            ok = False
+            while nextcall < now and numbercall:
+                if numbercall > 0:
+                    numbercall -= 1
+                if not ok or job['doall']:
+                    self._callback(cr, job['user_id'], job['model'], job['function'], job['args'], job['id'])
+                if numbercall:
+                    nextcall += _intervalTypes[job['interval_type']](job['interval_number'])
+                ok = True
+            addsql = ''
+            if not numbercall:
+                addsql = ', active=False'
+            cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
+                       (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
+
+        finally:
+            cr.commit()
+            cr.close()
+
+    @classmethod
+    def _acquire_job(cls, db_name):
+        # TODO remove 'check' argument from addons/base_action_rule/base_action_rule.py
+        """ Try to process one cron job.
+
+        This selects in database all the jobs that should be processed. It then
+        tries to lock each of them and, if it succeeds, run the cron job (if it
+        doesn't succeed, it means the job was already locked to be taken care
+        of by another thread) and return.
+
+        If a job was processed, returns True, otherwise returns False.
+        """
+        db = openerp.sql_db.db_connect(db_name)
+        cr = db.cursor()
+        try:
+            # Careful to compare timestamps with 'UTC' - everything is UTC as of v6.1.
+            cr.execute("""SELECT * FROM ir_cron
+                          WHERE numbercall != 0
+                              AND active AND nextcall <= (now() at time zone 'UTC')
+                          ORDER BY priority""")
+            for job in cr.dictfetchall():
+                task_cr = db.cursor()
+                try:
+                    # Try to grab an exclusive lock on the job row from within the task transaction
+                    acquired_lock = False
+                    task_cr.execute("""SELECT *
+                                       FROM ir_cron
+                                       WHERE id=%s
+                                       FOR UPDATE NOWAIT""",
+                                   (job['id'],), log_exceptions=False)
+                    acquired_lock = True
+                except psycopg2.OperationalError, e:
+                    if e.pgcode == '55P03':
+                        # Class 55: Object not in prerequisite state; 55P03: lock_not_available
+                        _logger.debug('Another process/thread is already busy executing job `%s`, skipping it.', job['name'])
+                        continue
+                    else:
+                        # Unexpected OperationalError
+                        raise
+                finally:
+                    if not acquired_lock:
+                        # we're exiting due to an exception while acquiring the lot
+                        task_cr.close()
+
+                # Got the lock on the job row, run its code
+                _logger.debug('Starting job `%s`.', job['name'])
+                openerp.modules.registry.RegistryManager.check_registry_signaling(db_name)
+                registry = openerp.pooler.get_pool(db_name)
+                registry[cls._name]._process_job(task_cr, job)
+                openerp.modules.registry.RegistryManager.signal_caches_change(db_name)
+                return True
+
+        except psycopg2.ProgrammingError, e:
+            if e.pgcode == '42P01':
+                # Class 42 — Syntax Error or Access Rule Violation; 42P01: undefined_table
+                # The table ir_cron does not exist; this is probably not an OpenERP database.
+                _logger.warning('Tried to poll an undefined table on database %s.', db_name)
+            else:
+                raise
+        except Exception, ex:
+            _logger.warning('Exception in cron:', exc_info=True)
+
+        finally:
+            cr.commit()
+            cr.close()
+
+        return False
+
     def update_running_cron(self, cr):
         """ Schedule as soon as possible a wake-up for this database. """
         # Verify whether the server is already started and thus whether we need to commit
diff --git a/openerp/db/__init__.py b/openerp/db/__init__.py
deleted file mode 100644
index 5eb06af1ad1..00000000000
--- a/openerp/db/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 OpenERP s.a. (<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/>.
-#
-##############################################################################
-
-""" Lower-level database access.
-
-This module provides access to the underlying database without going
-through the ORM. The goal is to gather sql_db.py and other various db
-code.
-
-"""
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index 511d62c5862..30a765b1f60 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -33,7 +33,8 @@ import openerp.modules
 import openerp.netsvc
 import openerp.osv
 import openerp.tools
-import openerp.wsgi
+import openerp.service.wsgi_server
+import openerp.service.workers
 
 #.apidoc title: RPC Services
 
@@ -48,22 +49,40 @@ import openerp.wsgi
 
 _logger = logging.getLogger(__name__)
 
-# TODO block until the server is really up, accepting connections
-# TODO be idemptotent (as long as stop_service was not called).
-def start_services():
-    """ Start all services.
+def load_server_wide_modules():
+    for m in openerp.conf.server_wide_modules:
+        try:
+            openerp.modules.module.load_openerp_module(m)
+        except Exception:
+            msg = ''
+            if m == 'web':
+                msg = """
+The `web` module is provided by the addons found in the `openerp-web` project.
+Maybe you forgot to add those addons in your addons_path configuration."""
+            _logger.exception('Failed to load server-wide module `%s`.%s', m, msg)
 
-    Services include the different servers and cron threads.
+start_internal_done = False
 
-    """
+def start_internal():
+    global start_internal_done
+    if start_internal_done:
+        return
+    openerp.netsvc.init_logger()
+    openerp.modules.loading.open_openerp_namespace()
     # Instantiate local services (this is a legacy design).
     openerp.osv.osv.start_object_proxy()
     # Export (for RPC) services.
     web_services.start_web_services()
+    load_server_wide_modules()
+    start_internal_done = True
+
+def start_services():
+    """ Start all services including http, netrpc and cron """
+    openerp.multi_process = False # Nah!
+
+    start_internal()
 
     # Initialize the HTTP stack.
-    #http_server.init_servers()
-    #http_server.init_static_http()
     netrpc_server.init_servers()
 
     # Start the main cron thread.
@@ -73,8 +92,7 @@ def start_services():
     openerp.netsvc.Server.startAll()
 
     # Start the WSGI server.
-    openerp.wsgi.core.start_server()
-
+    openerp.service.wsgi_server.start_server()
 
 def stop_services():
     """ Stop all services. """
@@ -82,7 +100,7 @@ def stop_services():
     openerp.cron.cancel_all()
 
     openerp.netsvc.Server.quitAll()
-    openerp.wsgi.core.stop_server()
+    openerp.service.wsgi_server.stop_server()
     config = openerp.tools.config
     _logger.info("Initiating shutdown")
     _logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
@@ -101,6 +119,9 @@ def stop_services():
 
     openerp.modules.registry.RegistryManager.delete_all()
 
+def start_services_workers():
+    openerp.service.workers.Multicorn(openerp.service.wsgi_server.application).run()
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index fcbfaf0ba82..cc78d0620cf 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -32,8 +32,8 @@ import sys
 import threading
 import traceback
 import openerp
+import openerp.service.netrpc_socket
 import openerp.netsvc as netsvc
-import openerp.tiny_socket as tiny_socket
 import openerp.tools as tools
 
 _logger = logging.getLogger(__name__)
@@ -52,7 +52,7 @@ class TinySocketClientThread(threading.Thread):
     def run(self):
         self.running = True
         try:
-            ts = tiny_socket.mysocket(self.sock)
+            ts = openerp.server.netrpc_socket.mysocket(self.sock)
         except Exception:
             self.threads.remove(self)
             self.running = False
diff --git a/openerp/tiny_socket.py b/openerp/service/netrpc_socket.py
similarity index 98%
rename from openerp/tiny_socket.py
rename to openerp/service/netrpc_socket.py
index b5f5bbccee3..c49c8f7c2a2 100644
--- a/openerp/tiny_socket.py
+++ b/openerp/service/netrpc_socket.py
@@ -23,14 +23,11 @@ import socket
 import cPickle
 import cStringIO
 
-import netsvc
-
-#.apidoc title: Net-RPC classes
+import openerp.netsvc as netsvc
 
 # Pickle protocol version 2 is optimized compared to default (version 0)
 PICKLE_PROTOCOL = 2
 
-
 class Myexception(Exception):
     """
     custom exception object store
diff --git a/openerp/service/workers.py b/openerp/service/workers.py
new file mode 100644
index 00000000000..824bc07bb53
--- /dev/null
+++ b/openerp/service/workers.py
@@ -0,0 +1,368 @@
+#-----------------------------------------------------------
+# Multicorn, multiprocessing inspired by gunicorn
+# TODO rename class: Multicorn -> Arbiter ?
+#-----------------------------------------------------------
+import errno
+import fcntl
+import psutil
+import random
+import resource
+import select
+import socket
+import time
+import logging
+import os
+import signal
+import sys
+
+import werkzeug.serving
+
+import openerp
+import openerp.tools.config as config
+
+_logger = logging.getLogger(__name__)
+
+class Multicorn(object):
+    """ Multiprocessing inspired by (g)unicorn.
+    Multicorn currently uses accept(2) as dispatching method between workers
+    but we plan to replace it by a more intelligent dispatcher to will parse
+    the first HTTP request line.
+    """
+    def __init__(self, app):
+        # config
+        self.address = (config['xmlrpc_interface'] or '0.0.0.0', config['xmlrpc_port'])
+        self.population = config['workers']
+        self.timeout = config['limit_time_real']
+        self.limit_request = config['limit_request']
+        # working vars
+        self.beat = 4
+        self.app = app
+        self.pid = os.getpid()
+        self.socket = None
+        self.workers_http = {}
+        self.workers_cron = {}
+        self.workers = {}
+        self.generation = 0
+        self.queue = []
+
+    def pipe_new(self):
+        pipe = os.pipe()
+        for fd in pipe:
+            # non_blocking
+            flags = fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK
+            fcntl.fcntl(fd, fcntl.F_SETFL, flags)
+            # close_on_exec
+            flags = fcntl.fcntl(fd, fcntl.F_GETFD) | fcntl.FD_CLOEXEC
+            fcntl.fcntl(fd, fcntl.F_SETFD, flags)
+        return pipe
+
+    def pipe_ping(self, pipe):
+        try:
+            os.write(pipe[1], '.')
+        except IOError, e:
+            if e.errno not in [errno.EAGAIN, errno.EINTR]:
+                raise
+
+    def signal_handler(self, sig, frame):
+        if len(self.queue) < 5 or sig == signal.SIGCHLD:
+            self.queue.append(sig)
+            self.pipe_ping(self.pipe)
+        else:
+            _logger.warn("Dropping signal: %s", sig)
+
+    def worker_spawn(self, klass, workers_registry):
+        self.generation += 1
+        worker = klass(self)
+        pid = os.fork()
+        if pid != 0:
+            worker.pid = pid
+            self.workers[pid] = worker
+            workers_registry[pid] = worker
+            return worker
+        else:
+            worker.run()
+            sys.exit(0)
+
+    def worker_pop(self, pid):
+        if pid in self.workers:
+            _logger.debug("Worker (%s) unregistered",pid)
+            try:
+                self.workers_http.pop(pid,None)
+                self.workers_cron.pop(pid,None)
+                u = self.workers.pop(pid)
+                u.close()
+            except OSError:
+                return
+
+    def worker_kill(self, pid, sig):
+        try:
+            os.kill(pid, sig)
+        except OSError, e:
+            if e.errno == errno.ESRCH:
+                self.worker_pop(pid)
+
+    def process_signals(self):
+        while len(self.queue):
+            sig = self.queue.pop(0)
+            if sig in [signal.SIGINT,signal.SIGTERM]:
+                raise KeyboardInterrupt
+
+    def process_zombie(self):
+        # reap dead workers
+        while 1:
+            try:
+                wpid, status = os.waitpid(-1, os.WNOHANG)
+                if not wpid:
+                    break
+                if (status >> 8) == 3:
+                    msg = "Critial worker error (%s)"
+                    _logger.critical(msg, wpid)
+                    raise Exception(msg % wpid)
+                self.worker_pop(wpid)
+            except OSError, e:
+                if e.errno == errno.ECHILD:
+                    break
+                raise
+
+    def process_timeout(self):
+        now = time.time()
+        for (pid, worker) in self.workers.items():
+            if now - worker.watchdog_time >= worker.watchdog_timeout:
+                _logger.error("Worker (%s) timeout", pid)
+                self.worker_kill(pid, signal.SIGKILL)
+
+    def process_spawn(self):
+        while len(self.workers_http) < self.population:
+            self.worker_spawn(WorkerHTTP, self.workers_http)
+        while len(self.workers_cron) < 1: # config option ?
+            self.worker_spawn(WorkerCron, self.workers_cron)
+
+    def sleep(self):
+        try:
+            # map of fd -> worker
+            fds = dict([(w.watchdog_pipe[0],w) for k,w in self.workers.items()])
+            fd_in = fds.keys() + [self.pipe[0]]
+            # check for ping or internal wakeups
+            ready = select.select(fd_in, [], [], self.beat)
+            # update worker watchdogs
+            for fd in ready[0]:
+                if fd in fds:
+                    fds[fd].watchdog_time = time.time()
+                try:
+                    # empty pipe
+                    while os.read(fd, 1):
+                        pass
+                except OSError, e:
+                    if e.errno not in [errno.EAGAIN]:
+                        raise
+        except select.error, e:
+            if e[0] not in [errno.EINTR]:
+                raise
+
+    def start(self):
+        # wakeup pipe, python doesnt throw EINTR when a syscall is interrupted
+        # by a signal simulating a pseudo SA_RESTART. We write to a pipe in the
+        # signal handler to overcome this behaviour
+        self.pipe = self.pipe_new()
+        # set signal
+        signal.signal(signal.SIGINT, self.signal_handler)
+        signal.signal(signal.SIGTERM, self.signal_handler)
+        signal.signal(signal.SIGCHLD, self.signal_handler)
+        # listen to socket
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.socket.setblocking(0)
+        self.socket.bind(self.address)
+        self.socket.listen(8)
+
+    def stop(self, graceful=True):
+        if graceful:
+            _logger.info("Stopping gracefully")
+            limit = time.time() + self.timeout
+            for pid in self.workers.keys():
+                self.worker_kill(pid, signal.SIGTERM)
+            while self.workers and time.time() < limit:
+                self.process_zombie()
+                time.sleep(0.1)
+        else:
+            _logger.info("Stopping forcefully")
+        for pid in self.workers.keys():
+            self.worker_kill(pid, signal.SIGTERM)
+        self.socket.close()
+        import __main__
+        __main__.quit_signals_received = 1
+
+    def run(self):
+        self.start()
+        _logger.debug("Multiprocess starting")
+        while 1:
+            try:
+                #_logger.debug("Multiprocess beat (%s)",time.time())
+                self.process_signals()
+                self.process_zombie()
+                self.process_timeout()
+                self.process_spawn()
+                self.sleep()
+            except KeyboardInterrupt:
+                _logger.debug("Multiprocess clean stop")
+                self.stop()
+                break
+            except Exception,e:
+                _logger.exception(e)
+                self.stop(False)
+                sys.exit(-1)
+
+class Worker(object):
+    """ Workers """
+    def __init__(self, multi):
+        self.multi = multi
+        self.watchdog_time = time.time()
+        self.watchdog_pipe = multi.pipe_new()
+        self.watchdog_timeout = multi.timeout
+        self.ppid = os.getpid()
+        self.pid = None
+        self.alive = True
+        # should we rename into lifetime ?
+        self.request_max = multi.limit_request
+        self.request_count = 0
+
+    def close(self):
+        os.close(self.watchdog_pipe[0])
+        os.close(self.watchdog_pipe[1])
+
+    def signal_handler(self, sig, frame):
+        self.alive = False
+
+    def sleep(self):
+        try:
+            ret = select.select([self.multi.socket], [], [], self.multi.beat)
+        except select.error, e:
+            if e[0] not in [errno.EINTR]:
+                raise
+
+    def process_limit(self):
+        # If our parent changed sucide
+        if self.ppid != os.getppid():
+            _logger.info("Worker (%s) Parent changed", self.pid)
+            self.alive = False
+        # check for lifetime
+        if self.request_count >= self.request_max:
+            _logger.info("Worker (%d) max request (%s) reached.", self.pid, self.request_count)
+            self.alive = False
+        # Reset the worker if it consumes too much memory (e.g. caused by a memory leak).
+        rss, vms = psutil.Process(os.getpid()).get_memory_info()
+        if vms > config['limit_memory_soft']:
+            _logger.info('Virtual memory consumption too high, rebooting the worker.')
+            self.alive = False # Commit suicide after the request.
+
+        # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space
+        soft, hard = resource.getrlimit(resource.RLIMIT_AS)
+        resource.setrlimit(resource.RLIMIT_AS, (config['limit_memory_hard'], hard))
+
+        # SIGXCPU (exceeded CPU time) signal handler will raise an exception.
+        r = resource.getrusage(resource.RUSAGE_SELF)
+        cpu_time = r.ru_utime + r.ru_stime
+        def time_expired(n, stack):
+            _logger.info('CPU time limit exceeded.')
+            raise Exception('CPU time limit exceeded.')
+        signal.signal(signal.SIGXCPU, time_expired)
+        soft, hard = resource.getrlimit(resource.RLIMIT_CPU)
+        resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + config['limit_time_cpu'], hard))
+
+    def process_work(self):
+        pass
+
+    def start(self):
+        self.pid = os.getpid()
+        _logger.info("Worker %s (%s) alive", self.__class__.__name__, self.pid)
+        # Reseed the random number generator
+        random.seed()
+        # Prevent fd inherientence close_on_exec
+        flags = fcntl.fcntl(self.multi.socket, fcntl.F_GETFD) | fcntl.FD_CLOEXEC
+        fcntl.fcntl(self.multi.socket, fcntl.F_SETFD, flags)
+        # reset blocking status
+        self.multi.socket.setblocking(0)
+        signal.signal(signal.SIGINT, self.signal_handler)
+        signal.signal(signal.SIGTERM, signal.SIG_DFL)
+        signal.signal(signal.SIGCHLD, signal.SIG_DFL)
+
+    def stop(self):
+        pass
+
+    def run(self):
+        try:
+            self.start()
+            while self.alive:
+                self.process_limit()
+                self.multi.pipe_ping(self.watchdog_pipe)
+                self.sleep()
+                self.process_work()
+            _logger.info("Worker (%s) exiting...",self.pid)
+            self.stop()
+        except Exception,e:
+            _logger.exception("Worker (%s) Exception occured, exiting..."%self.pid)
+            # should we use 3 to abort everything ?
+            sys.exit(1)
+
+class WorkerHTTP(Worker):
+    """ HTTP Request workers """
+    def process_request(self, client, addr):
+        client.setblocking(1)
+        client.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+        # Prevent fd inherientence close_on_exec
+        flags = fcntl.fcntl(client, fcntl.F_GETFD) | fcntl.FD_CLOEXEC
+        fcntl.fcntl(client, fcntl.F_SETFD, flags)
+        # do request using WorkerBaseWSGIServer monkey patched with socket
+        self.server.socket = client
+        self.server.process_request(client,addr)
+        self.request_count += 1
+
+    def process_work(self):
+        try:
+            client, addr = self.multi.socket.accept()
+            self.process_request(client, addr)
+        except socket.error, e:
+            if e[0] not in (errno.EAGAIN, errno.ECONNABORTED):
+                raise
+
+    def start(self):
+        Worker.start(self)
+        self.server = WorkerBaseWSGIServer(self.multi.app)
+
+class WorkerBaseWSGIServer(werkzeug.serving.BaseWSGIServer):
+    """ werkzeug WSGI Server patched to allow using an external listen socket
+    """
+    def __init__(self, app):
+        werkzeug.serving.BaseWSGIServer.__init__(self, "1", "1", app)
+    def server_bind(self):
+        # we dont bind beause we use the listen socket of Multicorn#socket
+        # instead we close the socket
+        if self.socket:
+            self.socket.close()
+    def server_activate(self):
+        # dont listen as we use Multicorn#socket
+        pass
+
+class WorkerCron(Worker):
+    """ Cron workers """
+    def sleep(self):
+        time.sleep(60)
+
+    def process_work(self):
+        if config['db_name']:
+            db_names = config['db_name'].split(',')
+        else:
+            db_names = openerp.netsvc.ExportService._services['db'].exp_list(True)
+        for db_name in db_names:
+            while True:
+                # TODO Each job should be considered as one request in multiprocessing
+                acquired = openerp.addons.base.ir.ir_cron.ir_cron._acquire_job(db_name)
+                if not acquired:
+                    break
+        self.request_count += 1
+
+    def start(self):
+        Worker.start(self)
+        openerp.service.start_internal()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/wsgi/core.py b/openerp/service/wsgi_server.py
similarity index 79%
rename from openerp/wsgi/core.py
rename to openerp/service/wsgi_server.py
index 0aff7172480..61556974a00 100644
--- a/openerp/wsgi/core.py
+++ b/openerp/service/wsgi_server.py
@@ -38,10 +38,13 @@ import sys
 import threading
 import traceback
 
+import werkzeug.serving
+import werkzeug.contrib.fixers
+
 import openerp
 import openerp.modules
 import openerp.tools.config as config
-from ..service import websrv_lib
+import websrv_lib
 
 _logger = logging.getLogger(__name__)
 
@@ -221,9 +224,6 @@ def wsgi_xmlrpc_legacy(environ, start_response):
         params, method = xmlrpclib.loads(data)
         return xmlrpc_return(start_response, path, method, params, True)
 
-def wsgi_jsonrpc(environ, start_response):
-    pass
-
 def wsgi_webdav(environ, start_response):
     pi = environ['PATH_INFO']
     if environ['REQUEST_METHOD'] == 'OPTIONS' and pi in ['*','/']:
@@ -382,28 +382,31 @@ def register_wsgi_handler(handler):
     """
     module_handlers.append(handler)
 
-def application(environ, start_response):
+def application_unproxied(environ, start_response):
     """ WSGI entry point."""
+    openerp.service.start_internal()
 
     # Try all handlers until one returns some result (i.e. not None).
-    wsgi_handlers = [
-        wsgi_xmlrpc_1,
-        wsgi_xmlrpc,
-        wsgi_jsonrpc,
-        wsgi_xmlrpc_legacy,
-        wsgi_webdav
-        ] + module_handlers
+    wsgi_handlers = [wsgi_xmlrpc_1, wsgi_xmlrpc, wsgi_xmlrpc_legacy, wsgi_webdav]
+    wsgi_handlers += module_handlers
     for handler in wsgi_handlers:
         result = handler(environ, start_response)
         if result is None:
             continue
         return result
 
+
     # We never returned from the loop.
     response = 'No handler found.\n'
     start_response('404 Not Found', [('Content-Type', 'text/plain'), ('Content-Length', str(len(response)))])
     return [response]
 
+def application(environ, start_response):
+    if 'HTTP_X_FORWARDED_HOST' in environ:
+        return werkzeug.contrib.fixers.ProxyFix(application_unproxied)(environ, start_response)
+    else:
+        return application_unproxied(environ, start_response)
+
 # The WSGI server, started by start_server(), stopped by stop_server().
 httpd = None
 
@@ -421,25 +424,8 @@ def serve():
     # TODO Change the xmlrpc_* options to http_*
     interface = config['xmlrpc_interface'] or '0.0.0.0'
     port = config['xmlrpc_port']
-    try:
-        import werkzeug.serving
-        if config['proxy_mode']:
-            from werkzeug.contrib.fixers import ProxyFix
-            app = ProxyFix(application)
-            suffix = ' (in proxy mode)'
-        else:
-            app = application
-            suffix = ''
-        httpd = werkzeug.serving.make_server(interface, port, app, threaded=True)
-        _logger.info('HTTP service (werkzeug) running on %s:%s%s', interface, port, suffix)
-    except ImportError:
-        import wsgiref.simple_server
-        _logger.warning('Werkzeug module unavailable, falling back to wsgiref.')
-        if config['proxy_mode']:
-            _logger.warning('Werkzeug module unavailable, not using proxy mode.')
-        httpd = wsgiref.simple_server.make_server(interface, port, application)
-        _logger.info('HTTP service (wsgiref) running on %s:%s', interface, port)
-
+    httpd = werkzeug.serving.make_server(interface, port, application, threaded=True)
+    _logger.info('HTTP service (werkzeug) running on %s:%s', interface, port)
     httpd.serve_forever()
 
 def start_server():
@@ -457,87 +443,4 @@ def stop_server():
     if httpd:
         httpd.shutdown()
 
-# Master process id, can be used for signaling.
-arbiter_pid = None
-
-# Application setup before we can spawn any worker process.
-# This is suitable for e.g. gunicorn's on_starting hook.
-def on_starting(server):
-    global arbiter_pid
-    arbiter_pid = os.getpid() # TODO check if this is true even after replacing the executable
-    #openerp.tools.cache = kill_workers_cache
-    openerp.netsvc.init_logger()
-    openerp.osv.osv.start_object_proxy()
-    openerp.service.web_services.start_web_services()
-    openerp.modules.module.initialize_sys_path()
-    openerp.modules.loading.open_openerp_namespace()
-    for m in openerp.conf.server_wide_modules:
-        try:
-            openerp.modules.module.load_openerp_module(m)
-        except Exception:
-            msg = ''
-            if m == 'web':
-                msg = """
-The `web` module is provided by the addons found in the `openerp-web` project.
-Maybe you forgot to add those addons in your addons_path configuration."""
-            _logger.exception('Failed to load server-wide module `%s`.%s', m, msg)
-
-# Install our own signal handler on the master process.
-def when_ready(server):
-    # Hijack gunicorn's SIGWINCH handling; we can choose another one.
-    signal.signal(signal.SIGWINCH, make_winch_handler(server))
-
-# Install limits on virtual memory and CPU time consumption.
-def pre_request(worker, req):
-    import os
-    import psutil
-    import resource
-    import signal
-    # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space
-    rss, vms = psutil.Process(os.getpid()).get_memory_info()
-    soft, hard = resource.getrlimit(resource.RLIMIT_AS)
-    resource.setrlimit(resource.RLIMIT_AS, (config['virtual_memory_limit'], hard))
-
-    r = resource.getrusage(resource.RUSAGE_SELF)
-    cpu_time = r.ru_utime + r.ru_stime
-    signal.signal(signal.SIGXCPU, time_expired)
-    soft, hard = resource.getrlimit(resource.RLIMIT_CPU)
-    resource.setrlimit(resource.RLIMIT_CPU, (cpu_time + config['cpu_time_limit'], hard))
-
-# Reset the worker if it consumes too much memory (e.g. caused by a memory leak).
-def post_request(worker, req, environ):
-    import os
-    import psutil
-    rss, vms = psutil.Process(os.getpid()).get_memory_info()
-    if vms > config['virtual_memory_reset']:
-        _logger.info('Virtual memory consumption '
-            'too high, rebooting the worker.')
-        worker.alive = False # Commit suicide after the request.
-
-# Our signal handler will signal a SGIQUIT to all workers.
-def make_winch_handler(server):
-    def handle_winch(sig, fram):
-        server.kill_workers(signal.SIGQUIT) # This is gunicorn specific.
-    return handle_winch
-
-# SIGXCPU (exceeded CPU time) signal handler will raise an exception.
-def time_expired(n, stack):
-    _logger.info('CPU time limit exceeded.')
-    raise Exception('CPU time limit exceeded.') # TODO one of openerp.exception
-
-# Kill gracefuly the workers (e.g. because we want to clear their cache).
-# This is done by signaling a SIGWINCH to the master process, so it can be
-# called by the workers themselves.
-def kill_workers():
-    try:
-        os.kill(arbiter_pid, signal.SIGWINCH)
-    except OSError, e:
-        if e.errno == errno.ESRCH: # no such pid
-            return
-        raise
-
-class kill_workers_cache(openerp.tools.ormcache):
-    def clear(self, dbname, *args, **kwargs):
-        kill_workers()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index ce157c5e697..58d1d3c9c82 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -116,8 +116,6 @@ class configmanager(object):
                          help="specify the TCP port for the XML-RPC protocol", type="int")
         group.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", my_default=True,
                          help="disable the XML-RPC protocol")
-        group.add_option("--proxy-mode", dest="proxy_mode", action="store_true", my_default=False,
-                         help="Enable correct behavior when behind a reverse proxy")
         parser.add_option_group(group)
 
         # XML-RPC / HTTPS
@@ -253,8 +251,6 @@ class configmanager(object):
 
         # Advanced options
         group = optparse.OptionGroup(parser, "Advanced options")
-        group.add_option("--cache-timeout", dest="cache_timeout", my_default=100000,
-                          help="set the timeout for the cache system", type="int")
         group.add_option('--debug', dest='debug_mode', action='store_true', my_default=False, help='enable debug mode')
         group.add_option("--stop-after-init", action="store_true", dest="stop_after_init", my_default=False,
                           help="stop the server after its initialization")
@@ -272,23 +268,30 @@ class configmanager(object):
         group.add_option("--max-cron-threads", dest="max_cron_threads", my_default=4,
                          help="Maximum number of threads processing concurrently cron jobs.",
                          type="int")
-        # TODO sensible default for the three following limits.
-        group.add_option("--virtual-memory-limit", dest="virtual_memory_limit", my_default=768 * 1024 * 1024,
-                         help="Maximum allowed virtual memory per Gunicorn process. "
-                         "When the limit is reached, any memory allocation will fail.",
-                         type="int")
-        group.add_option("--virtual-memory-reset", dest="virtual_memory_reset", my_default=640 * 1024 * 1024,
-                         help="Maximum allowed virtual memory per Gunicorn process. "
-                         "When the limit is reached, the worker will be reset after "
-                         "the current request.",
-                         type="int")
-        group.add_option("--cpu-time-limit", dest="cpu_time_limit", my_default=60,
-                         help="Maximum allowed CPU time per Gunicorn process. "
-                         "When the limit is reached, an exception is raised.",
-                         type="int")
         group.add_option("--unaccent", dest="unaccent", my_default=False, action="store_true",
                          help="Use the unaccent function provided by the database when available.")
+        parser.add_option_group(group)
 
+        group = optparse.OptionGroup(parser, "Multiprocessing options")
+        # TODO sensible default for the three following limits.
+        group.add_option("--workers", dest="workers", my_default=0,
+                         help="Specify the number of workers, 0 disable prefork mode.",
+                         type="int")
+        group.add_option("--limit-memory-soft", dest="limit_memory_soft", my_default=640 * 1024 * 1024,
+                         help="Maximum allowed virtual memory per worker, when reached the worker be reset after the current request.",
+                         type="int")
+        group.add_option("--limit-memory-hard", dest="limit_memory_hard", my_default=768 * 1024 * 1024,
+                         help="Maximum allowed virtual memory per worker, when reached, any memory allocation will fail.",
+                         type="int")
+        group.add_option("--limit-time-cpu", dest="limit_time_cpu", my_default=60,
+                         help="Maximum allowed CPU time per request.",
+                         type="int")
+        group.add_option("--limit-time-real", dest="limit_time_real", my_default=60,
+                         help="Maximum allowed Real time per request. ",
+                         type="int")
+        group.add_option("--limit-request", dest="limit_request", my_default=8192,
+                         help="Maximum number of request to be processed per worker.",
+                         type="int")
         parser.add_option_group(group)
 
         # Copy all optparse options (i.e. MyOption) into self.options.
@@ -369,7 +372,7 @@ class configmanager(object):
 
         # if defined dont take the configfile value even if the defined value is None
         keys = ['xmlrpc_interface', 'xmlrpc_port', 'db_name', 'db_user', 'db_password', 'db_host',
-                'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port', 'cache_timeout',
+                'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port',
                 'email_from', 'smtp_server', 'smtp_user', 'smtp_password',
                 'netrpc_interface', 'netrpc_port', 'db_maxconn', 'import_partial', 'addons_path',
                 'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',
@@ -391,10 +394,10 @@ class configmanager(object):
             'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
             'debug_mode', 'smtp_ssl', 'load_language',
             'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
-            'list_db', 'xmlrpcs', 'proxy_mode',
+            'list_db', 'xmlrpcs',
             'test_file', 'test_enable', 'test_commit', 'test_report_directory',
-            'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads',
-            'virtual_memory_limit', 'virtual_memory_reset', 'cpu_time_limit', 'unaccent',
+            'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
+            'workers', 'limit_memory_hard', 'limit_memory_soft', 'limit_time_cpu', 'limit_time_real', 'limit_request'
         ]
 
         for arg in keys:
diff --git a/openerp/wsgi/__init__.py b/openerp/wsgi/__init__.py
deleted file mode 100644
index a536ee57327..00000000000
--- a/openerp/wsgi/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-2012 OpenERP s.a. (<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/>.
-#
-##############################################################################
-
-""" WSGI stack
-
-This module offers a WSGI interface to/from OpenERP.
-
-"""
-
-from . import core
-
-# TODO: This is for the web addons, can be removed later.
-register_wsgi_handler = core.register_wsgi_handler
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/wsgi/proxied.py b/openerp/wsgi/proxied.py
deleted file mode 100644
index 658f6f29c55..00000000000
--- a/openerp/wsgi/proxied.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012 OpenERP s.a. (<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/>.
-#
-##############################################################################
-
-"""
-
-WSGI entry point with Proxy mode (from Werkzeug).
-
-"""
-
-from werkzeug.contrib.fixers import ProxyFix
-
-from . import core
-
-application = ProxyFix(core.application)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 7833ed2137053faf8c3d5946fb77c2eed447c64b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 22 Sep 2012 12:55:15 +0200
Subject: [PATCH 054/128] typo

bzr revid: al@openerp.com-20120922105515-hk2fcc4ux5rb1xz1
---
 openerp-wsgi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 7382b90d3b7..5ab7afc406e 100644
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -11,7 +11,7 @@
 #
 # For gunicorn additional globals need to be defined in the Gunicorn section.
 # Then the following command should run:
-#   $ gunicorn openerp:wsgi.core.application -c gunicorn.conf.py
+#   $ gunicorn openerp:application -c openerp-wsgi.py
 
 import openerp
 

From ac2ad9aa8444125b938f48d99b4e6cb3083eb381 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 22 Sep 2012 13:10:33 +0200
Subject: [PATCH 055/128] fix deps

bzr revid: al@openerp.com-20120922111033-jzxjr8fpm15a3510
---
 debian/control | 1 +
 setup.py       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index f5d425c5586..7a1bfb62bb8 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends:
  python-lxml,
  python-mako,
  python-openid,
+ python-psutil,
  python-psycopg2,
  python-pybabel,
  python-pychart,
diff --git a/setup.py b/setup.py
index a26b74e255d..18d341039ea 100755
--- a/setup.py
+++ b/setup.py
@@ -97,6 +97,7 @@ setuptools.setup(
           'gdata',
           'lxml < 3',
           'mako',
+          'psutil',
           'psycopg2',
           'pydot',
           'python-dateutil < 2',

From 2fdccd40c3976cded1b2d89130d3e830b76ebdab Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 22 Sep 2012 13:17:14 +0200
Subject: [PATCH 056/128] fix command line installation

bzr revid: al@openerp.com-20120922111714-moxkguy729vout9x
---
 openerp-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-server b/openerp-server
index 5222de88eb4..9025e2d50c2 100755
--- a/openerp-server
+++ b/openerp-server
@@ -91,7 +91,7 @@ def setup_pid_file():
 def preload_registry(dbname):
     """ Preload a registry, and start the cron."""
     try:
-        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
+        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=openerp.tools.config['init'] or openerp.tools.config['update'], pooljobs=False)
 
         # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services()
         registry.schedule_cron_jobs()

From a00e014477f989945c227bd205cbed83fc56e3a1 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 24 Sep 2012 10:53:14 +0530
Subject: [PATCH 057/128] [IMP] Event : made warning message translatable

bzr revid: rpr@tinyerp.com-20120924052314-u5xyhyirqqu6uoqp
---
 addons/event_moodle/event_moodle.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index f36b1cd2d62..f8433dc2294 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -54,7 +54,7 @@ class event_moodle(osv.osv):
         """
         moodle_config_wiz_ids = self.search(cr, uid, [], context=context)
         if not moodle_config_wiz_ids:
-            raise osv.except_osv(('Error!'),("First configure your moodle connection."))
+            raise osv.except_osv(_('Error!'),_("First configure your moodle connection."))
         return moodle_config_wiz_ids[0]
 
     def make_url(self, cr, uid, ids, context=None):
@@ -102,7 +102,7 @@ class event_moodle(osv.osv):
         #connect to moodle
         url = self.browse(cr, uid, id, context=context).url
         if not url:
-            raise osv.except_osv(('Error!'),("First configure your moodle connection."))
+            raise osv.except_osv(_('Error!'),_("First configure your moodle connection."))
         sock = xmlrpclib.ServerProxy(url)
         return sock.core_course_create_courses(courses)
 

From 21f2f7c1128668fb6d2a15b054340bea66d71668 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Mon, 24 Sep 2012 11:09:44 +0530
Subject: [PATCH 058/128] [IMP] stock: add if condition to check context

bzr revid: cha@tinyerp.com-20120924053944-l2mwyuijvzr9ot0w
---
 addons/stock/stock.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 295cee2c583..96cabbf1cce 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1393,24 +1393,28 @@ class stock_picking(osv.osv):
         return type_dict.get(type, 'Stock picking')
 
     def create_send_note(self, cr, uid, ids, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("%s has been <b>confirmed</b>.") % (self._get_document_type(obj.type)), context=context)
 
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         self._get_thread_model(cr, uid, ids, context=context)
         return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
 
     def back_order_send_note(self, cr, uid, ids, back_name, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         self._get_thread_model(cr, uid, ids, context=context)
         return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
 
@@ -1420,13 +1424,15 @@ class stock_picking(osv.osv):
                 'in': 'received',
                 'internal': 'moved',
         }
-        context = context or {}
+        if context is None:
+            context = {}
         self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         self._get_thread_model(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)

From 1868aef76d18ccb3cd0159ad95736a9edd26f2a8 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 24 Sep 2012 12:43:43 +0530
Subject: [PATCH 059/128] [FIX] clean installation message.

bzr revid: tta@openerp.com-20120924071343-0ynnf81sam5y78b3
---
 addons/account_accountant/account_accountant_data.xml | 6 ++++--
 addons/account_voucher/account_voucher_data.xml       | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index d7ed9c1ad13..e082744e26a 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -26,9 +26,11 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
             <field name="subject">Accounting and Finance application installed!</field>
-            <field name="body">With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.
+            <field name="body"><![CDATA[
+                <p>With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.</p>
 
-The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</field>
+<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>
+            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 656d2c2cd91..62706275552 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -7,11 +7,11 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
             <field name="subject">eInvoicing &amp; Payments application installed!</field>
-            <field name="body">OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
+            <field name="body"><![CDATA[
+                <p>OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>  
 
-You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability.
-
-For advanced accounting features, you should install the "Accounting and Finance" module.</field>
+<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>
+            ]]></field>
         </record>
     </data>
 </openerp>

From d86cc61f08b76b0127458487dc7ff3c5c7a1801a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 13:01:26 +0530
Subject: [PATCH 060/128] [ADD] product : Added warning message on onchange of
 min/max margin value.

bzr revid: mdi@tinyerp.com-20120924073126-ejkeieiz81zc1udo
---
 addons/product/pricelist.py       | 13 +++++++++++++
 addons/product/pricelist_view.xml | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 9b37dc0fe07..02b2605d8cf 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -437,6 +437,19 @@ class product_pricelist_item(osv.osv):
         if prod[0]['code']:
             return {'value': {'name': prod[0]['code']}}
         return {}
+
+    def onchange_margin(self, cr, uid, ids, price_min_margin, price_max_margin, context=None):
+        res = {'value': {}}
+        if not price_min_margin and not price_max_margin:
+            return res
+        if price_min_margin > price_max_margin:
+            res['warning'] = {'title': _('Warning!'), 'message': _('Minimum Margin must be lower than Maximum Margin !.')}
+            pricelist_rule = self.browse(cr, uid, ids, context=context)[0]
+            min_margin = pricelist_rule.price_min_margin
+            max_margin = pricelist_rule.price_max_margin
+            res['value'].update({'price_min_margin': min_margin, 'price_max_margin': max_margin})
+        return res
+
 product_pricelist_item()
 
 
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index dc120660c43..7dcdeae15e8 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -20,7 +20,11 @@
                         <field name="date_end"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <field name="items_id"/>
+                    <notebook>
+                        <page string="Rules">
+                            <field name="items_id"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -103,8 +107,8 @@
                         <field name="price_surcharge" nolabel="1"/>
                         <newline/>
                         <field name="price_round" string="Rounding Method"/>
-                        <field name="price_min_margin" string="Min. Margin"/>
-                        <field name="price_max_margin" string="Max. Margin"/>
+                        <field name="price_min_margin" string="Min. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
+                        <field name="price_max_margin" string="Max. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
                     </group>
 
                 </form>

From 70f6e847f3001edb3aee08aff078930fcc093ac4 Mon Sep 17 00:00:00 2001
From: Rifakat <rha@tinyerp.com>
Date: Mon, 24 Sep 2012 13:10:36 +0530
Subject: [PATCH 061/128] [FIX] stock: wrong stock accounting entries while
 doing return of any purchase/sales Accounting entries should be reverse while
 doing any return

bzr revid: rha@tinyerp.com-20120924074036-0h7sybkwaegvg4tz
---
 addons/stock/stock.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 329159494d3..332a21895f2 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2300,7 +2300,11 @@ class stock_move(osv.osv):
                      or move.location_id.company_id != move.location_dest_id.company_id):
                 journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))]
+                #returning goods to supplier
+                if move.location_dest_id.usage == 'supplier':
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_src, reference_amount, reference_currency_id, context))]
+                else:
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))]
 
             # Incoming moves (or cross-company input part)
             if move.location_dest_id.company_id \
@@ -2308,7 +2312,11 @@ class stock_move(osv.osv):
                      or move.location_id.company_id != move.location_dest_id.company_id):
                 journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
+                #goods return from customer
+                if move.location_id.usage == 'customer':
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_dest, acc_valuation, reference_amount, reference_currency_id, context))]
+                else:
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
 
             move_obj = self.pool.get('account.move')
             for j_id, move_lines in account_moves:

From bda72b0d797d823229d7c59029721421fad2cad4 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Mon, 24 Sep 2012 14:09:22 +0530
Subject: [PATCH 062/128] [Fix] one paragraph when two are needed.

bzr revid: tta@openerp.com-20120924083922-dw12d911warnad3s
---
 addons/account_accountant/account_accountant_data.xml | 2 +-
 addons/account_voucher/account_voucher_data.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index e082744e26a..e02db45fcd8 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -27,7 +27,7 @@
             <field name="type">notification</field>
             <field name="subject">Accounting and Finance application installed!</field>
             <field name="body"><![CDATA[
-                <p>With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.</p>
+                With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.
 
 <p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>
             ]]></field>
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 62706275552..fd25fec9493 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -8,7 +8,7 @@
             <field name="type">notification</field>
             <field name="subject">eInvoicing &amp; Payments application installed!</field>
             <field name="body"><![CDATA[
-                <p>OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>  
+                OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.  
 
 <p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>
             ]]></field>

From e708ec5345d4e45db0dcaed4211667dfaaa06da0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 14:12:42 +0530
Subject: [PATCH 063/128] [IMP] product : Added warning message on onchange of
 min/max margin value.

bzr revid: mdi@tinyerp.com-20120924084242-v6cly3hpsotn2y4b
---
 addons/product/pricelist.py       | 11 ++++++++---
 addons/product/pricelist_view.xml |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 02b2605d8cf..3c1d5febc75 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -445,9 +445,14 @@ class product_pricelist_item(osv.osv):
         if price_min_margin > price_max_margin:
             res['warning'] = {'title': _('Warning!'), 'message': _('Minimum Margin must be lower than Maximum Margin !.')}
             pricelist_rule = self.browse(cr, uid, ids, context=context)[0]
-            min_margin = pricelist_rule.price_min_margin
-            max_margin = pricelist_rule.price_max_margin
-            res['value'].update({'price_min_margin': min_margin, 'price_max_margin': max_margin})
+            min_margin = 0.0
+            max_margin = 0.0
+            if price_min_margin:
+                min_margin = pricelist_rule.price_min_margin
+                res['value'].update({'price_min_margin': min_margin})
+            if price_max_margin:
+                max_margin = pricelist_rule.price_max_margin
+                res['value'].update({'price_max_margin': max_margin})
         return res
 
 product_pricelist_item()
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 7dcdeae15e8..47fada812d2 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -107,8 +107,8 @@
                         <field name="price_surcharge" nolabel="1"/>
                         <newline/>
                         <field name="price_round" string="Rounding Method"/>
-                        <field name="price_min_margin" string="Min. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
-                        <field name="price_max_margin" string="Max. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
+                        <field name="price_min_margin" string="Min. Margin" on_change="onchange_margin(price_min_margin, False)"/>
+                        <field name="price_max_margin" string="Max. Margin" on_change="onchange_margin(False, price_max_margin)"/>
                     </group>
 
                 </form>

From e8060bc72efcedc8e144515018b3221fed688db7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 14:15:36 +0530
Subject: [PATCH 064/128] [REM] product : Removed constraint on min/max margin
 value.

bzr revid: mdi@tinyerp.com-20120924084536-r429tvqy9jhjytjo
---
 addons/product/pricelist.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 3c1d5febc75..e98086d49e2 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -423,9 +423,6 @@ class product_pricelist_item(osv.osv):
             readonly=True, relation='res.company', string='Company', store=True)
     }
 
-    _sql_constraints = [
-        ('check_margin', 'CHECK (price_min_margin <= price_max_margin)', 'Minimum Margin must be lower than Maximum Margin !'),
-    ]
     _constraints = [
         (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
     ]

From eb1ca681283f41fd6bffd19b817b5be04351860b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 14:25:03 +0530
Subject: [PATCH 065/128] [IMP] product : Improved onchange on min/max margin
 value.

bzr revid: mdi@tinyerp.com-20120924085503-ckhxdgcvqb0h6qjh
---
 addons/product/pricelist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index e98086d49e2..7ac908e262f 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -446,10 +446,10 @@ class product_pricelist_item(osv.osv):
             max_margin = 0.0
             if price_min_margin:
                 min_margin = pricelist_rule.price_min_margin
-                res['value'].update({'price_min_margin': min_margin})
+                res['value'] = dict(res['value'], price_min_margin = min_margin)
             if price_max_margin:
                 max_margin = pricelist_rule.price_max_margin
-                res['value'].update({'price_max_margin': max_margin})
+                res['value'] = dict(res['value'], price_max_margin = max_margin)
         return res
 
 product_pricelist_item()

From d4013af9e5e5bfe270dc8187ee8c000b975f541d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 15:23:22 +0530
Subject: [PATCH 066/128] [IMP] product : Improved onchange on min/max margin
 value.

bzr revid: mdi@tinyerp.com-20120924095322-jtgzlxkohon6qc6y
---
 addons/product/pricelist.py       | 13 +++----------
 addons/product/pricelist_view.xml |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 7ac908e262f..7d47f2e2136 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -436,20 +436,13 @@ class product_pricelist_item(osv.osv):
         return {}
 
     def onchange_margin(self, cr, uid, ids, price_min_margin, price_max_margin, context=None):
-        res = {'value': {}}
+        res = {'value': {'price_min_margin': 0.0, 'price_max_margin': 0.0}}
         if not price_min_margin and not price_max_margin:
             return res
         if price_min_margin > price_max_margin:
             res['warning'] = {'title': _('Warning!'), 'message': _('Minimum Margin must be lower than Maximum Margin !.')}
-            pricelist_rule = self.browse(cr, uid, ids, context=context)[0]
-            min_margin = 0.0
-            max_margin = 0.0
-            if price_min_margin:
-                min_margin = pricelist_rule.price_min_margin
-                res['value'] = dict(res['value'], price_min_margin = min_margin)
-            if price_max_margin:
-                max_margin = pricelist_rule.price_max_margin
-                res['value'] = dict(res['value'], price_max_margin = max_margin)
+        else:
+            res = {'value': {'price_min_margin': price_min_margin, 'price_max_margin': price_max_margin}}
         return res
 
 product_pricelist_item()
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 47fada812d2..7dcdeae15e8 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -107,8 +107,8 @@
                         <field name="price_surcharge" nolabel="1"/>
                         <newline/>
                         <field name="price_round" string="Rounding Method"/>
-                        <field name="price_min_margin" string="Min. Margin" on_change="onchange_margin(price_min_margin, False)"/>
-                        <field name="price_max_margin" string="Max. Margin" on_change="onchange_margin(False, price_max_margin)"/>
+                        <field name="price_min_margin" string="Min. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
+                        <field name="price_max_margin" string="Max. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
                     </group>
 
                 </form>

From 7b4e8cbbf8c26cbf98db92a779672c4b9361870f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 12:33:07 +0200
Subject: [PATCH 067/128] [IMP] product: added constraints to make sure that
 the decimal precision of 'Account' is greater than the rounding factor of the
 company's main currency

bzr revid: qdp-launchpad@openerp.com-20120924103307-4sdx61qxfy6lak2e
---
 addons/product/product.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/addons/product/product.py b/addons/product/product.py
index ab282e722c0..144aa28c458 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -897,4 +897,43 @@ class pricelist_partnerinfo(osv.osv):
     }
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
+
+class res_currency(osv.osv):
+    _inherit = 'res.currency'
+
+    def _check_main_currency_rounding(self, cr, uid, ids, context=None):
+        cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Account',))
+        digits = cr.fetchone()
+        if len(digits):
+            digits = digits[0]
+            main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+            for currency_id in ids:
+                if currency_id == main_currency.id:
+                    if main_currency.rounding < 10 ** -digits:
+                        return False
+        return True
+
+    _constraints = [
+        (_check_main_currency_rounding, 'Error! You cannot define a rounding factor for the company\'s main currency that is smaller than the decimal precision of \'Account\'.', ['rounding']),
+    ]
+
+class decimal_precision(osv.osv):
+    _inherit = 'decimal.precision'
+
+    def _check_main_currency_rounding(self, cr, uid, ids, context=None):
+        cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Account',))
+        res = cr.fetchone()
+        if len(res):
+            account_precision_id, digits = res
+            main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+            for decimal_precision in ids:
+                if decimal_precision == account_precision_id:
+                    if main_currency.rounding < 10 ** -digits:
+                        return False
+        return True
+
+    _constraints = [
+        (_check_main_currency_rounding, 'Error! You cannot define the decimal precision of \'Account\' as greater than the rounding factor of the company\'s main currency', ['digits']),
+    ]
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 6c60619a2bfeec6f3241e47ff4dbe1dd4844132c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 24 Sep 2012 12:36:48 +0200
Subject: [PATCH 068/128] [FIX] wsgi wrapper

bzr revid: al@openerp.com-20120924103648-uhxteeu6nd8batvd
---
 openerp-wsgi.py             | 7 ++++---
 openerp/__init__.py         | 2 +-
 openerp/service/__init__.py | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 5ab7afc406e..48ffeaf3373 100644
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -7,7 +7,7 @@
 #
 # For generic wsgi handlers a global application is defined.
 # For uwsgi this should work:
-#   $ uwsgi --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
+#   $ uwsgi_python --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py
 #
 # For gunicorn additional globals need to be defined in the Gunicorn section.
 # Then the following command should run:
@@ -18,15 +18,16 @@ import openerp
 #----------------------------------------------------------
 # Common
 #----------------------------------------------------------
+openerp.multi_process = True # Nah!
+
 # Equivalent of --load command-line option
 openerp.conf.server_wide_modules = ['web']
 conf = openerp.tools.config
 
 # Path to the OpenERP Addons repository (comma-separated for
 # multiple locations)
-conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons'
-conf['addons_path'] = '/home/wis/stuff/version/openerp/source/addons/6.1,/home/wis/stuff/version/openerp/source/web/6.1/addons'
 
+conf['addons_path'] = '../../addons/trunk,../../web/trunk/addons'
 
 # Optional database config if not using local socket
 #conf['db_name'] = 'mycompany'
diff --git a/openerp/__init__.py b/openerp/__init__.py
index 2fd2a9812f9..3a8f5f86f26 100644
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -50,7 +50,7 @@ wsgi.register_wsgi_handler = wsgi.wsgi_server.register_wsgi_handler
 # e.g. database update or cache invalidation. Each process has also
 # its own copy of the data structure and we don't need to care about
 # locks between threads.
-multi_process = True
+multi_process = False
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index 30a765b1f60..ef0fd757ddd 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -78,8 +78,6 @@ def start_internal():
 
 def start_services():
     """ Start all services including http, netrpc and cron """
-    openerp.multi_process = False # Nah!
-
     start_internal()
 
     # Initialize the HTTP stack.
@@ -120,6 +118,8 @@ def stop_services():
     openerp.modules.registry.RegistryManager.delete_all()
 
 def start_services_workers():
+    openerp.multi_process = True # Nah!
+
     openerp.service.workers.Multicorn(openerp.service.wsgi_server.application).run()
 
 

From 470415ced97698c66bab4ae912e6d08c4831e54d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 24 Sep 2012 12:40:26 +0200
Subject: [PATCH 069/128] [IMP] ir.ui.view: discard custom views before
 updating view arch

- as the custom views are still in place when validating the new arch, they would
hide the new arch and prevent proper validation (if custom views are set for uid 1)
- conversely, if the RNG validation has changed, the old view customizations may not
pass the updated validation rules, and cause spurious validation errors

bzr revid: odo@openerp.com-20120924104026-z7bjzzq80ifxy1oc
---
 openerp/addons/base/ir/ir_ui_view.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index bad2c3d85af..9208297cf84 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -192,7 +192,6 @@ class view(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if not isinstance(ids, (list, tuple)):
             ids = [ids]
-        result = super(view, self).write(cr, uid, ids, vals, context)
 
         # drop the corresponding view customizations (used for dashboards for example), otherwise
         # not all users would see the updated views
@@ -200,7 +199,7 @@ class view(osv.osv):
         if custom_view_ids:
             self.pool.get('ir.ui.view.custom').unlink(cr, uid, custom_view_ids)
 
-        return result
+        return super(view, self).write(cr, uid, ids, vals, context)
 
     def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node, label, scale, context=None):
         nodes=[]

From feb66a13c39a6605f7e1d46b5ffe5c108a0205c5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 24 Sep 2012 12:50:11 +0200
Subject: [PATCH 070/128] [FIX] gunicorn wsgi wrapper instructions

bzr revid: al@openerp.com-20120924105011-2gtopghuooxh37o0
---
 openerp-wsgi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp-wsgi.py b/openerp-wsgi.py
index 48ffeaf3373..9ae18ffc69e 100644
--- a/openerp-wsgi.py
+++ b/openerp-wsgi.py
@@ -11,7 +11,7 @@
 #
 # For gunicorn additional globals need to be defined in the Gunicorn section.
 # Then the following command should run:
-#   $ gunicorn openerp:application -c openerp-wsgi.py
+#   $ gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py
 
 import openerp
 

From d77fe9c1853b046fb97f77e96416c4bcdf7de4d8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 24 Sep 2012 12:56:22 +0200
Subject: [PATCH 071/128] [FIX] restore poxy-mode command line option to
 prevent ip address impersonation

bzr revid: al@openerp.com-20120924105622-nb3iwe1vnuffqrbm
---
 openerp/service/wsgi_server.py | 2 +-
 openerp/tools/config.py        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/service/wsgi_server.py b/openerp/service/wsgi_server.py
index 61556974a00..a73617d8510 100644
--- a/openerp/service/wsgi_server.py
+++ b/openerp/service/wsgi_server.py
@@ -402,7 +402,7 @@ def application_unproxied(environ, start_response):
     return [response]
 
 def application(environ, start_response):
-    if 'HTTP_X_FORWARDED_HOST' in environ:
+    if config['proxy_mode'] and 'HTTP_X_FORWARDED_HOST' in environ:
         return werkzeug.contrib.fixers.ProxyFix(application_unproxied)(environ, start_response)
     else:
         return application_unproxied(environ, start_response)
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 58d1d3c9c82..18b442221c9 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -116,6 +116,8 @@ class configmanager(object):
                          help="specify the TCP port for the XML-RPC protocol", type="int")
         group.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", my_default=True,
                          help="disable the XML-RPC protocol")
+        group.add_option("--proxy-mode", dest="proxy_mode", action="store_true", my_default=False,
+                         help="Enable correct behavior when behind a reverse proxy")
         parser.add_option_group(group)
 
         # XML-RPC / HTTPS
@@ -394,7 +396,7 @@ class configmanager(object):
             'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
             'debug_mode', 'smtp_ssl', 'load_language',
             'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
-            'list_db', 'xmlrpcs',
+            'list_db', 'xmlrpcs', 'proxy_mode',
             'test_file', 'test_enable', 'test_commit', 'test_report_directory',
             'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
             'workers', 'limit_memory_hard', 'limit_memory_soft', 'limit_time_cpu', 'limit_time_real', 'limit_request'

From dfeeca1e8fd702bddd7ace33090d99395c485811 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 13:04:50 +0200
Subject: [PATCH 072/128] [FIX] account: fixed list_partners_to_reconcile() in
 order to return all partners and not the first one only

bzr revid: qdp-launchpad@openerp.com-20120924110450-q1k51qv0p2djumxk
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2aed5b02107..5ddbbee74f2 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -736,7 +736,7 @@ class account_move_line(osv.osv):
                 WHERE debit > 0 AND credit > 0
                 ORDER BY last_reconciliation_date""")
         ids = cr.fetchall()
-        ids = len(ids) and list(ids[0]) or []
+        ids = len(ids) and [x[0] for x in ids] or []
         return self.pool.get('res.partner').name_get(cr, uid, ids, context=context)
 
     def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):

From 29badc35a54e00f0ca0d516473eb82016d2b9355 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 13:16:41 +0200
Subject: [PATCH 073/128] [FIX] product: 'Nonetype object has no len()' error
 fixed in newly added constraints for decimal precision of 'Account' <=
 company's main currency rounding

bzr revid: qdp-launchpad@openerp.com-20120924111641-9papztx074vdbrpq
---
 addons/product/product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 144aa28c458..df0ab9122c2 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -904,7 +904,7 @@ class res_currency(osv.osv):
     def _check_main_currency_rounding(self, cr, uid, ids, context=None):
         cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Account',))
         digits = cr.fetchone()
-        if len(digits):
+        if digits and len(digits):
             digits = digits[0]
             main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
             for currency_id in ids:
@@ -923,7 +923,7 @@ class decimal_precision(osv.osv):
     def _check_main_currency_rounding(self, cr, uid, ids, context=None):
         cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Account',))
         res = cr.fetchone()
-        if len(res):
+        if res and len(res):
             account_precision_id, digits = res
             main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
             for decimal_precision in ids:

From d306cc49c88205efced594871db8d7c46ba6c9b0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 17:03:57 +0530
Subject: [PATCH 074/128] [ADD] product : Override write method in order to
 check 'Min margin' and 'Max margin'.

bzr revid: mdi@tinyerp.com-20120924113357-195gynto9xm7ae2a
---
 addons/product/pricelist.py       | 15 +++++++--------
 addons/product/pricelist_view.xml |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 7d47f2e2136..7cac03b6a5d 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -435,15 +435,14 @@ class product_pricelist_item(osv.osv):
             return {'value': {'name': prod[0]['code']}}
         return {}
 
-    def onchange_margin(self, cr, uid, ids, price_min_margin, price_max_margin, context=None):
-        res = {'value': {'price_min_margin': 0.0, 'price_max_margin': 0.0}}
-        if not price_min_margin and not price_max_margin:
-            return res
+    def write(self, cr, uid, ids, vals, context=None):
+        name = self.browse(cr, uid, ids, context=context)[0].name
+        price_min_margin = vals.get('price_min_margin', 0.0)
+        price_max_margin = vals.get('price_max_margin', 0.0)
         if price_min_margin > price_max_margin:
-            res['warning'] = {'title': _('Warning!'), 'message': _('Minimum Margin must be lower than Maximum Margin !.')}
-        else:
-            res = {'value': {'price_min_margin': price_min_margin, 'price_max_margin': price_max_margin}}
-        return res
+            raise osv.except_osv(_('Warning!'), _('In \'%s\' pricelist rule, minimum margin must be lower than maximum margin !.') % (name))
+        return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context)
+
 
 product_pricelist_item()
 
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 7dcdeae15e8..03835721709 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -107,8 +107,8 @@
                         <field name="price_surcharge" nolabel="1"/>
                         <newline/>
                         <field name="price_round" string="Rounding Method"/>
-                        <field name="price_min_margin" string="Min. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
-                        <field name="price_max_margin" string="Max. Margin" on_change="onchange_margin(price_min_margin, price_max_margin)"/>
+                        <field name="price_min_margin" string="Min. Margin"/>
+                        <field name="price_max_margin" string="Max. Margin"/>
                     </group>
 
                 </form>

From 8957669dca01745b87f3eb832d11a5d2c386c2c7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 17:14:20 +0530
Subject: [PATCH 075/128] [ADD] product : Improved the warning message.

bzr revid: mdi@tinyerp.com-20120924114420-qy1lviihna6odv6e
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 7cac03b6a5d..92c054b82bd 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -440,7 +440,7 @@ class product_pricelist_item(osv.osv):
         price_min_margin = vals.get('price_min_margin', 0.0)
         price_max_margin = vals.get('price_max_margin', 0.0)
         if price_min_margin > price_max_margin:
-            raise osv.except_osv(_('Warning!'), _('In \'%s\' pricelist rule, minimum margin must be lower than maximum margin !.') % (name))
+            raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule !.') % (name))
         return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context)
 
 

From f7255ac0b3b7e6b3d2dc67b571f7a169b2019598 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 24 Sep 2012 13:53:44 +0200
Subject: [PATCH 076/128] [FIX] clear breadcrumbs for client actions

bzr revid: chs@openerp.com-20120924115344-rbtaus7a48pr56ka
---
 addons/web/static/src/js/views.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 608a856785e..d170aacc89d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -318,8 +318,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
         }
         return this.ir_actions_common(action, on_close, clear_breadcrumbs);
     },
-    ir_actions_client: function (action, on_close) {
-        return this.ir_actions_common(action, on_close);
+    ir_actions_client: function (action, on_close, clear_breadcrumbs) {
+        return this.ir_actions_common(action, on_close, clear_breadcrumbs);
     },
     ir_actions_act_window_close: function (action, on_closed) {
         if (!this.dialog && on_closed) {

From 3bcf43b06b3a80643faf1597fe4e8f95c42432e5 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 17:45:42 +0530
Subject: [PATCH 077/128] [ADD] product : Override create method in order to
 check 'Min margin' and 'Max margin'.

bzr revid: mdi@tinyerp.com-20120924121542-0031rv1ozrxlvc9a
---
 addons/product/pricelist.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 92c054b82bd..4f848201d9d 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -434,13 +434,22 @@ class product_pricelist_item(osv.osv):
         if prod[0]['code']:
             return {'value': {'name': prod[0]['code']}}
         return {}
-
-    def write(self, cr, uid, ids, vals, context=None):
-        name = self.browse(cr, uid, ids, context=context)[0].name
+    
+    def create(self, cr, uid, vals, context=None):
+        name = vals.get('name', '')
         price_min_margin = vals.get('price_min_margin', 0.0)
         price_max_margin = vals.get('price_max_margin', 0.0)
         if price_min_margin > price_max_margin:
             raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule !.') % (name))
+        return super(product_pricelist_item, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        price_min_margin = vals.get('price_min_margin', 0.0)
+        price_max_margin = vals.get('price_max_margin', 0.0)
+        for rule in self.browse(cr, uid, ids, context=context):
+            name = rule.name
+            if price_min_margin > price_max_margin:
+                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule !.') % (name))
         return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context)
 
 

From 4488c42ee532cb6715d986764f5532f26476cd25 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 24 Sep 2012 14:53:55 +0200
Subject: [PATCH 078/128] [FIX] problem in o2m, not reloading when we click a
 button in a o2m form popup

bzr revid: nicolas.vanhoren@openerp.com-20120924125355-m1b53sjb6hle789z
---
 addons/web/static/src/js/view_form.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index af1980b7b6e..e3b7bde1bfe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -940,6 +940,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 return self.dataset.parent_view.recursive_save();
         });
     },
+    recursive_reload: function() {
+        var self = this;
+        var pre = $.when();
+        if (self.dataset.parent_view)
+                pre = self.dataset.parent_view.recursive_reload();
+        return pre.pipe(function() {
+            return self.reload();
+        });
+    },
     is_dirty: function() {
         return _.any(this.fields, function (value_) {
             return value_._dirty_flag;
@@ -1809,7 +1818,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
         return this.view.do_execute_action(
             _.extend({}, this.node.attrs, {context: context}),
             this.view.dataset, this.view.datarecord.id, function () {
-                self.view.reload();
+                self.view.recursive_reload();
             });
     },
     check_disable: function() {

From fc9b27af796744fb645941de20a74fc136abbbda Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 18:30:43 +0530
Subject: [PATCH 079/128] [IMP] product : Improved the warning message.

bzr revid: mdi@tinyerp.com-20120924130043-euwxbfmk5q58vqw4
---
 addons/product/pricelist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 4f848201d9d..14392c79f10 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -440,7 +440,7 @@ class product_pricelist_item(osv.osv):
         price_min_margin = vals.get('price_min_margin', 0.0)
         price_max_margin = vals.get('price_max_margin', 0.0)
         if price_min_margin > price_max_margin:
-            raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule !.') % (name))
+            raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule!') % (name))
         return super(product_pricelist_item, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -449,7 +449,7 @@ class product_pricelist_item(osv.osv):
         for rule in self.browse(cr, uid, ids, context=context):
             name = rule.name
             if price_min_margin > price_max_margin:
-                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule !.') % (name))
+                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule!') % (name))
         return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context)
 
 

From a9fd3d15c078e25380e9cbc26e3f812f9f2344a8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 19:02:37 +0530
Subject: [PATCH 080/128] [IMP] base_calendar:  When an invited person is
 accepted, it should appear in attendee.

bzr revid: mdi@tinyerp.com-20120924133237-yfttw2aeard17rr1
---
 addons/base_calendar/base_calendar.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 85199d09c60..269c30a9bea 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -551,6 +551,8 @@ property or property parameter."),
         @param context: A standard dictionary for contextual values
         @return: True
         """
+        meeting_obj = self.pool.get('crm.meeting')
+
         if context is None:
             context = {}
 
@@ -560,6 +562,18 @@ property or property parameter."),
                 defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id}
                 mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
+            cr.execute('SELECT event_id '\
+                       'FROM meeting_attendee_rel '\
+                       'WHERE attendee_id = %s', (vals.id,))
+            res = cr.fetchone()
+            if res:
+                partner_ids = [partner.id for partner in meeting_obj.browse(cr, uid, res[0], context=context).partner_ids]
+                if vals.user_id:
+                    partner_ids.append(vals.user_id.partner_id.id)
+                    meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
+                if vals.partner_id:
+                    partner_ids.append(vals.partner_id.id)
+                    meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
 
         return True
 

From b3027a371cef466856307b5ac88c1fcc69a0be81 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 15:45:33 +0200
Subject: [PATCH 081/128] [IMP] account: improved demo data to add a second
 bank journal, in foreign currency

bzr revid: qdp-launchpad@openerp.com-20120924134533-s1j8mmqou9uw2mdt
---
 addons/account/demo/account_minimal.xml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 53f2b54e0ef..2647364597b 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -122,6 +122,14 @@
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_income"/>
         </record>
+        <record id="usd_bnk" model="account.account">
+            <field name="code">X11007</field>
+            <field name="name">USD Bank Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="data_account_type_asset"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
 
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
@@ -360,8 +368,8 @@
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -412,6 +420,17 @@
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+
+        <record id="bank_journal_usd" model="account.journal">
+            <field name="name">USD Bank Journal - (test)</field>
+            <field name="code">TUBK</field>
+            <field name="type">bank</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field name="sequence_id" ref="sequence_bank_journal_usd"/>
+            <field model="account.account" name="usd_debit_account_id" ref="usd_bnk"/>
+            <field model="account.account" name="usd_credit_account_id" ref="usd_bnk"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->

From 247752851272d5bb3e222d31fcde81e1259e9f17 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 15:49:10 +0200
Subject: [PATCH 082/128] [FIX] l10n_ch: linked the demo journal of BANK CHF
 JOURNAL to the CHF currency

bzr revid: qdp-launchpad@openerp.com-20120924134910-5yye9t2m7yrqhhu7
---
 addons/l10n_ch/journal_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 04870ca936b..ede9136c3d2 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -19,6 +19,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
+            <field name="currency" model="res.currency" ref="base.CHF" />
         </record>
         
         <record id="bank_euro_journal" model="account.journal">

From edb74f79b1d502921dbf58c179d67f624b5a9879 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 16:06:17 +0200
Subject: [PATCH 083/128] [IMP] base: added a new rate for USD, for demo
 transactions in multi currency

bzr revid: qdp-launchpad@openerp.com-20120924140617-e0mlvtz2pf7icqo2
---
 openerp/addons/base/base_demo.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 064b1f49e69..ce675ebb99e 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -14,5 +14,12 @@
             <field name="company_id" ref="main_company"/>
             <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>
         </record>
+
+        <!-- new rate for demo transactions in multi currency -->
+        <record id="rateUSDbis" model="res.currency.rate">
+            <field name="rate">1.5289</field>
+            <field name="currency_id" ref="USD"/>
+            <field eval="time.strftime('%Y-06-06')" name="name"/>
+        </record>
     </data>
 </openerp>

From de9eb7f78cdb3dcaa3c4320498f16dcda0a43a24 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 24 Sep 2012 16:06:32 +0200
Subject: [PATCH 084/128] [IMP] indentation and arguments order for readabily
 sake

bzr revid: abo@openerp.com-20120924140632-mig0szmfvopl1wq0
---
 addons/account/security/account_security.xml  | 46 ++++++++++---------
 .../portal_sale/security/portal_security.xml  |  2 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 26265cb2b2c..afbd19289b6 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
+<openerp>
+<data>
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
@@ -7,11 +8,13 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
+
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
+
     <record id="group_account_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
@@ -25,107 +28,107 @@
 
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
-        <field ref="model_account_move" name="model_id"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_move"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
-         <field name="name">Entry lines</field>
+        <field name="name">Entry lines</field>
         <field model="ir.model" name="model_id" ref="model_account_move_line"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
         <field name="name">Journal Period</field>
         <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-     
+
 
     <record id="journal_comp_rule" model="ir.rule">
         <field name="name">Journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_journal"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
         <field name="name">Period multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_period"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
         <field name="name">Fiscal year multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
         <field name="name">Account multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_account"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
-         <field name="name">Tax multi-company</field>
+        <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
         <field name="name">Tax code multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_invoice"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_analysis_comp_rule" model="ir.rule">
         <field name="name">Invoice Analysis multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="entry_analysis_comp_rule" model="ir.rule">
         <field name="name">Entries Analysis multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_entries_report"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
         <field model="ir.model" name="model_id" ref="model_account_model"/>
-        <field eval="True" name="global"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
@@ -150,4 +153,5 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-</data></openerp>
+</data>
+</openerp>
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index 8028d5360c4..2f161a73281 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -12,7 +12,7 @@
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders</field>
-            <field ref="stock.model_stock_picking" name="model_id"/>
+            <field name="model_id" ref="stock.model_stock_picking"/>
             <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>

From aae20beef065bfd394ad5c7d988d06ae276c541b Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 24 Sep 2012 16:10:47 +0200
Subject: [PATCH 085/128] [IMP] remove the useless attribute model="ir.model"

bzr revid: abo@openerp.com-20120924141047-2mang092z0ak288g
---
 addons/account/security/account_security.xml | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index afbd19289b6..442b51466f8 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -35,14 +35,14 @@
 
     <record id="account_move_line_comp_rule" model="ir.rule">
         <field name="name">Entry lines</field>
-        <field model="ir.model" name="model_id" ref="model_account_move_line"/>
+        <field name="model_id" ref="model_account_move_line"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
         <field name="name">Journal Period</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
+        <field name="model_id" ref="model_account_journal_period"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
@@ -50,84 +50,84 @@
 
     <record id="journal_comp_rule" model="ir.rule">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal"/>
+        <field name="model_id" ref="model_account_journal"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
+        <field name="model_id" ref="model_account_analytic_journal"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_period"/>
+        <field name="model_id" ref="model_account_period"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
+        <field name="model_id" ref="model_account_fiscalyear"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_account"/>
+        <field name="model_id" ref="model_account_account"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
         <field name="name">Tax multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax"/>
+        <field name="model_id" ref="model_account_tax"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
+        <field name="model_id" ref="model_account_tax_code"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice"/>
+        <field name="model_id" ref="model_account_invoice"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_analysis_comp_rule" model="ir.rule">
         <field name="name">Invoice Analysis multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
+        <field name="model_id" ref="model_account_invoice_report"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="entry_analysis_comp_rule" model="ir.rule">
         <field name="name">Entries Analysis multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_entries_report"/>
+        <field name="model_id" ref="model_account_entries_report"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
+        <field name="model_id" ref="model_account_fiscal_position"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_model"/>
+        <field name="model_id" ref="model_account_model"/>
         <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>

From 9aa98a03d1ff0ca456e67041a7b73d436a44d358 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 24 Sep 2012 16:40:27 +0200
Subject: [PATCH 086/128] [FIX] account: fixed missing reference to sequence in
 demo journal

bzr revid: qdp-launchpad@openerp.com-20120924144027-jxj61tt3cg0vud5j
---
 addons/account/demo/account_minimal.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 2647364597b..8f879d6b465 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -426,7 +426,6 @@
             <field name="code">TUBK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="sequence_id" ref="sequence_bank_journal_usd"/>
             <field model="account.account" name="usd_debit_account_id" ref="usd_bnk"/>
             <field model="account.account" name="usd_credit_account_id" ref="usd_bnk"/>
             <field name="currency_id" ref="base.USD"/>

From 7b6280243572f4e0c60772be23ba8fc154e541b2 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 24 Sep 2012 17:34:30 +0200
Subject: [PATCH 087/128] [IMP] use kwargs instead of a new dict

bzr revid: abo@openerp.com-20120924153430-0nb2gxker8v9is5p
---
 addons/email_template/email_template.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 6f48d37c714..cc4b52992a4 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -236,9 +236,7 @@ class email_template(osv.osv):
             default = {}
         default = default.copy()
         default['name'] = template.name + _('(copy)')
-        default.update({
-            'ref_ir_act_window': False,
-            'ref_ir_value': False,
+        default.update(ref_ir_act_window=False, ref_ir_value=False)
         })
         return super(email_template, self).copy(cr, uid, id, default, context)
 
@@ -392,7 +390,7 @@ class email_template(osv.osv):
            :param bool force_send: if True, the generated mail.message is
                 immediately sent after being created, as if the scheduler
                 was executed for this message only.
-           :returns: id of the mail.message that was created 
+           :returns: id of the mail.message that was created
         """
         if context is None: context = {}
         mail_message = self.pool.get('mail.message')

From f7b90af93ad6d97444d56ec81ee9d3ce959299e4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 24 Sep 2012 17:56:00 +0200
Subject: [PATCH 088/128] [FIX] forgot to remove })

bzr revid: abo@openerp.com-20120924155600-dnaanyupa5jm0yre
---
 addons/email_template/email_template.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 53d484bd92d..87bdfccbbcf 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -217,7 +217,6 @@ class email_template(osv.osv):
         default = default.copy()
         default['name'] = template.name + _('(copy)')
         default.update(ref_ir_act_window=False, ref_ir_value=False)
-        })
         return super(email_template, self).copy(cr, uid, id, default, context)
 
     def build_expression(self, field_name, sub_field_name, null_value):

From 70a1aac877933c591b3d807dbed541c92fc7a6fe Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 24 Sep 2012 18:07:21 +0200
Subject: [PATCH 089/128] [IMP] minor change in form view fields

bzr revid: nicolas.vanhoren@openerp.com-20120924160721-hay0ar7ap22gjyk7
---
 addons/web/static/src/js/view_form.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e3b7bde1bfe..dff9df11140 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -331,7 +331,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
 
         _(this.fields).each(function (field, f) {
             field._dirty_flag = false;
+            field._inhibit_on_change_flag = true;
             var result = field.set_value(self.datarecord[f] || false);
+            field._inhibit_on_change_flag = false;
             set_values.push(result);
         });
         return $.when.apply(null, set_values).pipe(function() {
@@ -580,7 +582,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 if (field) {
                     var value_ = result.value[f];
                     if (field.get_value() != value_) {
+                        field._inhibit_on_change_flag = true;
                         field.set_value(value_);
+                        field._inhibit_on_change_flag = false;
                         field._dirty_flag = true;
                         if (!_.contains(processed, field.name)) {
                             this.do_onchange(field, processed);
@@ -1052,6 +1056,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this.translatable_fields.push(field);
         }
         field.on('changed_value', this, function() {
+            if (field._inhibit_on_change_flag) {
+                return;
+            }
             field._dirty_flag = true;
             if (field.is_syntax_valid()) {
                 this.do_onchange(field);
@@ -1948,8 +1955,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this.on("change:force_readonly", this, test_effective_readonly);
         test_effective_readonly.call(this);
         this.on("change:value", this, function() {
-            if (! this._inhibit_on_change)
-                this.trigger('changed_value');
+            this.trigger('changed_value');
             this._check_css_flags();
         });
     },
@@ -1984,9 +1990,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
         this.$el.toggleClass('oe_form_required', this.get("required"));
     },
     set_value: function(value_) {
-        this._inhibit_on_change = true;
         this.set({'value': value_});
-        this._inhibit_on_change = false;
     },
     get_value: function() {
         return this.get('value');
@@ -3321,6 +3325,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             this.dataset.index = 0;
         }
         self.is_setted.resolve();
+        this.trigger_on_change();
         return self.reload_current_view();
     },
     get_value: function() {

From 1fbb4a5c16232c6130b31d870be4e44ecc743a72 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 24 Sep 2012 18:26:45 +0200
Subject: [PATCH 090/128] [IMP] handling of '(copy)' l10n

bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
---
 addons/account/account.py                     |  9 ++--
 addons/account_coda/account_coda.py           | 11 +++--
 addons/analytic/analytic.py                   |  7 +--
 addons/document/document.py                   |  2 +-
 addons/document/document_directory.py         |  2 +-
 addons/email_template/email_template.py       |  4 +-
 addons/hr_payroll/hr_payroll.py               | 11 ++---
 addons/mrp/mrp.py                             |  2 +-
 addons/product/product.py                     |  2 +-
 addons/project/project.py                     |  6 +--
 addons/project_issue/project_issue.py         |  6 +--
 addons/project_long_term/project_long_term.py |  6 +--
 addons/resource/resource.py                   | 48 +++++++++----------
 addons/survey/survey.py                       |  6 +--
 14 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index d145f0308b0..c2e6f3d1221 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -601,7 +601,7 @@ class account_account(osv.osv):
         if not default:
             default = {}
         default = default.copy()
-        default['code'] = (account['code'] or '') + '(copy)'
+        default.update(code=_("%s (copy)") % (account['code'] or ''))
         if not local:
             done_list = []
         if account.id in done_list:
@@ -782,9 +782,10 @@ class account_journal(osv.osv):
         if not default:
             default = {}
         default = default.copy()
-        default['code'] = (journal['code'] or '') + '(copy)'
-        default['name'] = (journal['name'] or '') + '(copy)'
-        default['sequence_id'] = False
+        default.update(
+            code=_("%s (copy)") % (journal['code'] or ''),
+            name=_("%s (copy)") % (journal['name'] or ''),
+            sequence_id=False)
         return super(account_journal, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index cd117b5be88..1aa6e84402a 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -107,11 +107,12 @@ class coda_bank_account(osv.osv):
         if not default:
             default = {}
         default = default.copy()
-        default.update({'journal_id': None})
-        default['description1'] = cba['description1'] or ''
-        default['description2'] = cba['description2'] or ''
-        default['name'] = (cba['name'] or '') + ' (copy)'
-        default['state'] = cba['state']
+        default.update(
+            journal_id=None,
+            description1=cba['description1'] or '',
+            description2=cba['description2'] or '',
+            name=_("%s (copy)") % (cba['name'] or ''),
+            state=cba['state'])
         return super(coda_bank_account, self).copy(cr, uid, id, default, context)
 
     def onchange_state(self, cr, uid, ids, state):
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index d3a22782a68..269bf24ed61 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -223,9 +223,10 @@ class account_analytic_account(osv.osv):
         if not default:
             default = {}
         analytic = self.browse(cr, uid, id, context=context)
-        default['code'] = False
-        default['line_ids'] = []
-        default['name'] = analytic['name'] + ' (' + _('copy') + ')'
+        default.update(
+            code=False,
+            line_ids=[],
+            name=_("%s (copy)") % (analytic['name']))
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 
     def on_change_company(self, cr, uid, id, company_id):
diff --git a/addons/document/document.py b/addons/document/document.py
index 3ee52f8e4fb..cb30e5f93c9 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -209,7 +209,7 @@ class document_file(osv.osv):
             default = {}
         if 'name' not in default:
             name = self.read(cr, uid, [id], ['name'])[0]['name']
-            default.update({'name': name + " " + _("(copy)")})
+            default.update(name=_("%s (copy)") % (name))
         return super(document_file, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 1ead23ab402..ac0671d36d3 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -231,7 +231,7 @@ class document_directory(osv.osv):
         if not default:
             default ={}
         name = self.read(cr, uid, [id])[0]['name']
-        default.update({'name': name+ " (copy)"})
+        default.update(name=_("%s (copy)") % (name))
         return super(document_directory,self).copy(cr, uid, id, default, context=context)
 
     def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 4080e62f002..dd05d1850fd 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -215,7 +215,7 @@ class email_template(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default['name'] = template.name + _('(copy)')
+        default.update(name=_("%s (copy)") % (template.name))
         return super(email_template, self).copy(cr, uid, id, default, context)
 
     def build_expression(self, field_name, sub_field_name, null_value):
@@ -335,7 +335,7 @@ class email_template(osv.osv):
            :param bool force_send: if True, the generated mail.message is
                 immediately sent after being created, as if the scheduler
                 was executed for this message only.
-           :returns: id of the mail.message that was created 
+           :returns: id of the mail.message that was created
         """
         if context is None: context = {}
         mail_mail = self.pool.get('mail.mail')
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 6a2e40b9571..08dacc9a951 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -81,10 +81,9 @@ class hr_payroll_structure(osv.osv):
         """
         if not default:
             default = {}
-        default.update({
-            'code': self.browse(cr, uid, id, context=context).code + "(copy)",
-            'company_id': self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        })
+        default.update(
+            code=_("%s (copy)") % (self.browse(cr, uid, id, context=context).code),
+            company_id=self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id)
         return super(hr_payroll_structure, self).copy(cr, uid, id, default, context=context)
 
     def get_all_rules(self, cr, uid, structure_ids, context=None):
@@ -305,7 +304,7 @@ class hr_payslip(osv.osv):
                 return False
         return True
 
-    _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]  
+    _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -851,7 +850,7 @@ result = rules.NET > categories.NET * 0.10''',
         """
         :param rule_id: id of rule to compute
         :param localdict: dictionary containing the environement in which to compute the rule
-        :return: returns a tuple build as the base/amount computed, the quantity and the rate 
+        :return: returns a tuple build as the base/amount computed, the quantity and the rate
         :rtype: (float, float, float)
         """
         rule = self.browse(cr, uid, rule_id, context=context)
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index ae29ad324db..94ee4bdb3b2 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -356,7 +356,7 @@ class mrp_bom(osv.osv):
         if default is None:
             default = {}
         bom_data = self.read(cr, uid, id, [], context=context)
-        default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False})
+        default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False)
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
     def create(self, cr, uid, vals, context=None):
diff --git a/addons/product/product.py b/addons/product/product.py
index df0ab9122c2..8bc0789d44b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -727,7 +727,7 @@ class product_product(osv.osv):
         context_wo_lang.pop('lang', None)
         product = self.read(cr, uid, id, ['name'], context=context_wo_lang)
         default = default.copy()
-        default['name'] = product['name'] + ' (' + _('copy') + ')'
+        default.update(name=_("%s (copy)") % (product['name']))
 
         if context.get('variant',False):
             fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
diff --git a/addons/project/project.py b/addons/project/project.py
index f15656905ca..3572fd094b3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -323,7 +323,7 @@ class project(osv.osv):
         default.pop('alias_id', None)
         proj = self.browse(cr, uid, id, context=context)
         if not default.get('name', False):
-            default['name'] = proj.name + _(' (copy)')
+            default.update(name=_("%s (copy)") % (proj.name))
         res = super(project, self).copy(cr, uid, id, default, context)
         self.map_tasks(cr,uid,id,res,context)
         return res
@@ -344,7 +344,7 @@ class project(osv.osv):
                 new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d')
             context.update({'copy':True})
             new_id = self.copy(cr, uid, proj.id, default = {
-                                    'name': proj.name +_(' (copy)'),
+                                    'name':_("%s (copy)") % (proj.name),
                                     'state':'open',
                                     'date_start':new_date_start,
                                     'date':new_date_end,
@@ -694,7 +694,7 @@ class task(base_stage, osv.osv):
         if not default.get('name', False):
             default['name'] = self.browse(cr, uid, id, context=context).name or ''
             if not context.get('copy',False):
-                new_name = _("%s (copy)")%default.get('name','')
+                new_name = _("%s (copy)") % (default.get('name', ''))
                 default.update({'name':new_name})
         return super(task, self).copy_data(cr, uid, id, default, context)
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 6121acbd607..f39be0c09d5 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -355,7 +355,7 @@ class project_issue(base_stage, osv.osv):
         if not default:
             default = {}
         default = default.copy()
-        default['name'] = issue['name'] + _(' (copy)')
+        default.update(name=_('%s (copy)') % (issue['name']))
         return super(project_issue, self).copy(cr, uid, id, default=default,
                 context=context)
 
@@ -534,7 +534,7 @@ class project(osv.osv):
 
     def _get_alias_models(self, cr, uid, context=None):
         return [('project.task', "Tasks"), ("project.issue", "Issues")]
-        
+
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
@@ -557,7 +557,7 @@ class project(osv.osv):
     _constraints = [
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
-    
+
 project()
 
 class account_analytic_account(osv.osv):
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 2eab5fa6ac6..5b88d5209c8 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -138,7 +138,7 @@ class project_phase(osv.osv):
         if default is None:
             default = {}
         if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+            default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name))
         return super(project_phase, self).copy(cr, uid, id, default, context)
 
     def set_draft(self, cr, uid, ids, *args):
@@ -227,7 +227,7 @@ class project(osv.osv):
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    
+
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -250,7 +250,7 @@ class project(osv.osv):
                 # Maybe it's better to update than unlink/create if it already exists ?
                 p = getattr(project_gantt, 'Phase_%d' % (phase.id,))
 
-                self.pool.get('project.user.allocation').unlink(cr, uid, 
+                self.pool.get('project.user.allocation').unlink(cr, uid,
                     [x.id for x in phase.user_ids],
                     context=context
                 )
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 354e9c5b27c..ed21eea85cc 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -45,24 +45,24 @@ class resource_calendar(osv.osv):
     def working_hours_on_day(self, cr, uid, resource_calendar_id, day, context=None):
         """Calculates the  Working Total Hours based on Resource Calendar and
         given working day (datetime object).
-        
+
         @param resource_calendar_id: resource.calendar browse record
         @param day: datetime object
-        
+
         @return: returns the working hours (as float) men should work on the given day if is in the attendance_ids of the resource_calendar_id (i.e if that day is a working day), returns 0.0 otherwise
         """
         res = 0.0
         for working_day in resource_calendar_id.attendance_ids:
             if (int(working_day.dayofweek) + 1) == day.isoweekday():
                 res += working_day.hour_to - working_day.hour_from
-        return res 
+        return res
 
     def _get_leaves(self, cr, uid, id, resource):
-        """Private Method to Calculate resource Leaves days 
-        
+        """Private Method to Calculate resource Leaves days
+
         @param id: resource calendar id
-        @param resource: resource id for which leaves will ew calculated 
-        
+        @param resource: resource id for which leaves will ew calculated
+
         @return : returns the list of dates, where resource on leave in
                   resource.calendar.leaves object (e.g.['%Y-%m-%d', '%Y-%m-%d'])
         """
@@ -85,9 +85,9 @@ class resource_calendar(osv.osv):
         """
         Calculates the working Schedule from supplied from date to till hours
         will be satisfied  based or resource calendar id. If resource is also
-        given then it will consider the resource leave also and than will 
+        given then it will consider the resource leave also and than will
         calculates resource working schedule
-        
+
         @param dt_from: datetime object, start of working scheduled
         @param hours: float, total number working  hours needed scheduled from
                       start date
@@ -187,29 +187,29 @@ class resource_calendar(osv.osv):
 
     def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True):
         """Calculates Resource Working Internal Timing Based on Resource Calendar.
-        
+
         @param dt_from: start resource schedule calculation.
         @param hours : total number of working hours to be scheduled.
-        @param resource: optional resource id, If supplied it will take care of 
+        @param resource: optional resource id, If supplied it will take care of
                          resource leave while scheduling.
         @param byday: boolean flag bit enforce day wise scheduling
-        
+
         @return :  list of scheduled working timing  based on resource calendar.
         """
         res = self.interval_get_multi(cr, uid, [(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)], resource, byday)[(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)]
         return res
 
     def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
-        """ Calculates the Total Working hours based on given start_date to 
-        end_date, If resource id is supplied that it will consider the source 
+        """ Calculates the Total Working hours based on given start_date to
+        end_date, If resource id is supplied that it will consider the source
         leaves also in calculating the hours.
-        
+
         @param dt_from : date start to calculate hours
         @param dt_end : date end to calculate hours
         @param resource: optional resource id, If given resource leave will be
-                         considered. 
-        
-        @return : Total number of working hours based dt_from and dt_end and 
+                         considered.
+
+        @return : Total number of working hours based dt_from and dt_end and
                   resource if supplied.
         """
         if not id:
@@ -257,7 +257,7 @@ resource_calendar()
 class resource_calendar_attendance(osv.osv):
     _name = "resource.calendar.attendance"
     _description = "Work Detail"
-    
+
     _columns = {
         'name' : fields.char("Name", size=64, required=True),
         'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
@@ -266,9 +266,9 @@ class resource_calendar_attendance(osv.osv):
         'hour_to' : fields.float("Work to", required=True),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
-    
+
     _order = 'dayofweek, hour_from'
-    
+
     _defaults = {
         'dayofweek' : '0'
     }
@@ -302,12 +302,12 @@ class resource_resource(osv.osv):
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', context=context)
     }
 
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+            default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name))
         return super(resource_resource, self).copy(cr, uid, id, default, context)
 
     def generate_resources(self, cr, uid, user_ids, calendar_id, context=None):
@@ -368,7 +368,7 @@ class resource_resource(osv.osv):
         """
         if not calendar_id:
             # Calendar is not specified: working days: 24/7
-            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
+            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'),
                    ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
         resource_attendance_pool = self.pool.get('resource.calendar.attendance')
         time_range = "8:00-8:00"
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 0239f8bf32f..2426ae5eeed 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -94,7 +94,7 @@ class survey(osv.osv):
     def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
-        title = current_rec.get('title') + ' (Copy)'
+        title = _("%s (copy)") % (current_rec.get('title'))
         vals.update({'title':title})
         vals.update({'history':[],'tot_start_survey':0,'tot_comp_survey':0})
         return super(survey, self).copy(cr, uid, ids, vals, context=context)
@@ -143,7 +143,7 @@ class survey(osv.osv):
                 'nodestroy':True,
             }
         return report
-    
+
     def fill_survey(self, cr, uid, ids, context=None):
         sur_obj = self.read(cr, uid, ids,['title'], context=context)
         for sur in sur_obj:
@@ -232,7 +232,7 @@ class survey_page(osv.osv):
     def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
-        title = current_rec.get('title') + ' (Copy)'
+        title = _("%s (copy)") % (current_rec.get('title'))
         vals.update({'title':title})
         return super(survey_page, self).copy(cr, uid, ids, vals, context=context)
 

From 7d514372c0f899707cfaff66addf06103c527edd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 24 Sep 2012 18:30:21 +0200
Subject: [PATCH 091/128] [IMP] added field_changed mechanism

bzr revid: nicolas.vanhoren@openerp.com-20120924163021-ktfmi27q48o9moa8
---
 addons/web/static/src/js/view_form.js | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dff9df11140..f62b186f662 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -16,6 +16,14 @@ instance.web.form = {};
  * Events:
  *     - view_content_has_changed : when the values of the fields have changed. When
  *     this event is triggered all fields should reprocess their modifiers.
+ *     - field_changed:<field_name> : when the value of a field change, an event is triggered
+ *     named "field_changed:<field_name>" with <field_name> replaced by the name of the field.
+ *     This event is not related to the on_change mechanism of OpenERP and is always called
+ *     when the value of a field is setted or changed. This event is only triggered when the
+ *     value of the field is syntactically valid, but it can be triggered when the value
+ *     is sematically invalid (ie, when a required field is false). It is possible that an event
+ *     about a precise field is never triggered even if that field exists in the view, in that
+ *     case the value of the field is assumed to be false.
  */
 instance.web.form.FieldManagerMixin = {
     /**
@@ -26,6 +34,11 @@ instance.web.form.FieldManagerMixin = {
      * Returns true when the view is in create mode.
      */
     is_create_mode: function() {},
+    /**
+     * Returns the current value of a field present in the view. See the get_value() method
+     * method in FieldInterface for further information.
+     */
+    get_field_value: function(field_name) {},
 };
 
 instance.web.views.add('form', 'instance.web.FormView');
@@ -1056,6 +1069,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             this.translatable_fields.push(field);
         }
         field.on('changed_value', this, function() {
+            if (field.is_syntax_valid()) {
+                this.trigger('field_changed:' + name);
+            }
             if (field._inhibit_on_change_flag) {
                 return;
             }
@@ -1073,6 +1089,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     is_create_mode: function() {
         return this.get("actual_mode") === "create";
     },
+    get_field_value: function(field_name) {
+        return this.fields[field_name].get_value();
+    },
 });
 
 /**
@@ -1843,7 +1862,8 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
  *     - force_readonly: boolean, When it is true, the field should always appear
  *      in read only mode, no matter what the value of the "readonly" property can be.
  * Events:
- *     - changed_value: triggered to inform the view to check on_changes
+ *     - changed_value: triggered when the value of the field has changed. This can be due
+ *      to a user interaction or a call to set_value().
  *
  */
 instance.web.form.FieldInterface = {
@@ -3378,7 +3398,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
         }, this));
     },
     is_syntax_valid: function() {
-        if (!this.viewmanager.views[this.viewmanager.active_view])
+        if (! this.viewmanager || ! this.viewmanager.views[this.viewmanager.active_view])
             return true;
         var view = this.viewmanager.views[this.viewmanager.active_view].controller;
         switch (this.viewmanager.active_view) {

From 26780da2ef5b9b6f5a636ded6f8b21517f6b2198 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 25 Sep 2012 02:09:46 +0200
Subject: [PATCH 092/128] [FIX] fcntl not available on windows

bzr revid: al@openerp.com-20120925000946-7qikupf5rt2hiwx4
---
 openerp/service/workers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/service/workers.py b/openerp/service/workers.py
index 824bc07bb53..eae1b2839a8 100644
--- a/openerp/service/workers.py
+++ b/openerp/service/workers.py
@@ -3,7 +3,10 @@
 # TODO rename class: Multicorn -> Arbiter ?
 #-----------------------------------------------------------
 import errno
-import fcntl
+try:
+    import fcntl
+except ImportError:
+    fcntl = None
 import psutil
 import random
 import resource

From 3cc8c24ef41027d52f2293f98877c2e1834d3468 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 25 Sep 2012 04:44:36 +0000
Subject: [PATCH 093/128] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120925044436-la8k19ynfgu07eeu
---
 openerp/addons/base/i18n/ru.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index fd9f91aa09d..82e7869a7ce 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2012-09-10 14:37+0000\n"
+"PO-Revision-Date: 2012-09-24 14:20+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-20 04:40+0000\n"
-"X-Generator: Launchpad (build 15985)\n"
+"X-Launchpad-Export-Date: 2012-09-25 04:44+0000\n"
+"X-Generator: Launchpad (build 16019)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -18206,7 +18206,7 @@ msgstr "Корпорация"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_requisition
 msgid "Purchase Requisitions"
-msgstr "Требования закупки"
+msgstr "Запросы на закупку"
 
 #. module: base
 #: selection:ir.cron,interval_type:0

From 773ae0715bc0bd00ed9006abe234784c8b07265f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 25 Sep 2012 04:44:51 +0000
Subject: [PATCH 094/128] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120925044451-qfp4bi4a18pm8iy1
---
 addons/stock/i18n/nl.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 04c3875df25..e74b8c680eb 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:48+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-24 13:55+0000\n"
+"Last-Translator: Erwin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:56+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-25 04:44+0000\n"
+"X-Generator: Launchpad (build 16019)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -1179,7 +1179,7 @@ msgstr "Auteur"
 #: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr "Leveringsbon"
+msgstr "Uitgaande levering"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1791,7 +1791,7 @@ msgstr "Voorraadwaarde rekening (inkomend)"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr "Schap 2"
+msgstr "Plank 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0

From c4479b8c953d1d42ffb6f386091a2d596f8a79b1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 10:59:28 +0530
Subject: [PATCH 095/128] [IMP] base_calendar: When an invited person is
 accepted, it should appear in attendee.

bzr revid: mdi@tinyerp.com-20120925052928-0o3renqjqhzr0rno
---
 addons/base_calendar/base_calendar.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 269c30a9bea..58dbe707e7d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -568,11 +568,13 @@ property or property parameter."),
             res = cr.fetchone()
             if res:
                 partner_ids = [partner.id for partner in meeting_obj.browse(cr, uid, res[0], context=context).partner_ids]
-                if vals.user_id:
-                    partner_ids.append(vals.user_id.partner_id.id)
+                if vals.user_id and vals.user_id.partner_id:
+                    if vals.user_id.partner_id.id not in partner_ids:
+                        partner_ids.append(vals.user_id.partner_id.id)
                     meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
                 if vals.partner_id:
-                    partner_ids.append(vals.partner_id.id)
+                    if vals.partner_id.id not in partner_ids:
+                        partner_ids.append(vals.partner_id.id)
                     meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
 
         return True

From 5e7deadf24521caeae5566253d85a91ff3c385ba Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 25 Sep 2012 11:56:57 +0530
Subject: [PATCH 096/128] [IMP] stock: update warning message for serial number

bzr revid: cha@tinyerp.com-20120925062657-bz3ho9tx3oriuamy
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 03d8a802f4f..b5a6c74826a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1839,7 +1839,7 @@ class stock_move(osv.osv):
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
                 'title': _('Insufficient Stock for Serial Number !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
+                'message': _('You are moving %.2f %s but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 

From 2ea34c71f8e9a7ae84e6cff31862469027e19dd8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 12:26:19 +0530
Subject: [PATCH 097/128] [IMP] product : Override create and write method in
 order to check 'Min margin' and 'Max margin'.

bzr revid: mdi@tinyerp.com-20120925065619-g2n8h78ioou3q7ch
---
 addons/product/pricelist.py | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 14392c79f10..c011dcd3aa6 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -436,23 +436,42 @@ class product_pricelist_item(osv.osv):
         return {}
     
     def create(self, cr, uid, vals, context=None):
-        name = vals.get('name', '')
+        name = vals.get('name', False)
+        sequence = vals.get('sequence', False)
         price_min_margin = vals.get('price_min_margin', 0.0)
         price_max_margin = vals.get('price_max_margin', 0.0)
         if price_min_margin > price_max_margin:
-            raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule!') % (name))
+            if name:
+                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule: \'%s\'(sequence: %s).') % (name, sequence))
+            else:
+                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule having sequence %s.') % (sequence))
         return super(product_pricelist_item, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-        price_min_margin = vals.get('price_min_margin', 0.0)
-        price_max_margin = vals.get('price_max_margin', 0.0)
         for rule in self.browse(cr, uid, ids, context=context):
-            name = rule.name
+            if vals.get('name', False):
+                name = vals['name']
+            else:
+                name = rule.name
+            if vals.get('sequence', False):
+                sequence = vals['sequence']
+            else:
+                sequence = rule.sequence
+            if vals.get('price_min_margin', False):
+                price_min_margin = vals['price_min_margin']
+            else:
+                price_min_margin = rule.price_min_margin
+            if vals.get('price_max_margin', False):
+                price_max_margin = vals['price_max_margin']
+            else:
+                price_max_margin = rule.price_max_margin
             if price_min_margin > price_max_margin:
-                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin in \'%s\' pricelist rule!') % (name))
+                if name:
+                    raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule: \'%s\'(sequence: %s).') % (name, sequence))
+                else:
+                    raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule having sequence %s.') % (sequence))
         return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context)
 
-
 product_pricelist_item()
 
 

From 5165bf9c8584b64df389d557aac138bca7ffc197 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 25 Sep 2012 09:10:40 +0200
Subject: [PATCH 098/128] [FIX] account: fixed traceback when emptying the
 journal of a bank statement

bzr revid: qdp-launchpad@openerp.com-20120925071040-m9054w0qtt26ltjt
---
 addons/account/account_bank_statement.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 2dc7f96768f..9889eadf387 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -447,11 +447,13 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
-        cr.execute('SELECT balance_end_real \
-                FROM account_bank_statement \
-                WHERE journal_id = %s AND NOT state = %s \
-                ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
-        res = cr.fetchone()
+        res = False
+        if journal_id:
+            cr.execute('SELECT balance_end_real \
+                    FROM account_bank_statement \
+                    WHERE journal_id = %s AND NOT state = %s \
+                    ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
+            res = cr.fetchone()
         return res and res[0] or 0.0
 
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):

From 974935a6f87195ee75a02fc20f88edc400133920 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 12:41:37 +0530
Subject: [PATCH 099/128] [IMP] product : Override create and write method in
 order to check 'Min margin' and 'Max margin'.

bzr revid: mdi@tinyerp.com-20120925071137-dchr17sj1nzxginy
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index c011dcd3aa6..d44899d0688 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -449,7 +449,7 @@ class product_pricelist_item(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         for rule in self.browse(cr, uid, ids, context=context):
-            if vals.get('name', False):
+            if vals.has_key('name'):
                 name = vals['name']
             else:
                 name = rule.name

From 5d910cc881691510df33f223aceb40fc2cda0768 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 12:57:01 +0530
Subject: [PATCH 100/128] [IMP] product : Override create and write method in
 order to check 'Min margin' and 'Max margin'.

bzr revid: mdi@tinyerp.com-20120925072701-6nus286naxzujp1e
---
 addons/product/pricelist.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index d44899d0688..a0d8ce8170d 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -448,22 +448,20 @@ class product_pricelist_item(osv.osv):
         return super(product_pricelist_item, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
+        name = None
+        if vals.has_key('name'):
+            name = vals['name']
+        sequence = vals.get('sequence', False)
+        price_min_margin = vals.get('price_min_margin', 0.0)
+        price_max_margin = vals.get('price_max_margin', 0.0)
         for rule in self.browse(cr, uid, ids, context=context):
-            if vals.has_key('name'):
-                name = vals['name']
-            else:
+            if name is None:
                 name = rule.name
-            if vals.get('sequence', False):
-                sequence = vals['sequence']
-            else:
+            if not sequence:
                 sequence = rule.sequence
-            if vals.get('price_min_margin', False):
-                price_min_margin = vals['price_min_margin']
-            else:
+            if not price_min_margin:
                 price_min_margin = rule.price_min_margin
-            if vals.get('price_max_margin', False):
-                price_max_margin = vals['price_max_margin']
-            else:
+            if not price_max_margin:
                 price_max_margin = rule.price_max_margin
             if price_min_margin > price_max_margin:
                 if name:

From 316cd0aad868646ebd3cc4a79ace19f7ed6cb364 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 25 Sep 2012 09:32:01 +0200
Subject: [PATCH 101/128] [REN] renamed account_coda module into l10n_be_coda

bzr revid: qdp-launchpad@openerp.com-20120925073201-bgc5bwjfdjrktrct
---
 addons/l10n_be/__openerp__.py                        |  2 +-
 addons/{account_coda => l10n_be_coda}/README.txt     |  0
 addons/{account_coda => l10n_be_coda}/__init__.py    |  2 +-
 addons/{account_coda => l10n_be_coda}/__openerp__.py | 12 ++++++------
 .../i18n/account_coda.pot                            |  0
 addons/{account_coda => l10n_be_coda}/i18n/ar.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/bg.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/ca.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/da.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/de.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/el.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/en_GB.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/es.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/es_CR.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/es_EC.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/es_MX.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/es_PY.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/es_VE.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/et.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/fa.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/fi.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/fr.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/gl.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/hr.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/hu.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/it.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/ja.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/lv.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/mn.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/nb.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/nl.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/nl_BE.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/pl.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/pt.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/pt_BR.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/ro.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/ru.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/sl.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/sq.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/sr.po     |  0
 .../{account_coda => l10n_be_coda}/i18n/sr@latin.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/sv.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/tr.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/vi.po     |  0
 addons/{account_coda => l10n_be_coda}/i18n/zh_CN.po  |  0
 addons/{account_coda => l10n_be_coda}/i18n/zh_TW.po  |  0
 .../account_coda.py => l10n_be_coda/l10n_be_coda.py} |  0
 .../l10n_be_coda_comm_type.xml}                      |  0
 .../l10n_be_coda_trans_category.xml}                 |  0
 .../l10n_be_coda_trans_code.xml}                     |  0
 .../l10n_be_coda_trans_type.xml}                     |  0
 .../l10n_be_coda_view.xml}                           |  0
 .../l10n_be_coda_wizard.xml}                         |  0
 .../security/account_security.xml                    |  0
 .../security/ir.model.access.csv                     |  0
 .../Ontvangen_CODA.2011-01-11-18.59.15.txt           |  0
 .../wizard/__init__.py                               |  0
 .../wizard/account_coda_import.py                    | 10 +++++-----
 addons/l10n_ec/__openerp__.py                        |  1 -
 59 files changed, 13 insertions(+), 14 deletions(-)
 rename addons/{account_coda => l10n_be_coda}/README.txt (100%)
 rename addons/{account_coda => l10n_be_coda}/__init__.py (98%)
 rename addons/{account_coda => l10n_be_coda}/__openerp__.py (95%)
 rename addons/{account_coda => l10n_be_coda}/i18n/account_coda.pot (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/ar.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/bg.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/ca.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/da.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/de.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/el.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/en_GB.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/es.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/es_CR.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/es_EC.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/es_MX.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/es_PY.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/es_VE.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/et.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/fa.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/fi.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/fr.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/gl.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/hr.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/hu.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/it.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/ja.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/lv.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/mn.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/nb.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/nl.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/nl_BE.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/pl.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/pt.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/pt_BR.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/ro.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/ru.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/sl.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/sq.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/sr.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/sr@latin.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/sv.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/tr.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/vi.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/zh_CN.po (100%)
 rename addons/{account_coda => l10n_be_coda}/i18n/zh_TW.po (100%)
 rename addons/{account_coda/account_coda.py => l10n_be_coda/l10n_be_coda.py} (100%)
 rename addons/{account_coda/account_coda_comm_type.xml => l10n_be_coda/l10n_be_coda_comm_type.xml} (100%)
 rename addons/{account_coda/account_coda_trans_category.xml => l10n_be_coda/l10n_be_coda_trans_category.xml} (100%)
 rename addons/{account_coda/account_coda_trans_code.xml => l10n_be_coda/l10n_be_coda_trans_code.xml} (100%)
 rename addons/{account_coda/account_coda_trans_type.xml => l10n_be_coda/l10n_be_coda_trans_type.xml} (100%)
 rename addons/{account_coda/account_coda_view.xml => l10n_be_coda/l10n_be_coda_view.xml} (100%)
 rename addons/{account_coda/account_coda_wizard.xml => l10n_be_coda/l10n_be_coda_wizard.xml} (100%)
 rename addons/{account_coda => l10n_be_coda}/security/account_security.xml (100%)
 rename addons/{account_coda => l10n_be_coda}/security/ir.model.access.csv (100%)
 rename addons/{account_coda => l10n_be_coda}/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt (100%)
 rename addons/{account_coda => l10n_be_coda}/wizard/__init__.py (100%)
 rename addons/{account_coda => l10n_be_coda}/wizard/account_coda_import.py (99%)

diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 4d301bfafe4..c2ccf511e3c 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -57,7 +57,7 @@ Wizards provided by this module:
         'base_vat',
         'base_iban',
         'account_chart',
-        'account_coda',
+        'l10n_be_coda',
     ],
     'data': [
         'account_financial_report.xml',
diff --git a/addons/account_coda/README.txt b/addons/l10n_be_coda/README.txt
similarity index 100%
rename from addons/account_coda/README.txt
rename to addons/l10n_be_coda/README.txt
diff --git a/addons/account_coda/__init__.py b/addons/l10n_be_coda/__init__.py
similarity index 98%
rename from addons/account_coda/__init__.py
rename to addons/l10n_be_coda/__init__.py
index 2750c8ff4a8..4a58b8ad059 100644
--- a/addons/account_coda/__init__.py
+++ b/addons/l10n_be_coda/__init__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import account_coda
+import l10n_be_coda
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py
similarity index 95%
rename from addons/account_coda/__openerp__.py
rename to addons/l10n_be_coda/__openerp__.py
index 03527eaa2ec..bd323478886 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/l10n_be_coda/__openerp__.py
@@ -93,14 +93,14 @@ If required, you can manually adjust the descriptions via the CODA configuration
     'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
     'demo': [],
     'data': [
-        'account_coda_trans_type.xml',
-        'account_coda_trans_code.xml',
-        'account_coda_trans_category.xml',
-        'account_coda_comm_type.xml',
+        'l10n_be_coda_trans_type.xml',
+        'l10n_be_coda_trans_code.xml',
+        'l10n_be_coda_trans_category.xml',
+        'l10n_be_coda_comm_type.xml',
         'security/ir.model.access.csv',
         'security/account_security.xml',
-        'account_coda_wizard.xml',
-        'account_coda_view.xml',
+        'l10n_be_coda_wizard.xml',
+        'l10n_be_coda_view.xml',
     ],
     'auto_install': False,
     'installable': True,
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/l10n_be_coda/i18n/account_coda.pot
similarity index 100%
rename from addons/account_coda/i18n/account_coda.pot
rename to addons/l10n_be_coda/i18n/account_coda.pot
diff --git a/addons/account_coda/i18n/ar.po b/addons/l10n_be_coda/i18n/ar.po
similarity index 100%
rename from addons/account_coda/i18n/ar.po
rename to addons/l10n_be_coda/i18n/ar.po
diff --git a/addons/account_coda/i18n/bg.po b/addons/l10n_be_coda/i18n/bg.po
similarity index 100%
rename from addons/account_coda/i18n/bg.po
rename to addons/l10n_be_coda/i18n/bg.po
diff --git a/addons/account_coda/i18n/ca.po b/addons/l10n_be_coda/i18n/ca.po
similarity index 100%
rename from addons/account_coda/i18n/ca.po
rename to addons/l10n_be_coda/i18n/ca.po
diff --git a/addons/account_coda/i18n/da.po b/addons/l10n_be_coda/i18n/da.po
similarity index 100%
rename from addons/account_coda/i18n/da.po
rename to addons/l10n_be_coda/i18n/da.po
diff --git a/addons/account_coda/i18n/de.po b/addons/l10n_be_coda/i18n/de.po
similarity index 100%
rename from addons/account_coda/i18n/de.po
rename to addons/l10n_be_coda/i18n/de.po
diff --git a/addons/account_coda/i18n/el.po b/addons/l10n_be_coda/i18n/el.po
similarity index 100%
rename from addons/account_coda/i18n/el.po
rename to addons/l10n_be_coda/i18n/el.po
diff --git a/addons/account_coda/i18n/en_GB.po b/addons/l10n_be_coda/i18n/en_GB.po
similarity index 100%
rename from addons/account_coda/i18n/en_GB.po
rename to addons/l10n_be_coda/i18n/en_GB.po
diff --git a/addons/account_coda/i18n/es.po b/addons/l10n_be_coda/i18n/es.po
similarity index 100%
rename from addons/account_coda/i18n/es.po
rename to addons/l10n_be_coda/i18n/es.po
diff --git a/addons/account_coda/i18n/es_CR.po b/addons/l10n_be_coda/i18n/es_CR.po
similarity index 100%
rename from addons/account_coda/i18n/es_CR.po
rename to addons/l10n_be_coda/i18n/es_CR.po
diff --git a/addons/account_coda/i18n/es_EC.po b/addons/l10n_be_coda/i18n/es_EC.po
similarity index 100%
rename from addons/account_coda/i18n/es_EC.po
rename to addons/l10n_be_coda/i18n/es_EC.po
diff --git a/addons/account_coda/i18n/es_MX.po b/addons/l10n_be_coda/i18n/es_MX.po
similarity index 100%
rename from addons/account_coda/i18n/es_MX.po
rename to addons/l10n_be_coda/i18n/es_MX.po
diff --git a/addons/account_coda/i18n/es_PY.po b/addons/l10n_be_coda/i18n/es_PY.po
similarity index 100%
rename from addons/account_coda/i18n/es_PY.po
rename to addons/l10n_be_coda/i18n/es_PY.po
diff --git a/addons/account_coda/i18n/es_VE.po b/addons/l10n_be_coda/i18n/es_VE.po
similarity index 100%
rename from addons/account_coda/i18n/es_VE.po
rename to addons/l10n_be_coda/i18n/es_VE.po
diff --git a/addons/account_coda/i18n/et.po b/addons/l10n_be_coda/i18n/et.po
similarity index 100%
rename from addons/account_coda/i18n/et.po
rename to addons/l10n_be_coda/i18n/et.po
diff --git a/addons/account_coda/i18n/fa.po b/addons/l10n_be_coda/i18n/fa.po
similarity index 100%
rename from addons/account_coda/i18n/fa.po
rename to addons/l10n_be_coda/i18n/fa.po
diff --git a/addons/account_coda/i18n/fi.po b/addons/l10n_be_coda/i18n/fi.po
similarity index 100%
rename from addons/account_coda/i18n/fi.po
rename to addons/l10n_be_coda/i18n/fi.po
diff --git a/addons/account_coda/i18n/fr.po b/addons/l10n_be_coda/i18n/fr.po
similarity index 100%
rename from addons/account_coda/i18n/fr.po
rename to addons/l10n_be_coda/i18n/fr.po
diff --git a/addons/account_coda/i18n/gl.po b/addons/l10n_be_coda/i18n/gl.po
similarity index 100%
rename from addons/account_coda/i18n/gl.po
rename to addons/l10n_be_coda/i18n/gl.po
diff --git a/addons/account_coda/i18n/hr.po b/addons/l10n_be_coda/i18n/hr.po
similarity index 100%
rename from addons/account_coda/i18n/hr.po
rename to addons/l10n_be_coda/i18n/hr.po
diff --git a/addons/account_coda/i18n/hu.po b/addons/l10n_be_coda/i18n/hu.po
similarity index 100%
rename from addons/account_coda/i18n/hu.po
rename to addons/l10n_be_coda/i18n/hu.po
diff --git a/addons/account_coda/i18n/it.po b/addons/l10n_be_coda/i18n/it.po
similarity index 100%
rename from addons/account_coda/i18n/it.po
rename to addons/l10n_be_coda/i18n/it.po
diff --git a/addons/account_coda/i18n/ja.po b/addons/l10n_be_coda/i18n/ja.po
similarity index 100%
rename from addons/account_coda/i18n/ja.po
rename to addons/l10n_be_coda/i18n/ja.po
diff --git a/addons/account_coda/i18n/lv.po b/addons/l10n_be_coda/i18n/lv.po
similarity index 100%
rename from addons/account_coda/i18n/lv.po
rename to addons/l10n_be_coda/i18n/lv.po
diff --git a/addons/account_coda/i18n/mn.po b/addons/l10n_be_coda/i18n/mn.po
similarity index 100%
rename from addons/account_coda/i18n/mn.po
rename to addons/l10n_be_coda/i18n/mn.po
diff --git a/addons/account_coda/i18n/nb.po b/addons/l10n_be_coda/i18n/nb.po
similarity index 100%
rename from addons/account_coda/i18n/nb.po
rename to addons/l10n_be_coda/i18n/nb.po
diff --git a/addons/account_coda/i18n/nl.po b/addons/l10n_be_coda/i18n/nl.po
similarity index 100%
rename from addons/account_coda/i18n/nl.po
rename to addons/l10n_be_coda/i18n/nl.po
diff --git a/addons/account_coda/i18n/nl_BE.po b/addons/l10n_be_coda/i18n/nl_BE.po
similarity index 100%
rename from addons/account_coda/i18n/nl_BE.po
rename to addons/l10n_be_coda/i18n/nl_BE.po
diff --git a/addons/account_coda/i18n/pl.po b/addons/l10n_be_coda/i18n/pl.po
similarity index 100%
rename from addons/account_coda/i18n/pl.po
rename to addons/l10n_be_coda/i18n/pl.po
diff --git a/addons/account_coda/i18n/pt.po b/addons/l10n_be_coda/i18n/pt.po
similarity index 100%
rename from addons/account_coda/i18n/pt.po
rename to addons/l10n_be_coda/i18n/pt.po
diff --git a/addons/account_coda/i18n/pt_BR.po b/addons/l10n_be_coda/i18n/pt_BR.po
similarity index 100%
rename from addons/account_coda/i18n/pt_BR.po
rename to addons/l10n_be_coda/i18n/pt_BR.po
diff --git a/addons/account_coda/i18n/ro.po b/addons/l10n_be_coda/i18n/ro.po
similarity index 100%
rename from addons/account_coda/i18n/ro.po
rename to addons/l10n_be_coda/i18n/ro.po
diff --git a/addons/account_coda/i18n/ru.po b/addons/l10n_be_coda/i18n/ru.po
similarity index 100%
rename from addons/account_coda/i18n/ru.po
rename to addons/l10n_be_coda/i18n/ru.po
diff --git a/addons/account_coda/i18n/sl.po b/addons/l10n_be_coda/i18n/sl.po
similarity index 100%
rename from addons/account_coda/i18n/sl.po
rename to addons/l10n_be_coda/i18n/sl.po
diff --git a/addons/account_coda/i18n/sq.po b/addons/l10n_be_coda/i18n/sq.po
similarity index 100%
rename from addons/account_coda/i18n/sq.po
rename to addons/l10n_be_coda/i18n/sq.po
diff --git a/addons/account_coda/i18n/sr.po b/addons/l10n_be_coda/i18n/sr.po
similarity index 100%
rename from addons/account_coda/i18n/sr.po
rename to addons/l10n_be_coda/i18n/sr.po
diff --git a/addons/account_coda/i18n/sr@latin.po b/addons/l10n_be_coda/i18n/sr@latin.po
similarity index 100%
rename from addons/account_coda/i18n/sr@latin.po
rename to addons/l10n_be_coda/i18n/sr@latin.po
diff --git a/addons/account_coda/i18n/sv.po b/addons/l10n_be_coda/i18n/sv.po
similarity index 100%
rename from addons/account_coda/i18n/sv.po
rename to addons/l10n_be_coda/i18n/sv.po
diff --git a/addons/account_coda/i18n/tr.po b/addons/l10n_be_coda/i18n/tr.po
similarity index 100%
rename from addons/account_coda/i18n/tr.po
rename to addons/l10n_be_coda/i18n/tr.po
diff --git a/addons/account_coda/i18n/vi.po b/addons/l10n_be_coda/i18n/vi.po
similarity index 100%
rename from addons/account_coda/i18n/vi.po
rename to addons/l10n_be_coda/i18n/vi.po
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/l10n_be_coda/i18n/zh_CN.po
similarity index 100%
rename from addons/account_coda/i18n/zh_CN.po
rename to addons/l10n_be_coda/i18n/zh_CN.po
diff --git a/addons/account_coda/i18n/zh_TW.po b/addons/l10n_be_coda/i18n/zh_TW.po
similarity index 100%
rename from addons/account_coda/i18n/zh_TW.po
rename to addons/l10n_be_coda/i18n/zh_TW.po
diff --git a/addons/account_coda/account_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
similarity index 100%
rename from addons/account_coda/account_coda.py
rename to addons/l10n_be_coda/l10n_be_coda.py
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/l10n_be_coda/l10n_be_coda_comm_type.xml
similarity index 100%
rename from addons/account_coda/account_coda_comm_type.xml
rename to addons/l10n_be_coda/l10n_be_coda_comm_type.xml
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/l10n_be_coda/l10n_be_coda_trans_category.xml
similarity index 100%
rename from addons/account_coda/account_coda_trans_category.xml
rename to addons/l10n_be_coda/l10n_be_coda_trans_category.xml
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/l10n_be_coda/l10n_be_coda_trans_code.xml
similarity index 100%
rename from addons/account_coda/account_coda_trans_code.xml
rename to addons/l10n_be_coda/l10n_be_coda_trans_code.xml
diff --git a/addons/account_coda/account_coda_trans_type.xml b/addons/l10n_be_coda/l10n_be_coda_trans_type.xml
similarity index 100%
rename from addons/account_coda/account_coda_trans_type.xml
rename to addons/l10n_be_coda/l10n_be_coda_trans_type.xml
diff --git a/addons/account_coda/account_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml
similarity index 100%
rename from addons/account_coda/account_coda_view.xml
rename to addons/l10n_be_coda/l10n_be_coda_view.xml
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml
similarity index 100%
rename from addons/account_coda/account_coda_wizard.xml
rename to addons/l10n_be_coda/l10n_be_coda_wizard.xml
diff --git a/addons/account_coda/security/account_security.xml b/addons/l10n_be_coda/security/account_security.xml
similarity index 100%
rename from addons/account_coda/security/account_security.xml
rename to addons/l10n_be_coda/security/account_security.xml
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/l10n_be_coda/security/ir.model.access.csv
similarity index 100%
rename from addons/account_coda/security/ir.model.access.csv
rename to addons/l10n_be_coda/security/ir.model.access.csv
diff --git a/addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
similarity index 100%
rename from addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
rename to addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
diff --git a/addons/account_coda/wizard/__init__.py b/addons/l10n_be_coda/wizard/__init__.py
similarity index 100%
rename from addons/account_coda/wizard/__init__.py
rename to addons/l10n_be_coda/wizard/__init__.py
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
similarity index 99%
rename from addons/account_coda/wizard/account_coda_import.py
rename to addons/l10n_be_coda/wizard/account_coda_import.py
index bb46593b158..ca89cf78325 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -942,7 +942,7 @@ class account_coda_import(osv.osv_memory):
     def action_open_coda_statements(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        module, xml_id = 'account_coda', 'action_coda_bank_statements'
+        module, xml_id = 'l10n_be_coda', 'action_coda_bank_statements'
         res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id)
         action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context)
         domain = eval(action.get('domain') or '[]')
@@ -973,9 +973,9 @@ def str2float(str):
         return 0.0
 
 def list2float(lst):
-            try:
-                return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
-            except:
-                return 0.0
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index f27b76a5bca..62a32a526c3 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -33,7 +33,6 @@ Accounting chart and localization for Ecuador.
         'base_vat',
         'base_iban',
         'account_chart',
-        'account_coda',
     ],
     'data': [
         'account_tax_code.xml',

From e3003f56b295c1b5f1e6a474d566f6ec12c5eec4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 25 Sep 2012 09:56:45 +0200
Subject: [PATCH 102/128] [IMP] point of sale, 10 firsts clicks cleaned

bzr revid: fp@tinyerp.com-20120925075645-9ydq1dh6usmwyknx
---
 addons/account/demo/account_minimal.xml     | 7 ++++++-
 addons/point_of_sale/point_of_sale_view.xml | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 8f879d6b465..0eb7b348069 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -392,7 +392,12 @@
             <field name="loss_account_id" model="account.account" ref="rsa" />
             <field name="internal_account_id" model="account.account" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
-            <field name="cash_control" eval="True" />
+            <!--
+                 Usually, cash payment methods requires a control at opening and closing.
+                 Bot for demo data, it's better to avoid the control step so that people
+                 that test OpenERP arrive directly in the touchscreen UI.
+            -->
+            <field name="cash_control" eval="False"/>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 9c92145ed89..d9836527013 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -863,6 +863,8 @@
                 <form string="Point of Sale Session" version="7.0">
                     <header>
                         <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
+                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"
+                            class="oe_highlight"/>
                         <button name="cashbox_control" type="workflow" string="End of Session"
                             attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '!=', 'opened')]}" 
                             class="oe_highlight" />
@@ -871,7 +873,6 @@
                             class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
                             class="oe_highlight" />
-                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"/>
                         <div class="oe_right">
                             <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
                         </div>

From ab15f5c146b5d86915c08f27dcdb538da5895f4f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 25 Sep 2012 09:58:12 +0200
Subject: [PATCH 103/128] [IMP] summary agenda

bzr revid: fp@tinyerp.com-20120925075812-y4mwzrsag8bhtmeu
---
 addons/base_calendar/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index b1afacfbd01..1e17a504919 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -23,6 +23,7 @@
     'name': 'Calendar',
     'version': '1.0',
     'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
+    'summary': 'Personnal & Shared Agenda',
     'description': """
 This is a full-featured calendar system.
 ========================================
@@ -30,7 +31,6 @@ This is a full-featured calendar system.
 It supports:
 ------------
     - Calendar of events
-    - Alerts (create requests)
     - Recurring events
     - Invitations to people
 

From b95cb2713622f44b6658703b2087d7a366c08422 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 25 Sep 2012 10:22:56 +0200
Subject: [PATCH 104/128] [IMP] CRM meeting cleaning form view

bzr revid: fp@tinyerp.com-20120925082256-9nh4h4kyql7xywgt
---
 addons/base_calendar/base_calendar.py     |  2 +-
 addons/base_calendar/crm_meeting_view.xml | 52 +++++++++++------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 85199d09c60..73811d5ba71 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -996,7 +996,7 @@ class calendar_event(osv.osv):
         'sequence': fields.integer('Sequence'),
         'name': fields.char('Description', size=64, required=False, states={'done': [('readonly', True)]}),
         'date': fields.datetime('Date', states={'done': [('readonly', True)]}, required=True,),
-        'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}, required=True,),
+        'date_deadline': fields.datetime('End Date', states={'done': [('readonly', True)]}, required=True,),
         'create_date': fields.datetime('Created', readonly=True),
         'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b963de68130..03d8bd7264e 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -87,36 +87,38 @@
                     <page string="Meeting Detail">
                         <group>
                             <group>
-                                <field name="user_id"/>
+                                <field name="date" string="Starting at"/>
+                                <label for="duration" attrs="{'invisible': [('allday','=',True)]}"/>
+                                <div attrs="{'invisible': [('allday','=',True)]}">
+                                    <field name="duration" widget="float_time"
+                                        on_change="onchange_dates(date,duration,False,allday)"
+                                        class="oe_inline"/> hours
+                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                                    <label for="allday" string="All Day?"/>)
+                                </div>
+                                <field name="date_deadline" groups="base.group_no_one"
+                                    attrs="{'invisible': [('allday','=',True)]}"
+                                    on_change="onchange_dates(date,False,date_deadline)"/>
+                            </group>
+                            <group>
+                                <field name="user_id" groups="base.group_no_one"/>
                                 <field name="categ_ids" widget="many2many_tags"/>
                                 <field name="location"/>
                                 <field name="organizer" groups="base.group_no_one"/>
                             </group>
+
+                        </group>
+                        <label for="description"/>
+                        <field name="description"/>
+                    </page>
+                    <page string="Options">
+                        <group>
                             <group>
-                                <label for="date" string="Starting at"/>
-                                <div>
-                                    <field name="date"/>
-                                    <span attrs="{'invisible': [('allday','=',True)]}">
-				        (<field name="duration" widget="float_time"
-                                        on_change="onchange_dates(date,duration,False,allday)"
-                                        class="oe_inline"/> hours)
-			            </span>
-
-                                </div>
-
-                                <label for="date_deadline" />
-                                <div>
-                                    <field name="date_deadline" 
-                                        string="End Date" attrs="{'invisible': [('allday','=',True)]}"
-                                        on_change="onchange_dates(date,False,date_deadline)"/>
-                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
-                                    <label for="allday" string="All Day?"/>)
-                                </div>
-                                    <field name="recurrency"
-                                        attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
+                                <field name="recurrency"
+                                    attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
                             </group>
                             <group>
-                                <field name="alarm_id" widget="selection" />
+                                <field name="alarm_id" widget="selection" groups="base.group_no_one"/>
                                 <field name="class"/>
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>
@@ -136,7 +138,7 @@
                                     <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}" class="oe_inline"/>
                                 </div>
                                 <label string="Select Weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}"/>
-                                <group col="4" colspan="1" name="weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                <group col="2" colspan="1" name="weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                     <field name="mo" />
                                     <field name="tu" />
                                     <field name="we" />
@@ -162,8 +164,6 @@
 
                             </group>
                         </group>
-                        <label for="description"/>
-                        <field name="description"/>
                     </page>
                     <page string="Invitation Detail">
                         <button string="Invite People"

From bdddd468317cf88ba2746b32a4638a22f0e1990b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 25 Sep 2012 10:29:29 +0200
Subject: [PATCH 105/128] [FIX] open meeting instead of events

bzr revid: fp@tinyerp.com-20120925082929-42h2a1cftq9cp0oa
---
 addons/base_calendar/base_calendar_view.xml | 1 -
 addons/base_calendar/crm_meeting_view.xml   | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d374c2e6d88..0ea2be4f37f 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -428,6 +428,5 @@
                 name="Events" parent="base.menu_calendar_configuration"
                 sequence="15" action="action_view_event"/>
 
-        <menuitem name="Agenda" id="mail_menu_agenda" parent="mail.mail_my_stuff" sequence="10" action="action_view_event"/>
      </data>
  </openerp>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 03d8bd7264e..fc936f416ad 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -339,7 +339,11 @@
     </record>
 
     <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Meetings" action="action_crm_meeting"/>
+        name="Agenda" action="action_crm_meeting"/>
+
+    <menuitem name="Agenda"
+        id="mail_menu_agenda" parent="mail.mail_my_stuff"
+        sequence="10" action="action_crm_meeting"/>
 
     </data>
 </openerp>

From 0272743218e461dce117ce3ecc95df32de7ff3a3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 25 Sep 2012 10:38:11 +0200
Subject: [PATCH 106/128] [FIX] group creation by normal employees

bzr revid: fp@tinyerp.com-20120925083811-mroiaj30jnc2y9yr
---
 addons/mail/mail_group.py       | 7 ++++---
 addons/mail/mail_group_view.xml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index fe0cc3950ae..c28b6ae504a 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -116,7 +116,8 @@ class mail_group(osv.Model):
                           model_name=self._name, context=context)
             vals['alias_id'] = alias_id
 
-        mail_group_id = super(mail_group, self).create(cr, uid, vals, context)
+        self.check_access_rights(cr, uid, 'create')
+        mail_group_id = super(mail_group, self).create(cr, 1, vals, context)
 
         # Create client action for this group and link the menu to it
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
@@ -130,8 +131,8 @@ class mail_group(osv.Model):
                 'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
-            newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
-            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
+            newref = cobj.copy(cr, 1, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
+            self.write(cr, 1, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
 
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 31beba80ecc..a551a549b06 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -61,7 +61,7 @@
                             <div class="oe_edit_only">
                                 <label for="name" string="Group Name"/>
                             </div>
-                            <h1><field name="name"/></h1>
+                            <h1><field name="name" readonly="0"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_id" invisible="1" required="0"/>
                                     <label for="alias_name" class="oe_edit_only"/>

From 48100d36df5c20089b70648c3f2c9a6ac60a97fe Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 25 Sep 2012 14:28:38 +0530
Subject: [PATCH 107/128] [IMP] product: put the formula exact bellow the field

bzr revid: cha@tinyerp.com-20120925085838-1qjjr88azzuqk0f7
---
 addons/product/product_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 28878379ab9..2d153fa9d06 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -465,11 +465,13 @@
                         </group>
                         <group>
                             <field name="uom_type" on_change="onchange_type(uom_type)"/>
+                            <label string=""/>
+                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                            <label string=""/>
+                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                             <field name="rounding"/>
                             <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
                             <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>

From c6f366b3bb0943f0fa2dbf7faf6bee147929dd42 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 25 Sep 2012 11:48:56 +0200
Subject: [PATCH 109/128] [IMP] mail, polishing last fp commit: replaced '1' in
 method calls by SUPERUSER_ID + added comment

bzr revid: qdp-launchpad@openerp.com-20120925094856-zxm1ppx5xk8iropn
---
 addons/mail/mail_group.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index c28b6ae504a..60e3b9bd3af 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -23,7 +23,7 @@ import openerp
 import openerp.tools as tools
 from osv import osv
 from osv import fields
-
+from openerp import SUPERUSER_ID
 
 class mail_group(osv.Model):
     """ A mail_group is a collection of users sharing messages in a discussion
@@ -116,8 +116,10 @@ class mail_group(osv.Model):
                           model_name=self._name, context=context)
             vals['alias_id'] = alias_id
 
+        #check access rights for the current user, then create as SUPERUSER because the object inherits
+        #ir.ui.menu (for which normal users do not have creation rights)
         self.check_access_rights(cr, uid, 'create')
-        mail_group_id = super(mail_group, self).create(cr, 1, vals, context)
+        mail_group_id = super(mail_group, self).create(cr, SUPERUSER_ID, vals, context=context)
 
         # Create client action for this group and link the menu to it
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
@@ -131,8 +133,8 @@ class mail_group(osv.Model):
                 'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
-            newref = cobj.copy(cr, 1, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
-            self.write(cr, 1, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
+            newref = cobj.copy(cr, SUPERUSER_ID, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
+            self.write(cr, SUPERUSER_ID, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
 

From 624c34cb789f25355a5addf4f7d38bac56f41380 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 15:26:35 +0530
Subject: [PATCH 110/128] [FIX] crm : When I have created new Lead without
 selecting customer, After that convert to opportunity and that time I have
 select Link to an exisiting customer and select customer and create
 Opportunity. In that Opportunity Form view  i can not see email and phone of
 that customer.

bzr revid: mdi@tinyerp.com-20120925095635-93grheoj3oyh0o2i
---
 addons/crm/crm_lead.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 550dc04e6d9..ae862e4c6c0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -588,6 +588,16 @@ class crm_lead(base_stage, format_address, osv.osv):
         else:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
         stage_id = stage_ids and stage_ids[0] or False
+        email = False
+        phone = False
+        if customer and customer.email:
+            email = customer.email
+        else:
+            email = lead.email_from
+        if customer and customer.phone:
+            phone = customer.phone
+        else:
+            phone = lead.phone
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -598,6 +608,8 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'email_from': email,
+                'phone': phone,
         }
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):

From 6a5f24f92d4249183c78cfa6c473398a9757ff29 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 15:34:57 +0530
Subject: [PATCH 111/128] [IMP] product : Improved the tooltip.

bzr revid: mdi@tinyerp.com-20120925100457-o1yw9k2opljaz4m6
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index a0d8ce8170d..6403a24ae81 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -401,7 +401,7 @@ class product_pricelist_item(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
         'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
 
-        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells quantity equal to or more than this quantity set."),
+        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells equal to or more than this quantity."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
         'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),

From 26ba2b8c0f9961d73ea78d7b69ec5992661d786e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 15:48:50 +0530
Subject: [PATCH 112/128] [IMP] product : Improved the tooltip.

bzr revid: mdi@tinyerp.com-20120925101850-q9soju7mvol43eyo
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 6403a24ae81..a8695476e64 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -407,7 +407,7 @@ class product_pricelist_item(osv.osv):
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add(or substract, if negative) to the amount calculated with the discount.'),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
         'price_discount': fields.float('Price Discount', digits=(16,4)),
         'price_round': fields.float('Price Rounding',
             digits_compute= dp.get_precision('Product Price'),

From a33dc1f5e0055ca70798ae52bc2bd19e14afea43 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 25 Sep 2012 12:19:58 +0200
Subject: [PATCH 113/128] [FIX] account: fixed demo data for bank USD journal

bzr revid: qdp-launchpad@openerp.com-20120925101958-gobrgemk5ay2wbs8
---
 addons/account/demo/account_minimal.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 0eb7b348069..8f858491edc 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -431,9 +431,9 @@
             <field name="code">TUBK</field>
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
-            <field model="account.account" name="usd_debit_account_id" ref="usd_bnk"/>
-            <field model="account.account" name="usd_credit_account_id" ref="usd_bnk"/>
-            <field name="currency_id" ref="base.USD"/>
+            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="currency" ref="base.USD"/>
         </record>
         <!--
         Product income and expense accounts, default parameters

From caa8b00673a82bd41619bf066f066f4addff5108 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 15:59:16 +0530
Subject: [PATCH 114/128] [IMP] crm : Calls, Opportunities, Leads should be
 restricted to the group Sales/User see all leads.

bzr revid: mdi@tinyerp.com-20120925102916-b4szb2i209g66gjo
---
 addons/crm/crm_lead_menu.xml      | 4 ++--
 addons/crm/crm_phonecall_menu.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 34b1f28169d..bc8fdfd86be 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -82,8 +82,8 @@
      </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman"/>
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman"/>
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman_all_leads"/>
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman_all_leads"/>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index ba8c4768c09..58d01c981ef 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -56,7 +56,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_sale_salesman"
+        groups="base.group_sale_salesman_all_leads"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
@@ -105,6 +105,7 @@
 
     <menuitem name="Logged Calls" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
+        groups="base.group_sale_salesman_all_leads"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">

From 64f63a6358538ed3defc64dd3bdea0f23d2599e4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 16:10:30 +0530
Subject: [PATCH 115/128] [IMP] crm_helpdesk : Improved the menu order.

bzr revid: mdi@tinyerp.com-20120925104030-lru50ixxxv7bhgrt
---
 addons/crm_helpdesk/crm_helpdesk_menu.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 0a9644ff8f9..58b522d0dee 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -4,8 +4,7 @@
 
         <!-- Top menu item -->
         <menuitem name="Sales"
-            id="base.menu_base_partner"
-            sequence="90"/>
+            id="base.menu_base_partner"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" />
 

From 28063542d6c2b8884327716caa0b0ccc8f283d12 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 17:18:22 +0530
Subject: [PATCH 116/128] [ADD] product : Added a constraint to check 'Min
 margin' and 'Max margin'.

bzr revid: mdi@tinyerp.com-20120925114822-ahjtslxh1g0inypw
---
 addons/product/pricelist.py | 48 +++++++++----------------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index a8695476e64..64c4aba9980 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -394,6 +394,15 @@ class product_pricelist_item(osv.osv):
                     return False
         return True
 
+    def _check_margin(self, cr, uid, ids, context=None):
+        for item in self.browse(cr, uid, ids, context=context):
+            if item.price_min_margin > item.price_max_margin:
+                if item.name:
+                    raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule: \'%s\'(sequence: %s).') % (item.name, item.sequence))
+                else:
+                    raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule having sequence %s.') % (item.sequence))
+        return True
+
     _columns = {
         'name': fields.char('Rule Name', size=64, help="Explicit rule name for this pricelist line."),
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
@@ -424,7 +433,8 @@ class product_pricelist_item(osv.osv):
     }
 
     _constraints = [
-        (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
+        (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id']),
+        (_check_margin, '', ['price_min_margin', 'price_max_margin'])
     ]
 
     def product_id_change(self, cr, uid, ids, product_id, context=None):
@@ -434,42 +444,6 @@ class product_pricelist_item(osv.osv):
         if prod[0]['code']:
             return {'value': {'name': prod[0]['code']}}
         return {}
-    
-    def create(self, cr, uid, vals, context=None):
-        name = vals.get('name', False)
-        sequence = vals.get('sequence', False)
-        price_min_margin = vals.get('price_min_margin', 0.0)
-        price_max_margin = vals.get('price_max_margin', 0.0)
-        if price_min_margin > price_max_margin:
-            if name:
-                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule: \'%s\'(sequence: %s).') % (name, sequence))
-            else:
-                raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule having sequence %s.') % (sequence))
-        return super(product_pricelist_item, self).create(cr, uid, vals, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        name = None
-        if vals.has_key('name'):
-            name = vals['name']
-        sequence = vals.get('sequence', False)
-        price_min_margin = vals.get('price_min_margin', 0.0)
-        price_max_margin = vals.get('price_max_margin', 0.0)
-        for rule in self.browse(cr, uid, ids, context=context):
-            if name is None:
-                name = rule.name
-            if not sequence:
-                sequence = rule.sequence
-            if not price_min_margin:
-                price_min_margin = rule.price_min_margin
-            if not price_max_margin:
-                price_max_margin = rule.price_max_margin
-            if price_min_margin > price_max_margin:
-                if name:
-                    raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule: \'%s\'(sequence: %s).') % (name, sequence))
-                else:
-                    raise osv.except_osv(_('Warning!'), _('Minimum margin must be lower than maximum margin for pricelist rule having sequence %s.') % (sequence))
-        return super(product_pricelist_item, self).write(cr, uid, ids, vals, context=context)
-
 product_pricelist_item()
 
 

From e7b573230ed170d66b4a6dd88381c61872f23e74 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 17:24:05 +0530
Subject: [PATCH 117/128] [IMP] crm : Revert the unnecessary changes.

bzr revid: mdi@tinyerp.com-20120925115405-12fhakbpgabjsgig
---
 addons/crm/crm_lead_menu.xml      | 4 ++--
 addons/crm/crm_phonecall_menu.xml | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index bc8fdfd86be..04758f4ffe0 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -82,8 +82,8 @@
      </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman_all_leads"/>
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman_all_leads"/>
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 58d01c981ef..ba8c4768c09 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -56,7 +56,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_sale_salesman_all_leads"
+        groups="base.group_sale_salesman"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
@@ -105,7 +105,6 @@
 
     <menuitem name="Logged Calls" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
-        groups="base.group_sale_salesman_all_leads"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">

From 5cb418da8e4f8494f57c7135f61db47cf98988f1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 25 Sep 2012 14:01:49 +0200
Subject: [PATCH 118/128] [IMP] web: in instance.web.Login.start(), login
 automatically only when params db, login and password are all present

bzr revid: rco@openerp.com-20120925120149-w5nojo2175eiximz
---
 addons/web/static/src/js/chrome.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 9fdfb50307f..b4ba5404a49 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -532,7 +532,9 @@ instance.web.Login =  instance.web.Widget.extend({
         });
         var d;
         if (self.params.db) {
-            d = self.do_login(self.params.db, self.params.login, self.params.password);
+            if (self.params.login && self.params.password) {
+                d = self.do_login(self.params.db, self.params.login, self.params.password);
+            }
         } else {
             d = self.rpc("/web/database/get_list", {}).done(self.on_db_loaded).fail(self.on_db_failed);
         }

From 96c82ce02127d7d56aac151081c613fc6bbf4e40 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 17:51:16 +0530
Subject: [PATCH 119/128] [ADD] crm : Added record rule on the phone calls to
 show only its own phone calls'.

bzr revid: mdi@tinyerp.com-20120925122116-mnrtftl4ygawfxr8
---
 addons/crm/security/crm_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 3b382a072f4..b6199f8696f 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -60,5 +60,12 @@
         <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
     </record>
 
+    <record id="crm_rule_personal_phonecall" model="ir.rule">
+        <field name="name">Personal Phone Calls</field>
+        <field ref="model_crm_phonecall" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+
     </data>
 </openerp>

From 8a7ccd3c760496e35460e514231467c41b92dde8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 25 Sep 2012 16:15:58 +0200
Subject: [PATCH 120/128] [ADD] Add 'window' in QWeb reserved words

bzr revid: fme@openerp.com-20120925141558-zlj6f328oya3z5oy
---
 addons/web/static/lib/qweb/qweb2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index c9b065ee69f..71a9628eff2 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -4,7 +4,7 @@
 // TODO: t-set + t-value + children node == scoped variable ?
 var QWeb2 = {
     expressions_cache: {},
-    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
+    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,window,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
     ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,escf,raw,rawf,js,debug,log'.split(','),
     WORD_REPLACEMENT: {
         'and': '&&',

From 42ee1b52b1d83d99a1fdff6dc0bea777afbaf6cb Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 25 Sep 2012 18:01:06 +0200
Subject: [PATCH 121/128] [IMP] web_linkedin: ported to new form view API

bzr revid: nicolas.vanhoren@openerp.com-20120925160106-8fl1fxqrbxgl8lbk
---
 addons/web_linkedin/static/src/js/linkedin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 3cdfbfff410..863e51e913f 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -88,7 +88,7 @@ openerp.web_linkedin = function(instance) {
         selected_entity: function(entity) {
             var self = this;
             this.create_on_change(entity).then(function(to_change) {
-                self.view.on_processed_onchange({value:to_change});
+                self.view.set_values(to_change);
             });
         },
         create_on_change: function(entity) {

From db42aeb57642f363c71bcf7cffe929c27ccb1df9 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 26 Sep 2012 04:36:28 +0000
Subject: [PATCH 122/128] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120926043628-ozjzzahaxzsi87a0
---
 addons/caldav/i18n/bn.po | 819 +++++++++++++++++++++++++++++++++++++++
 addons/crm/i18n/ru.po    | 305 +++++++++------
 2 files changed, 996 insertions(+), 128 deletions(-)
 create mode 100644 addons/caldav/i18n/bn.po

diff --git a/addons/caldav/i18n/bn.po b/addons/caldav/i18n/bn.po
new file mode 100644
index 00000000000..93281058908
--- /dev/null
+++ b/addons/caldav/i18n/bn.po
@@ -0,0 +1,819 @@
+# Bengali translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-25 17:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bengali <bn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-26 04:36+0000\n"
+"X-Generator: Launchpad (build 16022)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:99
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav)\n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"\n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide Path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,help:caldav.action_caldav_form
+msgid ""
+"\"Calendars\" allow you to Customize calendar event and todo attribute with "
+"any of OpenERP model.Caledars provide iCal Import/Export "
+"functionality.Webdav server that provides remote access to calendar.Help You "
+"to synchronize Meeting with Calendars client.You can access Calendars using "
+"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#: code:addons/caldav/calendar.py:879
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:123
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form\n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:879
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Caldav's host name configuration"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Datetime In UTC"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Webcal Calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Next"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Configure your openerp hostname. For example : "
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:815
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS File"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:141
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse Caldav"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,host_name:0
+msgid "Host Name"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "My Calendar(s)"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "database.my.openerp.com  or companyserver.com"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:50
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name\n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths.\n"
+"\n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.\n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index fab81c37340..437270b4bfb 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-30 17:52+0000\n"
+"PO-Revision-Date: 2012-09-25 09:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
-"X-Generator: Launchpad (build 15887)\n"
+"X-Launchpad-Export-Date: 2012-09-26 04:36+0000\n"
+"X-Generator: Launchpad (build 16022)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -50,7 +50,7 @@ msgstr "Видимость"
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Заголовок"
+msgstr "Обращение"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -102,7 +102,7 @@ msgstr "Название этапа"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM анализ кандидатов"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -130,7 +130,7 @@ msgstr "Кандидат '%s'  был закрыт"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Ожид. закрытие"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -140,7 +140,7 @@ msgstr "Ежегодно"
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "День создания"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -167,7 +167,7 @@ msgstr "Искать предложения"
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Ожидаемый месяц закрытия"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -218,7 +218,7 @@ msgstr "Отказ"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Прекращение повторений"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -252,7 +252,7 @@ msgstr "Критерии"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr "Исключенные ответы"
+msgstr "Исключенные ответы :"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -402,7 +402,7 @@ msgstr "Дата изменения"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "Лидер команды"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -432,7 +432,7 @@ msgstr "Категория"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "Предложение / Заказчик"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -454,6 +454,12 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Этапы позволят продавцу легко отследить как конкретное предложение "
+"позиционировано в цикле продаж. Для того, чтобы эффективно управлять вашим "
+"потоком продаж, важно определить условия для перехода к следующему шагу. "
+"Пример: для задания предложения как 'Подходящее', вы должны задать "
+"\"Ожидаемый доход\" и \"Ожидаемую дату закрытия\". Вы должны взглянуть на "
+"поле совета \"Автоматическая смена вероятности\"."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -478,7 +484,7 @@ msgstr "Обычная встреча или звонок по предложе
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "Шлюз почты"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -513,7 +519,7 @@ msgstr "Рассылки"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "Сделать"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -525,7 +531,7 @@ msgstr "Июнь"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "Не выполняется"
+msgstr "Не запущено"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -581,7 +587,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Название контакта партнёра"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -606,7 +612,7 @@ msgstr "Опции профилирования"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "# Телефонные звонки"
+msgstr "# Телефонных звонков"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -640,7 +646,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -695,7 +701,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -705,7 +711,7 @@ msgstr "Вероятная выручка"
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -720,7 +726,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr "Валюта организации"
+msgstr "Валюта компании"
 
 #. module: crm
 #: view:crm.lead:0
@@ -736,6 +742,12 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Определите отделы продаж для структурирования организации продаж и назначьте "
+"пользователей в каждый отдел. Также вы должны определить этап продаж для "
+"каждого отдела. Как пример, если вы используете технику решений продаж для "
+"отслеживания ваших предложений, вы можете назначить следующие этапы для "
+"отдела: территория, подходящий, подходящие спонсоры, предположение, "
+"переговоры, выигран/проигран."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -748,7 +760,7 @@ msgstr "Предложение"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "Кандидаты/Предложения за прошлый месяц"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -807,17 +819,19 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"Вы не можете удалить кандидата '%s'; для удаления он должна быть в состоянии "
+"'Черновик'. Вам лучше отменить его, вместо удаления."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "От %s : %s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "Год создания"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -838,7 +852,7 @@ msgstr "Продажи Закупки"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "Используется для подсчёта открытых дней"
 
 #. module: crm
 #: view:crm.lead:0
@@ -872,7 +886,7 @@ msgstr "Повторяющаяся встреча"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Нераспределенные звонки"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -958,7 +972,7 @@ msgstr "<"
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "Моб. тел."
+msgstr "Мобильный"
 
 #. module: crm
 #: view:crm.lead:0
@@ -973,7 +987,7 @@ msgstr "Мои встречи"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr "Звонки за сегодня"
+msgstr "Сегодняшние звонки"
 
 #. module: crm
 #: view:board.board:0
@@ -1016,7 +1030,7 @@ msgstr "Повторять до"
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "Срок"
+msgstr "Конечный срок"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1046,7 +1060,7 @@ msgstr "Ответственный"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "Показать только предложения"
 
 #. module: crm
 #: view:res.partner:0
@@ -1056,7 +1070,7 @@ msgstr "Предыдущий"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "Новые кандидаты"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1071,12 +1085,12 @@ msgstr "От"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "Преобразовать в предложения"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "Показать отдел продаж"
 
 #. module: crm
 #: view:res.partner:0
@@ -1134,7 +1148,7 @@ msgstr "Дата создания"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Мои предложения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1144,7 +1158,7 @@ msgstr "Нужен дизайн сайта"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "Год звонка"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1190,7 +1204,7 @@ msgstr "Отметить как"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "Описание звонка"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1205,7 +1219,7 @@ msgstr "Поля, зависящие от состояния"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "Звонки в состоянии \"В ожидании\""
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1248,7 +1262,7 @@ msgstr "Макс. ID обработанного партнера"
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "Задание этого этапа автоматически изменит вероятность в предложении."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1280,7 +1294,7 @@ msgstr "Название предложения"
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "День ожидаемого закрытия"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1302,6 +1316,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1345,7 +1361,7 @@ msgstr "Установить сигнал на это время, перед с
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr "Назначить звонок"
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1371,6 +1387,13 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Состояние установлено в 'Сделать', когда вопрос создан.                      "
+"            \\n\n"
+"Если вопрос в процессе, состояние установлено в 'Открыт'.                    "
+"              \\n\n"
+"Когда звонок выполнен, задаётся состояние 'Произведён'.                      "
+"            \\n\n"
+"Если звонок нуждается в выполнении, то задаётся состояние 'Не произведён'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1413,7 +1436,7 @@ msgstr "Расширенные фильтры..."
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "Телефонные звонки , которые находятся в закрытом состоянии"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1428,7 +1451,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Подразделение маркетинга продаж"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1440,6 +1463,8 @@ msgstr "Дата звонка"
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
+"При отправке почты,адрес электронной почты по умолчанию берется из отдела "
+"продаж."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1461,12 +1486,12 @@ msgstr "Запланировать встречу"
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Объединенные предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "Определить отдел продаж"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1493,7 +1518,7 @@ msgstr "Подотделы"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "Звонки в состоянии черновик или открыто"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -1523,7 +1548,7 @@ msgstr "res.users"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Кандидаты/Предложения в состоянии \"В ожидании\""
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1544,7 +1569,7 @@ msgstr ""
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1559,12 +1584,12 @@ msgstr "Категории звонков"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Открытые Кандидаты/Предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "Предложения по категориям"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1572,6 +1597,8 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Имя будущего партнера, который будет создан в процессе преобразования "
+"кандидата в предложение"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1582,13 +1609,13 @@ msgstr "Ошибка ! Вы не можете создать рекурсивн
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "Описание звонка"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "Не связывать с партнёром"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1619,7 +1646,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
-"Анализ предложений дает вам мгновенный доступ к такой информации, как "
+"Анализ предложений дает вам мгновенный доступ к такой информации как: "
 "ожидаемый доход, плановая себестоимость, пропущенные сроки или количество "
 "взаимодействий в предложении. Этот отчет в основном используется менеджером "
 "по продажам, с тем чтобы сделать периодический обзор по отделам продаж в "
@@ -1644,13 +1671,13 @@ msgid ""
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
 "Добавление специальных этапов к кандидатам и предложениям позволяет лучше "
-"организовать процесс продаж. Этапы позволяют легче отслеживать нахождение "
+"организовать процесс продаж. Этапы позволяют легче отслеживать положение "
 "кандидатов и предложений в процессе продаж."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "Преобразовать предложения"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -1687,7 +1714,7 @@ msgstr "Преобразовать в возможного бизнес-парт
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "Встреча / Партнер"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1719,7 +1746,7 @@ msgstr "Пятый"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Кандидаты/предложения в сделанном состоянии"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1740,7 +1767,7 @@ msgstr "Возможный посредник"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "При обострении для этого отдела, продавец заменяется на начальника."
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1798,7 +1825,7 @@ msgstr "Входящие"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "Месяц звонка"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1831,7 +1858,7 @@ msgstr "Наивысший"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "Год создания"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
@@ -1857,7 +1884,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr "Имя заказчика"
+msgstr "Название заказчика"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
@@ -1887,7 +1914,7 @@ msgstr "Опция повторения"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Кандидат / Заказчик"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1912,12 +1939,12 @@ msgstr "Каналы"
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr "Приостановлено"
+msgstr "Произведен"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "Установить в \"черновик\""
+msgstr "Установить в \"Черновик\""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1977,7 +2004,7 @@ msgstr "Использовать правила продаж покупок"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Кандидат в партнера предложения"
+msgstr "Кандидат в предложение партнеру"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
@@ -1987,7 +2014,7 @@ msgstr "Расположение"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Массовое проведение предложений партнёру"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2027,7 +2054,7 @@ msgstr "Планируемая Дата"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr "Caldav URL"
+msgstr "Адрес Caldav"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2042,7 +2069,7 @@ msgstr "Имя контакта"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Кандидаты, созданные за последние 7 дней"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2074,7 +2101,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Показать только кандидата"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2102,18 +2129,18 @@ msgstr "Классификация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr "Группа"
+msgstr "Команда"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Кандидаты/Предложения в стадии \"Новый\""
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr "Не проведено"
+msgstr "Не произведен"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2123,13 +2150,13 @@ msgstr "Вероятность"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Предложения в состоянии \"В ожидании\""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите более одного кандидата из списка."
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2246,7 +2273,7 @@ msgstr "Всего запланированная выручка"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Открытые предложения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2282,7 +2309,7 @@ msgstr "Телефонные звонки"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Поиск этапа"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
@@ -2292,7 +2319,7 @@ msgstr "Количество дней на открытие вопроса"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "Количество повторов"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2336,7 +2363,7 @@ msgstr "Неопределенный"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Используется для упорядочения этапов."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2360,12 +2387,12 @@ msgstr "Уменьшить (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Ожид. день закрытия"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Переназначить обостренное"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -2396,6 +2423,8 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Вы не можете обострить, вы уже на высшем уровне относительно вашей категории "
+"отдела продаж."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
@@ -2410,7 +2439,7 @@ msgstr "Сделано"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Повтор каждый (День/Неделя/Месяц/Год)"
+msgstr "Повтор каждый (День/Неделю/Месяц/Год)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2442,7 +2471,7 @@ msgstr "Занят"
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "День создания"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -2457,7 +2486,7 @@ msgstr "Повторяющийся"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Звонки, сделанные за последний месяц"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
@@ -2472,7 +2501,7 @@ msgstr "Максимальная история общения"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr "Пригласить"
+msgstr "Пригласить людей"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
@@ -2491,8 +2520,8 @@ msgid ""
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 "Состояние  установлено в 'Черновик', при создании вопроса.       \n"
-"Если вопрос в работе состояние  установлено в 'Открыто'.            \n"
-"Когда вопрос  решен состояние  установлено в 'Сделано'.              \n"
+"Если вопрос в работе, состояние  установлено в 'Открыто'.            \n"
+"Когда вопрос  решен, состояние  установлено в 'Сделано'.              \n"
 "Если вопрос нуждается в рассмотрении, то состояние 'В ожидании'."
 
 #. module: crm
@@ -2517,7 +2546,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Нераспределенные предложения"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2561,6 +2590,8 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Из какой кампании поступил этот контакт (семинар, маркетинговая кампания, "
+"массовая рассылка, ...)?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2585,7 +2616,7 @@ msgstr "Продолжение процесса"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Кандидаты/Предложения созданные в этом году"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -2613,17 +2644,17 @@ msgstr "Последнее действие"
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr "Продолжительность"
+msgstr "Длительность"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Показать страны"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Выберите продавца"
 
 #. module: crm
 #: view:board.board:0
@@ -2638,7 +2669,7 @@ msgstr "кол-во вопросов"
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr "Отдел продаж, которому принадлежат вопросы."
+msgstr "Отдел продаж, которому принадлежит вопрос."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2659,7 +2690,7 @@ msgstr "Не изменен"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr "Сегментация партнеров"
+msgstr "Классификация партнеров"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2669,7 +2700,7 @@ msgstr "Факс"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Кандидаты/Предложения созданные в этом месяце"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2681,7 +2712,7 @@ msgstr "Назначение"
 #: field:crm.lead.report,company_id:0 field:crm.phonecall,company_id:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr "Организация"
+msgstr "Компания"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2701,7 +2732,7 @@ msgstr "Обязательно / Опционально"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Нераспределенные кандидаты"
 
 #. module: crm
 #: field:crm.lead,subjects:0
@@ -2761,7 +2792,7 @@ msgstr "Сообщения"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Канал общения (почта, телефон, напрямую, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -2839,7 +2870,7 @@ msgid ""
 msgstr ""
 "Создавать специальные категории, которые подходят к деятельности вашей "
 "компании, чтобы лучше классифицировать и анализировать ваших кандидатов и "
-"предложения. Такие категории, могут, например, отражать вашу структуру "
+"предложения. Такие категории могут, например, отражать вашу структуру "
 "продукции или различные типы продаж."
 
 #. module: crm
@@ -2872,12 +2903,12 @@ msgstr "# Писем"
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr "Отчет о звонках"
+msgstr "Описание звонка"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Сегодняшние кандидаты"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2888,6 +2919,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Запланированные звонки перечисляют все звонки, которые будут сделаны вашим "
+"отделом продаж. Продавец может записать информацию о звонке в форме ввода. "
+"Эта информация будет сохранена в форме ввода партнёра для отслеживания "
+"каждого вашего контакта с покупателем. Также вы можете импортировать .CSV-"
+"файл со списком звонков, которые будут сделаны вашим отделом продаж."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2913,7 +2949,7 @@ msgstr "Подтверждено"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Планируемые поступления по пользователю и этапу"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2943,7 +2979,7 @@ msgstr "День месяца"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Планируемая выручка по этапу"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -2967,7 +3003,7 @@ msgstr "Канал"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Мои отделы продаж"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2977,8 +3013,8 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
-"Отметьте, если категория ограничена контрагентами, подпадающими под критерии "
-"сегментации.                        \n"
+"Отметьте, если категория ограничена партнерами, подпадающими под критерии "
+"классификации.                        \n"
 "Если отмечено, из категории будут удалёны контрагенты, не подпадающие под "
 "эти критерии."
 
@@ -2993,7 +3029,7 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
-"Последний срок автоматически вычисляются как \"Дата начала\" + "
+"Последний срок автоматически вычисляется как \"Дата начала\" + "
 "\"Длительность\""
 
 #. module: crm
@@ -3030,7 +3066,7 @@ msgstr "Установить категорию в"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "Кому:"
 
 #. module: crm
 #: field:crm.meeting,th:0
@@ -3052,7 +3088,7 @@ msgstr "Ежедневно"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Обзор этапов продаж"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -3062,13 +3098,13 @@ msgstr "Уточнение"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Контактный e-mail партнёра"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "Партнёр уже существует."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3078,7 +3114,7 @@ msgstr "Первый"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "Ожид. месяц закрытия"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3090,7 +3126,7 @@ msgstr "Декабрь"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr "Условие на историю общения"
+msgstr "Условие для истории общения"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -3109,7 +3145,7 @@ msgid ""
 "Use this functionality for recurring businesses."
 msgstr ""
 "Период - среднее количество дней между двумя циклами продаж или покупок для "
-"этой сегментации.                 \n"
+"этой классификации.                 \n"
 "Это, главным образом, используется для обнаружения слишком длительного "
 "периода за который партнер ничего не покупал,       \n"
 "поэтому мы предполагаем, что его мнение ухудшилось, потому что он, вероятно, "
@@ -3130,7 +3166,7 @@ msgstr "Сб"
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "Менеджер продаж"
+msgstr "Продавец"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
@@ -3155,12 +3191,12 @@ msgstr "Повторить"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "Ожид. год закрытия"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr "Имя партнера"
+msgstr "Название партнера"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3211,7 +3247,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "Описанные звонки"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3275,7 +3311,7 @@ msgstr "Нормальный"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Закрытые/Отмененные кандидаты нельзя преобразовать в предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3339,12 +3375,12 @@ msgstr "Реклама в Twitter"
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "Предложение '%s' выиграно."
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3370,7 +3406,7 @@ msgstr "Ошибка ! Вы не можете создать зацикленн
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Ожидаемый год закрытия"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
@@ -3448,7 +3484,7 @@ msgstr "Личный"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Общий для работников"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3487,13 +3523,13 @@ msgstr "Интерес к аксессуарам"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Новые предложения"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Не найден e-mail для адреса вашей компании!"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3513,7 +3549,7 @@ msgstr "Предложения по пользователям и отделам
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Установить в \"Сделать\""
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3595,6 +3631,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Этот инструмент позволяет вам описывать входящие звонки на лету. Каждый "
+"получаемый вами звонок будет появляться в форме партнёра для отслеживания "
+"каждого вашего контакта с партнёром. Из формы телефонного звонка вы можете "
+"запустить запрос другого звонка, встречу или предложение."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3653,7 +3693,7 @@ msgstr "Ожид.Закр."
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
@@ -4512,9 +4552,6 @@ msgstr "Рассылка"
 #~ msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 #~ msgstr "Закрытый/отмененный звонок нельзя преобразовать в предложение"
 
-#~ msgid "Opportunity to Quotation"
-#~ msgstr "Предложение в Заказ на продажу"
-
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Кандидат в Предложение"
 
@@ -4601,3 +4638,15 @@ msgstr "Рассылка"
 
 #~ msgid "Message Body"
 #~ msgstr "Тело сообщения"
+
+#~ msgid "Schedule/Log a call"
+#~ msgstr "Планировать/Описать звонок"
+
+#~ msgid "Schedule call"
+#~ msgstr "Запланировать звонок"
+
+#~ msgid "Opportunity to Quotation"
+#~ msgstr "Предложение в Запрос цен"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Предложения назначены"

From c4e443e0d66c72aa34ded4831ce2f45a7095c380 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 10:29:04 +0530
Subject: [PATCH 123/128] [FIX] crm : When I have created new Lead without
 selecting customer, After that convert to opportunity and that time I have
 select Link to an exisiting customer and select customer and create
 Opportunity. In that Opportunity Form view  i can not see email and phone of
 that customer.

bzr revid: mdi@tinyerp.com-20120926045904-0lool27m8jkw2s5p
---
 addons/crm/crm_lead.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ae862e4c6c0..5532f3ed75d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -588,16 +588,6 @@ class crm_lead(base_stage, format_address, osv.osv):
         else:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
         stage_id = stage_ids and stage_ids[0] or False
-        email = False
-        phone = False
-        if customer and customer.email:
-            email = customer.email
-        else:
-            email = lead.email_from
-        if customer and customer.phone:
-            phone = customer.phone
-        else:
-            phone = lead.phone
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -608,8 +598,8 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'email_from': email,
-                'phone': phone,
+                'email_from': customer.email if customer else lead.email_from,
+                'phone': customer.phone if customer else lead.phone,
         }
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):

From acf3ddf8098eab30465ac41243d42cc47e055e56 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 10:49:33 +0530
Subject: [PATCH 124/128] [IMP] crm : when lead has already a customer assigned
 to it and we click on convert to opp, it should not propose to create new
 customer in that wizard, it should give option 'Link to an Existing Customer'
 with the customer assigned to that lead.

bzr revid: mdi@tinyerp.com-20120926051933-59ln6fw4q0uz6mvp
---
 addons/crm/wizard/crm_lead_to_partner.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index c354c8eccc8..3ab3334e7d9 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -60,10 +60,12 @@ class crm_lead2partner(osv.osv_memory):
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
-        if this.partner_id and this.partner_name:
+        if not this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
+        if this.partner_id:
+            partner_id = this.partner_id.id
         return partner_id
 
     def default_get(self, cr, uid, fields, context=None):

From c8d64b61d7a2ae5fe43c2081579158fb2dec60ec Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 26 Sep 2012 11:50:04 +0200
Subject: [PATCH 125/128] [IMP] web: add methods show_error() and hide_error()
 in instance.web.Login

bzr revid: rco@openerp.com-20120926095004-bl7xsg9d376uhwop
---
 addons/web/static/src/js/chrome.js | 13 ++++++++++---
 addons/web/static/src/xml/base.xml |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b4ba5404a49..e9185429993 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -579,7 +579,7 @@ instance.web.Login =  instance.web.Widget.extend({
      */
     do_login: function (db, login, password) {
         var self = this;
-        this.$el.removeClass('oe_login_invalid');
+        self.hide_error();
         self.$(".oe_login_pane").fadeOut("slow");
         return this.session.session_authenticate(db, login, password).pipe(function() {
             if (self.has_local_storage) {
@@ -596,12 +596,19 @@ instance.web.Login =  instance.web.Widget.extend({
                 }
             }
             self.trigger('login_successful');
-        },function () {
+        }, function () {
             self.$(".oe_login_pane").fadeIn("fast", function() {
-                self.$el.addClass("oe_login_invalid");
+                self.show_error("Invalid username or password");
             });
         });
     },
+    show_error: function(message) {
+        this.$el.addClass("oe_login_invalid");
+        this.$(".oe_login_error_message").text(message);
+    },
+    hide_error: function() {
+        this.$el.removeClass('oe_login_invalid');
+    },
 });
 instance.web.client_actions.add("login", "instance.web.Login");
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f0b9d624607..b02fa62e12a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -61,7 +61,7 @@
 <t t-name="Login">
     <div class="oe_login">
         <div class="oe_login_bottom"> </div>
-        <div class="oe_login_error_message">Invalid username or password</div>
+        <div class="oe_login_error_message"/>
         <div class="oe_login_pane">
             <div class="oe_login_logo"><img src='/web/static/src/img/logo2.png'/></div>
             <form action="" method="post">

From 669a6dfa7f2dc7c6b0d8572632241bc4930daef2 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 26 Sep 2012 13:16:08 +0200
Subject: [PATCH 126/128] [FIX] base_calendar: spellchecking, courtesy of the
 en_US police ;-)

bzr revid: odo@openerp.com-20120926111608-0v3m8cqiqya8jmy3
---
 addons/base_calendar/__openerp__.py       | 2 +-
 addons/base_calendar/crm_meeting_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 1e17a504919..f619cadc56e 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -23,7 +23,7 @@
     'name': 'Calendar',
     'version': '1.0',
     'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
-    'summary': 'Personnal & Shared Agenda',
+    'summary': 'Personal & Shared Calendar',
     'description': """
 This is a full-featured calendar system.
 ========================================
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index fc936f416ad..f1e23c9e9d2 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -307,7 +307,7 @@
           <p class="oe_view_nocontent_create">
             Click to schedule a new meeting. 
           </p><p>
-            The agenda is shared between employees and fully integrated with
+            The calendar is shared between employees and fully integrated with
             other applications such as the employee holidays or the business
             opportunities.
           </p>
@@ -339,10 +339,10 @@
     </record>
 
     <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Agenda" action="action_crm_meeting"/>
+        name="Calendar" action="action_crm_meeting"/>
 
-    <menuitem name="Agenda"
-        id="mail_menu_agenda" parent="mail.mail_my_stuff"
+    <menuitem name="Calendar"
+        id="mail_menu_calendar" parent="mail.mail_my_stuff"
         sequence="10" action="action_crm_meeting"/>
 
     </data>

From a48c57df405444e5beb6cca0a35e1883d7edfb9e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 26 Sep 2012 14:15:36 +0200
Subject: [PATCH 127/128] [IMP] no certificate

bzr revid: fp@tinyerp.com-20120926121536-9836j42ulu8wcir8
---
 openerp/addons/base/__openerp__.py   |  1 -
 openerp/addons/base/base.sql         |  1 -
 openerp/addons/base/module/module.py | 13 -------------
 openerp/modules/db.py                |  6 +++---
 openerp/modules/loading.py           |  2 +-
 openerp/modules/module.py            |  1 -
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 590d3b11a87..a5265ba694c 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -98,7 +98,6 @@ The kernel of OpenERP, needed for all installation.
     ],
     'installable': True,
     'auto_install': True,
-    'certificate': '0076807797149',
     'css': ['static/src/css/modules.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index 441fe536a0a..c490df32294 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -294,7 +294,6 @@ CREATE TABLE ir_module_module (
     shortdesc character varying(256),
     complexity character varying(32),
     category_id integer REFERENCES ir_module_category ON DELETE SET NULL,
-    certificate character varying(64),
     description text,
     application boolean default False,
     demo boolean default False,
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 617a31dae66..7621d5907ba 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -237,7 +237,6 @@ class module(osv.osv):
         'menus_by_module': fields.function(_get_views, string='Menus', type='text', multi="meta", store=True),
         'reports_by_module': fields.function(_get_views, string='Reports', type='text', multi="meta", store=True),
         'views_by_module': fields.function(_get_views, string='Views', type='text', multi="meta", store=True),
-        'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
         'application': fields.boolean('Application', readonly=True),
         'icon': fields.char('Icon URL', size=128),
         'icon_image': fields.function(_get_icon_image, string='Icon', type="binary"),
@@ -253,12 +252,9 @@ class module(osv.osv):
 
     def _name_uniq_msg(self, cr, uid, ids, context=None):
         return _('The name of the module must be unique !')
-    def _certificate_uniq_msg(self, cr, uid, ids, context=None):
-        return _('The certificate ID of the module must be unique !')
 
     _sql_constraints = [
         ('name_uniq', 'UNIQUE (name)',_name_uniq_msg ),
-        ('certificate_uniq', 'UNIQUE (certificate)',_certificate_uniq_msg )
     ]
 
     def unlink(self, cr, uid, ids, context=None):
@@ -511,7 +507,6 @@ class module(osv.osv):
             'contributors': ', '.join(terp.get('contributors', [])) or False,
             'website': terp.get('website', ''),
             'license': terp.get('license', 'AGPL-3'),
-            'certificate': terp.get('certificate') or False,
             'sequence': terp.get('sequence', 100),
             'application': terp.get('application', False),
             'auto_install': terp.get('auto_install', False),
@@ -677,14 +672,6 @@ class module(osv.osv):
             if not mod.description:
                 _logger.warning('module %s: description is empty !', mod.name)
 
-            if not mod.certificate or not mod.certificate.isdigit():
-                _logger.info('module %s: no quality certificate', mod.name)
-            else:
-                val = long(mod.certificate[2:]) % 97 == 29
-                if not val:
-                    _logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate)
-                    raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,))
-
 class module_dependency(osv.osv):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
diff --git a/openerp/modules/db.py b/openerp/modules/db.py
index 1bf7b5237f1..6318bd954f3 100644
--- a/openerp/modules/db.py
+++ b/openerp/modules/db.py
@@ -74,12 +74,12 @@ def initialize(cr):
 
         cr.execute('INSERT INTO ir_module_module \
                 (author, website, name, shortdesc, description, \
-                    category_id, auto_install, state, certificate, web, license, application, icon, sequence, summary) \
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+                    category_id, auto_install, state, web, license, application, icon, sequence, summary) \
+                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
             info['author'],
             info['website'], i, info['name'],
             info['description'], category_id,
-            info['auto_install'], state, info['certificate'],
+            info['auto_install'], state,
             info['web'],
             info['license'],
             info['application'], info['icon'],
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 86e69fa64ba..57fb92a6ee0 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -61,7 +61,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
        :param graph: graph of module nodes to load
        :param status: status dictionary for keeping track of progress
        :param perform_checks: whether module descriptors should be checked for validity (prints warnings
-                              for same cases, and even raise osv_except if certificate is invalid)
+                              for same cases)
        :param skip_modules: optional list of module names (packages) which have previously been loaded and can be skipped
        :return: list of modules that were installed or updated
     """
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 540a23c5bcd..6ec9e86340c 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -331,7 +331,6 @@ def load_information_from_description_file(module):
                 'author': '',
                 'auto_install': False,
                 'category': 'Uncategorized',
-                'certificate': None,
                 'depends': [],
                 'description': '',
                 'icon': get_module_icon(module),

From e9f4840c9376ca82bef5b0e2a234c0c42067fc14 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 26 Sep 2012 14:16:27 +0200
Subject: [PATCH 128/128] [IMP] emoving bad code, no invitation system on
 events [IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
---
 addons/account/__openerp__.py                 |   1 -
 addons/account_accountant/__openerp__.py      |   1 -
 .../account_analytic_analysis/__openerp__.py  |   1 -
 .../account_analytic_default/__openerp__.py   |   1 -
 addons/account_analytic_plans/__openerp__.py  |   1 -
 addons/account_anglo_saxon/__openerp__.py     |   1 -
 addons/account_budget/__openerp__.py          |   1 -
 addons/account_cancel/__openerp__.py          |   3 -
 addons/account_chart/__openerp__.py           |   1 -
 addons/account_followup/__openerp__.py        |   1 -
 addons/account_payment/__openerp__.py         |   1 -
 addons/account_sequence/__openerp__.py        |   1 -
 addons/account_voucher/__openerp__.py         |   1 -
 addons/analytic/__openerp__.py                |   1 -
 addons/analytic_user_function/__openerp__.py  |   1 -
 addons/anonymization/__openerp__.py           |   1 -
 addons/association/__openerp__.py             |   1 -
 addons/audittrail/__openerp__.py              |   1 -
 addons/auth_ldap/__openerp__.py               |   1 -
 addons/base_action_rule/__openerp__.py        |   1 -
 addons/base_calendar/__init__.py              |   1 -
 addons/base_calendar/__openerp__.py           |   3 -
 addons/base_calendar/base_calendar_view.xml   |  18 --
 addons/base_calendar/crm_meeting_view.xml     |  21 +--
 addons/base_calendar/wizard/__init__.py       |  25 ---
 .../wizard/base_calendar_invite_attendee.py   | 170 ------------------
 .../base_calendar_invite_attendee_view.xml    |  55 ------
 addons/base_crypt/__openerp__.py              |   1 -
 addons/base_iban/__openerp__.py               |   1 -
 addons/base_module_doc_rst/__openerp__.py     |   1 -
 addons/base_module_record/__openerp__.py      |   1 -
 addons/base_report_designer/__openerp__.py    |   1 -
 addons/base_setup/__openerp__.py              |   1 -
 addons/base_tools/__openerp__.py              |   1 -
 addons/base_vat/__openerp__.py                |   1 -
 addons/board/__openerp__.py                   |   1 -
 addons/caldav/__openerp__.py                  |   1 -
 addons/claim_from_delivery/__openerp__.py     |   1 -
 addons/crm/__openerp__.py                     |   1 -
 addons/crm_caldav/__openerp__.py              |   1 -
 addons/crm_claim/__openerp__.py               |   1 -
 addons/crm_helpdesk/__openerp__.py            |   1 -
 addons/crm_partner_assign/__openerp__.py      |   1 -
 addons/crm_profiling/__openerp__.py           |   1 -
 addons/decimal_precision/__openerp__.py       |   1 -
 addons/delivery/__openerp__.py                |   1 -
 addons/document/__openerp__.py                |   1 -
 addons/document_ftp/__openerp__.py            |   1 -
 addons/document_page/__openerp__.py           |   1 -
 addons/document_webdav/__openerp__.py         |   1 -
 addons/edi/__openerp__.py                     |   1 -
 addons/email_template/__openerp__.py          |   1 -
 addons/event_project/__openerp__.py           |   1 -
 addons/fetchmail/__openerp__.py               |   1 -
 addons/google_map/__openerp__.py              |   1 -
 addons/hr/__openerp__.py                      |   1 -
 addons/hr_attendance/__openerp__.py           |   1 -
 addons/hr_contract/__openerp__.py             |   1 -
 addons/hr_evaluation/__openerp__.py           |   1 -
 addons/hr_expense/__openerp__.py              |   1 -
 addons/hr_holidays/__openerp__.py             |   1 -
 addons/hr_payroll/__openerp__.py              |   1 -
 addons/hr_payroll_account/__openerp__.py      |   1 -
 addons/hr_recruitment/__openerp__.py          |   1 -
 addons/hr_timesheet/__openerp__.py            |   1 -
 addons/hr_timesheet_invoice/__openerp__.py    |   1 -
 addons/hr_timesheet_sheet/__openerp__.py      |   1 -
 addons/knowledge/__openerp__.py               |   1 -
 addons/l10n_be/__openerp__.py                 |   1 -
 addons/l10n_be_coda/__openerp__.py            |   1 -
 addons/l10n_br/__openerp__.py                 |   1 -
 addons/l10n_ca/__openerp__.py                 |   1 -
 addons/l10n_ch/__openerp__.py                 |   1 -
 addons/l10n_cn/__openerp__.py                 |   1 -
 addons/l10n_cr/__openerp__.py                 |   1 -
 addons/l10n_de/__openerp__.py                 |   1 -
 addons/l10n_ec/__openerp__.py                 |   1 -
 addons/l10n_es/__openerp__.py                 |   1 -
 addons/l10n_fr/__openerp__.py                 |   1 -
 addons/l10n_fr_rib/__openerp__.py             |   1 -
 addons/l10n_gr/__openerp__.py                 |   1 -
 addons/l10n_gt/__openerp__.py                 |   1 -
 addons/l10n_in/__openerp__.py                 |   1 -
 addons/l10n_it/__openerp__.py                 |   1 -
 addons/l10n_lu/__openerp__.py                 |   1 -
 addons/l10n_ma/__openerp__.py                 |   1 -
 addons/l10n_mx/__openerp__.py                 |   1 -
 addons/l10n_nl/__openerp__.py                 |   1 -
 addons/l10n_pe/__openerp__.py                 |   1 -
 addons/l10n_pl/__openerp__.py                 |   1 -
 addons/l10n_ro/__openerp__.py                 |   1 -
 addons/l10n_th/__openerp__.py                 |   1 -
 addons/l10n_uy/__openerp__.py                 |   1 -
 addons/l10n_ve/__openerp__.py                 |   1 -
 addons/lunch/__openerp__.py                   |   1 -
 addons/mail/__openerp__.py                    |   1 -
 addons/marketing/__openerp__.py               |   1 -
 addons/marketing_campaign/__openerp__.py      |   1 -
 .../__openerp__.py                            |   1 -
 addons/membership/__openerp__.py              |   1 -
 addons/mrp/__openerp__.py                     |   1 -
 addons/mrp_jit/__openerp__.py                 |   1 -
 addons/mrp_operations/__openerp__.py          |   1 -
 addons/mrp_repair/__openerp__.py              |   1 -
 addons/mrp_subproduct/__openerp__.py          |   1 -
 addons/multi_company/__openerp__.py           |   1 -
 addons/pad/__openerp__.py                     |   1 -
 addons/plugin_outlook/__openerp__.py          |   1 -
 addons/plugin_thunderbird/__openerp__.py      |   1 -
 addons/process/__openerp__.py                 |   1 -
 addons/procurement/__openerp__.py             |   1 -
 addons/product/__openerp__.py                 |   1 -
 addons/product_expiry/__openerp__.py          |   1 -
 addons/product_manufacturer/__openerp__.py    |   1 -
 addons/product_margin/__openerp__.py          |   1 -
 .../product_visible_discount/__openerp__.py   |   1 -
 addons/profile_tools/__openerp__.py           |   1 -
 addons/project/__openerp__.py                 |   1 -
 addons/project_gtd/__openerp__.py             |   1 -
 addons/project_issue/__openerp__.py           |   1 -
 addons/project_issue_sheet/__openerp__.py     |   1 -
 addons/project_long_term/__openerp__.py       |   1 -
 addons/project_mrp/__openerp__.py             |   1 -
 addons/project_retro_planning/__openerp__.py  |   1 -
 addons/project_timesheet/__openerp__.py       |   1 -
 addons/purchase/__openerp__.py                |   1 -
 addons/purchase_analytic_plans/__openerp__.py |   1 -
 .../purchase_double_validation/__openerp__.py |   4 +-
 addons/purchase_requisition/__openerp__.py    |   1 -
 addons/report_designer/__openerp__.py         |   1 -
 addons/report_intrastat/__openerp__.py        |   1 -
 addons/report_webkit/__openerp__.py           |   1 -
 addons/report_webkit_sample/__openerp__.py    |   1 -
 addons/resource/__openerp__.py                |   1 -
 addons/sale/__openerp__.py                    |   1 -
 addons/sale_analytic_plans/__openerp__.py     |   1 -
 addons/sale_crm/__openerp__.py                |   1 -
 addons/sale_journal/__openerp__.py            |   1 -
 addons/sale_margin/__openerp__.py             |   1 -
 addons/sale_mrp/__openerp__.py                |   1 -
 addons/sale_order_dates/__openerp__.py        |   1 -
 addons/share/__openerp__.py                   |   1 -
 addons/stock/__openerp__.py                   |   1 -
 addons/stock_invoice_directly/__openerp__.py  |   1 -
 addons/stock_location/__openerp__.py          |   1 -
 addons/stock_no_autopicking/__openerp__.py    |   1 -
 addons/stock_planning/__openerp__.py          |   1 -
 addons/subscription/__openerp__.py            |   1 -
 addons/survey/__openerp__.py                  |   1 -
 addons/warning/__openerp__.py                 |   1 -
 150 files changed, 7 insertions(+), 434 deletions(-)
 delete mode 100644 addons/base_calendar/wizard/__init__.py
 delete mode 100644 addons/base_calendar/wizard/base_calendar_invite_attendee.py
 delete mode 100644 addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index ebbd5459cea..c538614fd0f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -159,6 +159,5 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080331923549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 3c391d8d885..980f565b3e5 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -43,6 +43,5 @@ It assigns manager and user access rights to the Administrator and only user rig
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '00395091383933390541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 3e8c579b729..7675ef9f38e 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -47,7 +47,6 @@ Adds menu to show relevant information to each manager.You can also view the rep
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042927202589',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index ef01867983a..213d055f8de 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -47,7 +47,6 @@ Allows to automatically select analytic accounts based on criterions:
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0074229833581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 675723f423a..af5b5654b99 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -79,7 +79,6 @@ The analytic plan validates the minimum and maximum percentage at the time of cr
     'test': ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0036417675373',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 330d0df0000..6482a110f1d 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -46,7 +46,6 @@ account.""",
     'data': ['product_view.xml',],
     'auto_install': False,
     'installable': True,
-    'certificate':'00557423080410733581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 928e87f1202..222178b940c 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -69,6 +69,5 @@ Three reports are available:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0043819694157',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index b1feedda55a..468840c19d5 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -38,9 +38,6 @@ If set to true it allows user to cancel entries & invoices.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '001101250473177981989',
-
-
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index 2c458ceb49f..8f619cd1471 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -36,6 +36,5 @@ Deactivates minimal chart of accounts.
     'data': [],
     'demo': [],
     'installable': True,
-    'certificate': '0073332443901',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 43b1c4b2859..87b04c18219 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -64,7 +64,6 @@ Note that if you want to check the follow-up level for a given partner/account e
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0072481076453',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index dd08386b064..66d0201b2fe 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -65,6 +65,5 @@ have a new option to import payment orders as bank statement lines.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0061703998541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 16f13dc5178..2c4b157303f 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -49,7 +49,6 @@ You can customize the following attributes of the sequence:
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '00475376442024623469',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index a6bb9dc5159..c0011c8b3c5 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -72,7 +72,6 @@ This module manages:
         'test/case4_cad_chf.yml',
         'test/case_eur_usd.yml',
     ],
-    'certificate': '0037580727101',
     'auto_install': False,
     'application': True,
     'installable': True,
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 10762a1d2be..417d2b29b20 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -43,6 +43,5 @@ that have no counterpart in the general financial accounts.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00462253285027988541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index f23296012d2..d788342648c 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -45,6 +45,5 @@ compatible with older configurations.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0082277138269',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index 865fb19ea07..ac63d0e01f1 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -48,7 +48,6 @@ anonymization process to recover your previous data.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00719010980872226045',
     'images': ['images/anonymization1.jpeg','images/anonymization2.jpeg','images/anonymization3.jpeg'],
 }
 
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 665968c6613..35b520e06f8 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -37,7 +37,6 @@ membership products (schemes).
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0078696047261',
     'images': ['images/association1.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 3ba8c59a2f3..41958c84f66 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -42,7 +42,6 @@ and can check logs.
     'demo': ['audittrail_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062572348749',
     'images': ['images/audittrail1.jpeg','images/audittrail2.jpeg','images/audittrail3.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py
index aa7c93e4146..844f6d9fa84 100644
--- a/addons/auth_ldap/__openerp__.py
+++ b/addons/auth_ldap/__openerp__.py
@@ -107,7 +107,6 @@ authentication if installed at the same time.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001141446349334700221',
     'external_dependencies' : {
         'python' : ['ldap'],
     }
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index c9483f00360..973567c613f 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -44,7 +44,6 @@ trigger an automatic reminder email.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001017908446466333429',
     'images': ['images/base_action_rule1.jpeg','images/base_action_rule2.jpeg','images/base_action_rule3.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
index ec4f5070d63..b6447567083 100644
--- a/addons/base_calendar/__init__.py
+++ b/addons/base_calendar/__init__.py
@@ -21,6 +21,5 @@
 
 import base_calendar
 import crm_meeting
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index f619cadc56e..313ddb8453a 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -32,7 +32,6 @@ It supports:
 ------------
     - Calendar of events
     - Recurring events
-    - Invitations to people
 
 If you need to manage your meetings, you should install the CRM module.
     """,
@@ -43,7 +42,6 @@ If you need to manage your meetings, you should install the CRM module.
     'data': [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
-        'wizard/base_calendar_invite_attendee_view.xml',
         'base_calendar_view.xml',
         'crm_meeting_view.xml',
         'base_calendar_data.xml',
@@ -53,7 +51,6 @@ If you need to manage your meetings, you should install the CRM module.
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '00694071962960352821',
     'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
 }
 
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 0ea2be4f37f..fe292a489ab 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -11,7 +11,6 @@
                     <header>
                         <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
                         <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
-                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                         <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar"
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
@@ -226,10 +225,6 @@
                         <field name="description"/>
                     </page>
                     <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" colspan="4"
                             nolabel="1" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
@@ -248,12 +243,6 @@
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
                                     type="object" icon="gtk-cancel"/>
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
@@ -281,13 +270,6 @@
                                                 states="needs-action,tentative,accepted"
                                                 type="object"
                                                 icon="gtk-cancel"/>
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                                         </group>
                                     </page>
                                     </notebook>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index f1e23c9e9d2..4b165c1d495 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -165,12 +165,12 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                    <!--
+                        Temporarily removing invitation feature as the implementation
+                        was not clean. Invitation should be trigerred automatically
+                        based on partner_ids.
+                    -->
+                    <page string="Invitation Detail" groups="base.group_no_one">
                         <field name="attendee_ids" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
@@ -188,11 +188,6 @@
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
                                     type="object" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <header>
@@ -205,10 +200,6 @@
                                     <button name="do_decline" type="object"
                                         states="needs-action,tentative,accepted"
                                         string="Decline" />
-                                    <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" type="action"
-                                        states="needs-action,tentative,declined,accepted"
-                                        string="Delegate" 
-                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 </header>
                                 <group>
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py
deleted file mode 100644
index cd0690b1dc0..00000000000
--- a/addons/base_calendar/wizard/__init__.py
+++ /dev/null
@@ -1,25 +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/>.
-#
-##############################################################################
-
-import base_calendar_invite_attendee
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
deleted file mode 100644
index 344056eb585..00000000000
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ /dev/null
@@ -1,170 +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/>.
-#
-##############################################################################
-
-from .. import base_calendar
-from osv import fields, osv
-from tools.translate import _
-import tools
-
-
-class base_calendar_invite_attendee(osv.osv_memory):
-    """
-    Invite attendee.
-    """
-
-    _name = "base_calendar.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True, help="Select whom you want to Invite"),
-        'user_ids': fields.many2many('res.users', 'invite_user_rel',
-                                  'invite_id', 'user_id', 'Users'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."),
-        'contact_ids': fields.many2many('res.partner', 'invite_contact_rel',
-                                  'invite_id', 'contact_id', 'Contacts'),
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
-send an Email to Invited Person')
-    }
-
-    _defaults = {
-        'type': 'internal',
-        'send_mail': True
-    }
-
-    def do_invite(self, cr, uid, ids, context=None):
-        """
-        Invites attendee for meeting..
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of {}.
-        """
-
-        if context is None:
-            context = {}
-
-        model = False
-        context_id = context and context.get('active_id', False) or False
-        if not context or not context.get('model'):
-            return {'type': 'ir.actions.act_window_close'}
-        else:
-            model = context.get('model')
-
-        model_field = context.get('attendee_field', False)
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context_id, context=context)
-        att_obj = self.pool.get('calendar.attendee')
-        user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
-
-        for datas in self.read(cr, uid, ids, context=context):
-            type = datas.get('type')
-            vals = []
-            mail_to = []
-            attendees = []
-            ref = {}
-
-            if not model == 'calendar.attendee':
-                if context_id:
-                    ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
-                else:
-                    return {'type': 'ir.actions.act_window_close'}
-            if type == 'internal':
-
-                if not datas.get('user_ids'):
-                    raise osv.except_osv(_('Error!'), ("Please select any user."))
-                for user_id in datas.get('user_ids'):
-                    user = user_obj.browse(cr, uid, user_id)
-                    res = {
-                           'user_id': user_id,
-                           'email': user.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if user.email:
-                        mail_to.append(user.email)
-
-            elif  type == 'external' and datas.get('email'):
-                res = {'email': datas['email']}
-                res.update(ref)
-                vals.append(res)
-                mail_to.append(datas['email'])
-
-            elif  type == 'partner':
-                add_obj = self.pool.get('res.partner')
-                for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                    res = {
-                           'partner_id': contact.id,
-                           'email': contact.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if contact.email:
-                        mail_to.append(contact.email)
-
-            for att_val in vals:
-                if model == 'calendar.attendee':
-                    att = att_obj.browse(cr, uid, context_id)
-                    att_val.update({
-                        'parent_ids': [(4, att.id)],
-                        'ref': att.ref and (att.ref._name + ',' +str(att.ref.id)) or False
-                        })
-
-                attendees.append(att_obj.create(cr, uid, att_val))
-            if model_field:
-                for attendee in attendees:
-                    obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
-
-            if datas.get('send_mail'):
-                if not mail_to:
-                    name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
-                                       self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail.") %(name[0]))
-                att_obj._send_mail(cr, uid, attendees, mail_to, \
-                       email_from = current_user.email or tools.config.get('email_from', False))
-
-        return {'type': 'ir.actions.act_window_close'}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        """
-        Make entry on contact_ids on change of partner_id field.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param partner_id: id of Partner
-        @return: dictionary of value.
-        """
-
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('SELECT id FROM res_partner \
-                         WHERE id=%s or parent_id =%s' , (partner_id,partner_id,))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        return {'value': {'contact_ids': contacts}}
-
-base_calendar_invite_attendee()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
deleted file mode 100644
index 5510259a7a7..00000000000
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--    Attendee invite wizard-->
-
-        <record id="view_calendar_invite_attendee_wizard"
-            model="ir.ui.view">
-            <field name="name">Invite Attendees</field>
-            <field name="model">base_calendar.invite.attendee</field>
-            <field name="arch" type="xml">
-                <form string="Invite People" version="7.0">
-                    <separator string="Invite People" colspan="4"/>
-                    <field name="type"/>
-                    <field name="send_mail"/>
-                    <notebook colspan="4">
-                        <page string="Data">
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
-                                <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
-                                <separator string="Users" colspan="4"/>
-                                <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
-                                <newline/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
-                                <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
-                                <newline/>
-                                <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
-                            </group>
-                        </page>
-                    </notebook>
-                    <footer>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-
-        <!--    Attendee invite action-->
-
-        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-            <field name="name">Invite Attendees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base_calendar.invite.attendee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index d0252f6810c..97f6c98aeb8 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -58,7 +58,6 @@ will disable LDAP authentication completely if installed at the same time.
     'data': [],
     'auto_install': False,
     'installable': True,
-    'certificate': '00721290471310299725',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 76c397586c9..7f966255bbf 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -35,7 +35,6 @@ with a single statement.
     'data': ['base_iban_data.xml' , 'base_iban_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0050014379549',
     'images': ['images/base_iban1.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
index 100a90dbd96..f1de13bc7f0 100644
--- a/addons/base_module_doc_rst/__openerp__.py
+++ b/addons/base_module_doc_rst/__openerp__.py
@@ -42,7 +42,6 @@ This module generates the Technical Guides of selected modules in Restructured T
     ],
     'demo': [],
     'installable': True,
-    'certificate': '001288481437217734509',
     'images': ['images/base_module_doc_rst1.jpeg'],
 }
 
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 00af464b3ee..532dcfc932e 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -53,7 +53,6 @@ Select datetime criteria of recording and objects to be recorded and Record modu
     ],
     'demo': [],
     'installable': True,
-    'certificate': '0083134865813',
     'images': ['images/base_module_record1.jpeg','images/base_module_record2.jpeg','images/base_module_record3.jpeg',]
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 3e0ca2152da..36e15c96877 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -38,7 +38,6 @@ Once you have modified it you can upload the report using the same wizard.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056379010493',
     'images': ['images/base_report_designer1.jpeg','images/base_report_designer2.jpeg',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index cf69933c84a..de2d8236ece 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -43,7 +43,6 @@ Shows you a list of applications features to install from.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
     'js': ['static/src/js/base_setup.js'],
     'css': ['static/src/css/base_setup.css'],
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
index 84f10e78959..71f6cbe549c 100644
--- a/addons/base_tools/__openerp__.py
+++ b/addons/base_tools/__openerp__.py
@@ -13,7 +13,6 @@ Creates menu link for Tools from where tools like survey, lunch, idea are access
     """,
     'data': ['tools_view.xml'],
     'installable': True,
-    'certificate' : '00571588675379342237'
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index dfa23bb54fe..3071ddf2f5a 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -58,7 +58,6 @@ only the country code will be validated.
     'data': ['base_vat_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0084849360989',
     'images': ['images/1_partner_vat.jpeg'],
 }
 
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 2690012f3b4..e699e091176 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -42,7 +42,6 @@ Allows users to create custom dashboard.
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0076912305725',
     'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 4d35b00bdb4..45edd6e659e 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -69,7 +69,6 @@ To access OpenERP Calendar using WebCal to remote site use the URL like:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00924841426645403741',
     'images': ['images/calendar_collections.jpeg','images/calendars.jpeg','images/export_ics_file.jpeg'],
 }
 
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 9e3f7f59ca2..453312233f6 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -35,7 +35,6 @@ Adds a Claim link to the delivery order.
               'claim_delivery_data.xml',],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001101649349223746957',
     'images': ['images/1_claim_link_delivery_order.jpeg'],
 }
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 135f4237f1c..2a7996655a2 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -122,7 +122,6 @@ Dashboard for CRM will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0079056041421',
     'images': ['images/sale_crm_crm_dashboard.png', 'images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index f1f9f05cafd..ffcb23fd315 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -42,7 +42,6 @@ Caldav features in Meeting.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001088048737252670109',
     'images': ['images/caldav_browse_step1.jpeg','images/caldav_browse_step2.jpeg'],
 }
 
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index f35dd306e93..f5ab836401b 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -48,7 +48,6 @@ automatically new claims based on incoming emails.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00612027414703404749',
     'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
 }
 
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index e2d246cb2db..2d8aff643bd 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -47,7 +47,6 @@ and categorize your interventions with a channel and a priority level.
     'test': ['test/process/help-desk.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00830691522781519309',
     'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'],
 }
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index c9d6990025c..cb952606e76 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -50,7 +50,6 @@ You can also use the geolocalization without using the GPS coordinates.
     'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00503409558942442061',
     'images': ['images/partner_geo_localization.jpeg','images/partner_grade.jpeg'],
 }
 
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 99e1b6c5f41..4f182f4d447 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -47,7 +47,6 @@ were overlapping.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0033984979005',
     'images': ['images/profiling_questionnaires.jpeg','images/profiling_questions.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 107fb49a1c5..5360adbd6f2 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -37,7 +37,6 @@ The decimal precision is configured per company.
     ],
     'demo': [],
     'installable': True,
-    'certificate' : '001307317809612974621',
     'images': ['images/1_decimal_accuracy_form.jpeg','images/1_decimal_accuracy_list.jpeg'],
 }
 
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 6a355096e4e..0ea891bb6ae 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -44,7 +44,6 @@ invoices from picking, OpenERP is able to add and compute the shipping line.
     'test': ['test/delivery_cost.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0033981912253',
     'images': ['images/1_delivery_method.jpeg','images/2_delivery_pricelist.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 212965a8162..3dc14054b40 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -59,7 +59,6 @@ ATTENTION:
     'test': ['test/document_test2.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0070515416461',
     'images': ['images/1_directories.jpeg','images/2_storage_media.jpeg','images/3_directories_structure.jpeg'],
 }
 
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index f8968d6c3df..23ff8f1e37d 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -48,7 +48,6 @@ FTP client.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
     'post_load': 'post_load',
 }
diff --git a/addons/document_page/__openerp__.py b/addons/document_page/__openerp__.py
index eec5166b0bf..f08315bf61e 100644
--- a/addons/document_page/__openerp__.py
+++ b/addons/document_page/__openerp__.py
@@ -42,7 +42,6 @@ Web pages
     'test': ['test/document_page_test00.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086363630317',
     'images': [],
     'css' : ['static/src/css/document_page.css'],
 }
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 1f7cb20e795..ec112ec7c38 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -70,7 +70,6 @@ which needs explicit configuration in openerp-server.conf too.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001236490750845657973',
     'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
 }
 
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index eb64d9b3fdd..b06c01eb03b 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -43,7 +43,6 @@ documentation at http://doc.openerp.com.
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '002046536359186',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index aaf2f52289a..f79800a76b9 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -65,7 +65,6 @@ campaigns on any OpenERP document.
     'demo': ['res_partner_demo.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00817073628967384349',
     'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'],
 }
 
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index b6710c8bac4..81fb24455f5 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -36,7 +36,6 @@ This module allows you to create retro planning for managing your events.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0069726863885',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 3bfcf4d95a3..bba1fc22e07 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -64,7 +64,6 @@ For more specific needs, you may also assign custom-defined actions
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00692978332890137453',
     'images': ['images/1_email_servers.jpeg'],
 }
 
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 36a10355990..e1963e3f8f4 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -40,6 +40,5 @@ Using this you can directly open Google Map from the URL widget.""",
     'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0029498930765',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b99482ef8c5..0a93d844180 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -68,7 +68,6 @@ You can manage:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0086710558965',
     'css': [ 'static/src/css/hr.css' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index cb2cd261773..f47b0900fb6 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -51,7 +51,6 @@ actions(Sign in/Sign out) performed by them.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0063495605613',
     
     #web
     "js": ["static/src/js/attendance.js"],
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 98f6162778a..ec33b5f44aa 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -48,6 +48,5 @@ You can assign several contracts per employee.
     'test': ['test/test_hr_contract.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0046298028637',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 6a8a802e1e1..fb3d87f2bc1 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -62,7 +62,6 @@ Key Features
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00883207679172998429',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 64648c65fee..4b273a9cc81 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -67,7 +67,6 @@ This module also uses analytic accounting and is compatible with the invoice on
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062479841789',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 512ab8e425d..3cf4a30a2e1 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -66,6 +66,5 @@ A synchronization with an internal agenda (Meetings of the CRM module) is also p
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0086579209325',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 62a0348940b..dfa87622264 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -67,7 +67,6 @@ Generic Payroll system.
     'demo': ['hr_payroll_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001046261404562128861',
     'application': False,
 }
 
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 3f960507a8d..7c7e7bd9dda 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -44,7 +44,6 @@ Generic Payroll system Integrated with Accounting.
     'test': ['test/hr_payroll_account.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00923971112835220957',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index d498e41498d..a5a1ec310d5 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -64,7 +64,6 @@ You can define the different phases of interviews and easily rate the applicant
     'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '001073437025460275621',
     'application': True,
 }
 
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 2162b6095e8..c7af21ee0be 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -62,6 +62,5 @@ up a management by affair.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0071405533469',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 047f0b414dc..65ccc8948c2 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -54,6 +54,5 @@ reports.""",
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056091842381',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index fbe4bc85503..9aab412d425 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -64,7 +64,6 @@ The validation can be configured in the company:
     'test':['test/test_hr_timesheet_sheet.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0073297700829',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 14b2d045d6c..49600f63ddd 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -43,7 +43,6 @@ document and Wiki based Hidden.
     'demo': ['knowledge_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001278773815843749581',
     'images': ['images/1_config_knowledge.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index c2ccf511e3c..a956ea7ebe0 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -76,7 +76,6 @@ Wizards provided by this module:
     ],
     'demo': [],
     'installable': True,
-    'certificate': '0031977724637',
     'images': ['images/1_config_chart_l10n_be.jpeg','images/2_l10n_be_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py
index bd323478886..2c8931f484c 100644
--- a/addons/l10n_be_coda/__openerp__.py
+++ b/addons/l10n_be_coda/__openerp__.py
@@ -105,7 +105,6 @@ If required, you can manually adjust the descriptions via the CODA configuration
     'auto_install': False,
     'installable': True,
     'license': 'AGPL-3',
-    'certificate' : '001237207321716002029',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 99923f1a5e5..766ae6c60bb 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -75,7 +75,6 @@ for online use of 'private modules'.""",
         'l10n_br_view.xml',
                 ],
     'installable': True,
-    'certificate' : '001280994939126801405',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 5f12d7331b6..9c3cfea2fb1 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -46,7 +46,6 @@ Canadian accounting charts and localizations.
     ],
     'demo': [],
     'installable': True,
-    'certificate': '00941680933773696173',
     'images': ['images/config_chart_l10n_ca.jpeg','images/l10n_ca_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 4e8f13fda7a..ec50d9b0f8e 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -102,7 +102,6 @@ TODO :
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '001103836064567088989',
     'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 0cc26a5052e..3dd702a2d67 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -40,7 +40,6 @@
     'license': 'GPL-3',
     'auto_install': False,
     'installable': True,
-    'certificate': '00925445983542952285',
     'images': ['images/config_chart_l10n_cn.jpeg','images/l10n_cn_chart.jpeg'],
 }
 
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index cc90ed3be9e..79a769e9e8e 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -68,7 +68,6 @@ please go to http://translations.launchpad.net/openerp-costa-rica.
     'license': 'Other OSI approved licence',
     'installable': True,
     'auto_install': False,
-    'certificate' : '00531476623680631853',
     'images': ['images/config_chart_l10n_cr.jpeg','images/l10n_cr_chart.jpeg'],
 }
 
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 299174da592..e9507595402 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -148,7 +148,6 @@ German accounting chart and localization.
         'l10n_de_wizard.xml',
     ],
     'installable': True,
-    'certificate': '00517849017945584893',
     'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'],
 }
 
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 62a32a526c3..3414f969dcd 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -42,7 +42,6 @@ Accounting chart and localization for Ecuador.
     ],
     'demo': [],
     'installable': True,
-    'certificate' : '001226484516187330589',
     'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'],
 }
 
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index 9b7a7517974..2264988fd99 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -54,7 +54,6 @@ Spanish Charts of Accounts (PGCE 2008).
     'demo': [],
     'auto_install': False,
     'installable': True,
-    'certificate': '00408828172062583229',
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
 
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 65a2621f03a..e1d4b9ac334 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -68,7 +68,6 @@ configuration of their taxes and fiscal positions manually.
     ],
     'test': ['test/l10n_fr_report.yml'],
     'demo': [],
-    'certificate': '00435321693876313629',
     'auto_install': False,
     'installable': True,
     'images': ['images/config_chart_l10n_fr.jpeg','images/l10n_fr_chart.jpeg'],
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
index 327ab35d5c0..386f4be71e8 100644
--- a/addons/l10n_fr_rib/__openerp__.py
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -53,7 +53,6 @@ Accounts in OpenERP: the first with the type 'RIB', the second with the type 'IB
     'depends': ['account', 'base_iban'],
     'data': ['bank_data.xml', 'bank_view.xml'],
     'installable': True,
-    'certificate': '003407950790',
     'auto_install': False,
 }
 
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 62d82b544d8..aac13487189 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -41,7 +41,6 @@ Greek accounting chart and localization.
                'l10n_gr_wizard.xml'
     ],
     'installable': True,
-    'certificate': '001146244418929008029',
     'images': ['images/config_chart_l10n_gr.jpeg','images/l10n_gr_chart.jpeg'],
 }
 
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index e36e418ee21..adba0898449 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -54,7 +54,6 @@ taxes and the Quetzal currency.""",
     ],
     'demo': [],
     'installable': True,
-    'certificate': '00815146661827601309',
     'images': ['images/config_chart_l10n_gt.jpeg','images/l10n_gt_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index b1cab835f96..b3dab229201 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -45,7 +45,6 @@ Indian accounting chart and localization.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001308250150600713245',
     'images': ['images/config_chart_l10n_in.jpeg','images/l10n_in_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index a9177fee033..00ba19e9c42 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -52,6 +52,5 @@ Italian accounting chart and localization.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00926677190009155165',
     'images': ['images/config_chart_l10n_it.jpeg','images/l10n_it_chart.jpeg'],
 }
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 70f30444a3e..588102989ac 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -45,7 +45,6 @@ This is the base module to manage the accounting chart for Luxembourg.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0078164766621',
     'images': ['images/config_chart_l10n_lu.jpeg','images/l10n_lu_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 37f477d363c..1648fb6b171 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -47,7 +47,6 @@ Seddik au cours du troisième trimestre 2010.""",
     'demo' : [],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00599614652359069981',
     'images': ['images/config_chart_l10n_ma.jpeg','images/l10n_ma_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 25ec7cc98c4..02904431151 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -37,7 +37,6 @@ Mexican accounting chart and localization.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '00858539161332598061',
     'images': ['images/config_chart_l10n_mx.jpeg','images/l10n_mx_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index a263f912183..b612d07c147 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -127,7 +127,6 @@ De extra cijfers worden dan achter het rekeningnummer aangevult met 'nullen'.
     ],
     'demo' : [],
     'installable': True,
-    'certificate': '00976041422960053277',
     'images': ['images/config_chart_l10n_nl.jpeg','images/l10n_nl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py
index 9ae3e351d13..f194576aa27 100644
--- a/addons/l10n_pe/__openerp__.py
+++ b/addons/l10n_pe/__openerp__.py
@@ -42,7 +42,6 @@ SUNAT 2011 (PCGE 2010).
     'demo': [],
     'active': False,
     'installable': True,
-    'certificate' : '0045046493412',
     'images': ['images/config_chart_l10n_pe.jpeg','images/l10n_pe_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index df8d2955e8e..a14828fe9de 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -41,7 +41,6 @@ VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów zakł
     ],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00885794372803776829',
     'images': ['images/config_chart_l10n_pl.jpeg','images/l10n_pl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index 22df6955a5f..8026d49c3db 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -36,7 +36,6 @@ Romanian accounting chart and localization.
     'data' : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001308250150602948125',
     'images': ['images/config_chart_l10n_ro.jpeg','images/l10n_ro_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index d2c5d07142a..94340954abc 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -34,7 +34,6 @@ Thai accounting chart and localization.
     'depends': ['account_chart'],
     'data': [ 'account_data.xml' ],
     'installable': True,
-    'certificate' : '00722263103978957725',
     'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'],
 }
 
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index e5e7aaf59c8..2a6f10ddb29 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -46,7 +46,6 @@ Provide Templates for Chart of Accounts, Taxes for Uruguay.
     'demo': [],
     'auto_install': False,
     'installable': True,
-    'certificate': '0078287892698',
     'images': ['images/config_chart_l10n_uy.jpeg','images/l10n_uy_chart.jpeg'],
 }
 
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index fcb5110714e..f10f4d0db61 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -41,7 +41,6 @@ Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '00763145921185574557',
     'images': ['images/config_chart_l10n_ve.jpeg','images/l10n_ve_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index f84edb1db35..f3791da7acd 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -46,7 +46,6 @@ Category for the product.
     'demo': ['lunch_demo.xml'],
     'test': ['test/test_lunch.yml', 'test/lunch_report.yml'],
     'installable': True,
-    'certificate' : '001292377792581874189',
     'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
 }
 
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 387b1e19301..5a3c48de675 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -67,7 +67,6 @@ Main Features
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
         'images/messages_form.jpeg',
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 90f6e076cae..0c77fe59a86 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -42,7 +42,6 @@ Contains the installer for marketing-related modules.
     'demo': ['marketing_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00598574977629228189',
     'images': ['images/config_marketing.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 61d5d2ada29..a51347fd1bb 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -68,7 +68,6 @@ input segments, workflow.
     'test': ['test/marketing_campaign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00421723279617928365',
     'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index aae0d72e9d0..9265561bd64 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -39,7 +39,6 @@ Creates demo data like leads, campaigns and segments for the module marketing_ca
     'demo': ['marketing_campaign_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '001005497972871352957',
     'images': ['images/campaigns.jpeg','images/email_templates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 316a2f0f120..4a0a80694b3 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -51,7 +51,6 @@ invoice and send propositions for membership renewal.
     'test': ['test/test_membership.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042907796381',
     'images': ['images/members.jpeg','images/membership_list.jpeg', 'images/membership_products.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index cce5272bd79..73564f2b460 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -84,6 +84,5 @@ Dashboard / Reports for MRP will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0032052481373',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index ddd5e3d63fb..9df8ab9908b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -45,6 +45,5 @@ In that case, you can not use priorities any more on the different picking.
     'test': ['test/mrp_jit.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086634760061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index a5bda80f924..97c76f90546 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -73,6 +73,5 @@ So, that we can compare the theoretic delay and real delay.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056233813133',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index da4070d6210..d522bdc36e8 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -59,6 +59,5 @@ The following topics should be covered by this module:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0060814381277',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index c45584eb1a9..6475cbe4a91 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -50,6 +50,5 @@ With this module:
     'test': ['test/mrp_subproduct.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0050060616733',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 501740188db..bbaa161ee57 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -41,7 +41,6 @@ This module is the base module for other multi-company modules.
     'demo': ['multi_company_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001115526094673097933',
     'images': ['images/companies.jpeg','images/default_company_per_object_form.jpeg', 'images/default_company_per_object_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 50b280d2c32..b99e6d828c9 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -18,7 +18,6 @@ pads (by default, http://ietherpad.com/).
     'installable': True,
     'auto_install': False,
     'web': True,
-    'certificate' : '001183545978470526509',
     'js': ['static/src/js/pad.js'],
     'qweb' : ['static/src/xml/*.xml'],
     'images': ['static/src/img/pad_link_companies.jpeg'],
diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py
index 3f26399e71f..98a1d70eb9f 100644
--- a/addons/plugin_outlook/__openerp__.py
+++ b/addons/plugin_outlook/__openerp__.py
@@ -40,7 +40,6 @@ into mail.message with attachments.
     'data' : ['plugin_outlook.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001278773815818292125',
     'images': ['images/config_outlook.jpeg','images/outlook_config_openerp.jpeg','images/outlook_push.jpeg'],
 
 }
diff --git a/addons/plugin_thunderbird/__openerp__.py b/addons/plugin_thunderbird/__openerp__.py
index 54e05603e53..56c9d47cd65 100644
--- a/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@ -40,6 +40,5 @@ HR Applicant and Project Issue from selected mails.
     'data' : ['plugin_thunderbird.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00899858104035139949',
     'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],
 }
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index f0ece3704dc..fcae18c5490 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -43,7 +43,6 @@ This module shows the basic processes involved in the selected modules and in th
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0055447636669',
     'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'],
     'js': [
         'static/src/js/process.js'
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index e797766eb40..a1aed1dfba8 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -61,7 +61,6 @@ depending on the product's configuration.
     'test': ['test/procurement.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '00954248826881074509',
     'images': ['images/compute_schedulers.jpeg','images/config_companies_sched.jpeg', 'images/minimum_stock_rules.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 0c14b999e99..fdadda2e4d4 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -66,7 +66,6 @@ Print product labels with barcode.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0068861431437',
     'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index b4f66edc482..ae65c9092b3 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -39,7 +39,6 @@ Used, for example, in food industries.""",
     'data' : ['product_expiry_view.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate': '00421222123914960109',
     'images': ['images/production_lots_dates.jpeg','images/products_dates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 8e24f8476f0..f43ed923860 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -41,7 +41,6 @@ You can now define the following for a product:
     ],
     'auto_install': False,
     'installable': True,
-    'certificate': '00720153953662760781',
     'images': ['images/products_manufacturer.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 76e4d3964b1..41c2a53474a 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -41,7 +41,6 @@ The wizard to launch the report has several options to help you get the data you
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0064392591773',
     'images': ['images/open_margins.jpeg','images/product_margins_form.jpeg', 'images/product_margins_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index d3c35dfe8b0..09cf5ce61fd 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -40,7 +40,6 @@ To this end, a new check box named 'Visible Discount' is added to the pricelist
     'data': ['product_visible_discount_view.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001144718884654279901',
     'images': ['images/pricelists_visible_discount.jpeg'],
 }
 
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index ddd1eba5ca0..17588a4de02 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -38,7 +38,6 @@ modules like share, lunch, pad, idea, survey and subscription.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00557100228403879621',
     'images': ['images/config_extra_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index edf0100c8bc..85e33be777a 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -85,6 +85,5 @@ Dashboard / Reports for Project Management will include:
     'application': True,
     'css': ['static/src/css/project.css'],
     'js': ['static/src/js/project.js'],
-    'certificate': '0075116868317',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index ae1d5ee909c..eb05cdfa848 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -53,6 +53,5 @@ GTD rests on the principle that a person needs to move tasks out of the mind by
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0043525236301',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 1c4006329a9..f35ca0251d3 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -61,7 +61,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '001236490750848623845',
     'js': ['static/src/js/project_issue.js'],
 }
 
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index e12bc1a14cd..3eac04133d4 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -44,7 +44,6 @@ Worklogs can be maintained to signify number of hours spent by users to handle a
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00856032058128997037',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 2968a5b035d..3a3307d2898 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -58,7 +58,6 @@ Features:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '001227470751077315069',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index dd20c1c9c1e..91212b92c1d 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -55,6 +55,5 @@ task is completed.
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0031976495453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index e3e7a444676..4fc0dc41a75 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -37,6 +37,5 @@ the tasks will change accordingly.
     'test': ['test/deadline_change.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0057235475485',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 805556c1a96..0651d7b9ce4 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -49,6 +49,5 @@ with the effect of creating, editing and deleting either ways.
     ],
     'installable': True,
     'auto_install': True,
-    'certificate': '0075123647453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 38706d96670..a7c66344f4a 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -84,7 +84,6 @@ Dashboard / Reports for Purchase Management will include:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0057234283549',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 801551c7a07..98a1ee2a704 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -39,6 +39,5 @@ on a supplier purchase order into several accounts and analytic plans.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062176518909',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index d05870ca951..8c56f2af9ed 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -46,9 +46,7 @@ exceeds minimum amount set by configuration wizard.
     ],
     'demo': [],
     'installable': True,
-    'auto_install': False,
-    'certificate' : '00436592682510544157',
-
+    'auto_install': False
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 30af4699c48..2ba0ad95e09 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -48,7 +48,6 @@ keep track and order all your purchase orders.
         'test/cancel_purchase_requisition.yml',
     ],
     'installable': True,
-    'certificate': '001023264099823179629',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index 3a2b9e95ea5..2bfba48b204 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -38,7 +38,6 @@ modules like base_report_designer and base_report_creator.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00764037194670093149',
     'images': ['images/config_reporting_Hidden.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index aa4fa31a0b0..0fa57977db1 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -43,7 +43,6 @@ European Union.""",
     'test': ['test/report_intrastat_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056982189085',
     'images': ['images/country_intrastat_code.jpeg','images/intrastat_code.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 28ad16b63d4..5b88cb78eb4 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -91,7 +91,6 @@ TODO:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '001159699313338995949',
     'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'],
 }
 
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
index d10c336609e..7ea85759732 100644
--- a/addons/report_webkit_sample/__openerp__.py
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -49,7 +49,6 @@ You have to create the print buttons by calling the wizard. For more details see
     'data': ['report_webkit_html_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00436592682591421981',
     'images': ['images/webkit_invoice_report.jpeg'],
 }
 
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 94c55105c2a..b8a9f57c910 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -47,7 +47,6 @@ associated to every resource. It also manages the leaves of every resource.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00746371192190459469',
     'images': ['images/resource_leaves_calendar.jpeg','images/resource_leaves_form.jpeg'],
 }
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 13f0fb53696..d76ea064c2c 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -88,6 +88,5 @@ The Dashboard for the Sales Manager will include
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '0058103601429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index df33feae578..5f4d980a339 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -37,6 +37,5 @@ Using this module you will be able to link analytic accounts to sales orders.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0066055860861',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 4846b61f624..88608af8922 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -49,6 +49,5 @@ modules.
     'test': ['test/sale_crm.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '0064360130141',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 9ca3858f817..30a6a281c49 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -61,6 +61,5 @@ Some statistics by journals are provided.
     'test': [ ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0077661619085',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 6cacdcda7b4..9b393b6c5ad 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -37,7 +37,6 @@ Price and Cost Price.
     'data':['security/ir.model.access.csv','sale_margin_view.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001165700015525701661',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index c93fdcc91fd..bc9b84cd471 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -43,6 +43,5 @@ from sales order. It adds sales name and sales Reference on production order.
     'test':['test/sale_mrp.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '00395598976683092013',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index 7c3360f3547..6db8f2b27d9 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -43,7 +43,6 @@ You can add the following additional dates to a sale order:
     'test': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00867497685972962845',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 87a2f68bb04..94eccba2a56 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -50,7 +50,6 @@ synchronization with other companies.
     ],
     'installable': True,
     'web': True,
-    'certificate' : '001301246528927038493',
     'js': ['static/src/js/share.js'],
     'css': ['static/src/css/share.css'],
     'qweb' : ['static/src/xml/*.xml'],
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index b7d9ec1ceb9..966186121b6 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -98,7 +98,6 @@ Dashboard / Reports for Warehouse Management will include:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0055421559965',
     'css': [ 'static/src/css/stock.css' ],
 }
 
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index 57b4f8e38bb..d6f8472a8c6 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -40,6 +40,5 @@ wizard if the delivery is to be invoiced.
     'test': ['test/stock_invoice_directly.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0081385081261',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 8cc1790e7de..9d5386863e6 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -107,7 +107,6 @@ You can use the demo data as follow:
         'test/stock_location_push_flow.yml',
     ],
     'auto_install': False,
-    'certificate': '0046505115101',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index d8fbb44d8bf..daae84252ad 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -41,6 +41,5 @@ routing of the assembly operation.
     'test': ['test/stock_no_autopicking.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0075124168925',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 7e38019e3f3..ff626c63679 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -243,7 +243,6 @@ Remarks:
     'test': ['test/stock_planning.yml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '00872589676639788061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index d644daa15e6..416c691f043 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -42,7 +42,6 @@ e.g. To have an invoice generated automatically periodically:
     'demo': ['subscription_demo.xml',],
     'installable': True,
     'auto_install': False,
-    'certificate': '0029454782573',
     'images': ['images/subscription_document_fields.jpeg','images/subscriptions.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 40eb3073d61..acd76ba9a6b 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -58,7 +58,6 @@ user name and password for the invitation of the survey.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001131639736864143245',
     'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],   
     'css': ['static/src/css/survey.css','static/css/survey.css'],
 }
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index c03dc1ec488..e44b9624251 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -37,7 +37,6 @@ picking and invoice. The message is triggered by the form's onchange event.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080334018749',
     'images': ['images/customers_warnings.jpeg','images/sale_order_warning.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: