From da4cf6d55c933ce8de12c03bd2c599e41e8521ba Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP)" <voraamitr@gmail.com>
Date: Wed, 26 Feb 2014 11:46:23 +0530
Subject: [PATCH 01/44] [FIX] override copy method to avoid duplicate child ids

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

bzr revid: voraamitr@gmail.com-20140226061623-255kguaytkex9a8m
---
 addons/hr/hr.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 2cdb964f45f..4f262fae7a1 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -211,7 +211,14 @@ class hr_employee(osv.osv):
     }
 
     _order='name_related'
-
+    
+    def copy(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'child_ids': False})
+        return super(hr_employee, self).copy(cr, uid, ids, default, context=context)
+        
     def create(self, cr, uid, data, context=None):
         employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
         try:
@@ -302,6 +309,13 @@ class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
 
+    def copy(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'employee_ids': False})
+        return super(res_users, self).copy(cr, uid, ids, default, context=context)
+    
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
 

From 5de677208c8db5589f20727d987b729dc9545976 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 18 Mar 2014 15:06:11 +0530
Subject: [PATCH 02/44] [FIX] [saas-3/trunk] IE9: Bad display of the address on
 a contact attached to a company

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

bzr revid: psa@tinyerp.com-20140318093611-iis8wfuzgqclngnm
---
 openerp/addons/base/res/res_partner_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index a0e32ab83bd..02bee3d719e 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -156,10 +156,12 @@
 
                             <label for="street" string="Address"/>
                             <div>
-                                <field name="use_parent_address" class="oe_edit_only oe_inline"
-                                       on_change="onchange_address(use_parent_address, parent_id)"
-                                       attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
-                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                <div class="oe_edit_only">
+                                    <field name="use_parent_address" class="oe_inline"
+                                           on_change="onchange_address(use_parent_address, parent_id)"
+                                           attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                    <label for="use_parent_address" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                </div>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>

From d77b000aff4f842b111eaea035b33350ac3e287d Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Wed, 23 Apr 2014 14:14:11 +0200
Subject: [PATCH 03/44] [FIX] Don't reset an existing but empty
 mail.catchall.domain

bzr revid: stefan@therp.nl-20140423121411-l3qyijr6fnsexrtn
---
 addons/mail/res_config.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 91606e1c720..0e2e362d07b 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -33,14 +33,14 @@ class project_configuration(osv.TransientModel):
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
-        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
-        if not alias_domain:
+        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", default=None, context=context)
+        if alias_domain is None:
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
             try:
                 alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
             except Exception:
                 pass
-        return {'alias_domain': alias_domain}
+        return {'alias_domain': alias_domain or False}
 
     def set_alias_domain(self, cr, uid, ids, context=None):
         config_parameters = self.pool.get("ir.config_parameter")

From 37c41f9c78ef7ef2eab0f1cd74f907cbe824c95c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 29 Apr 2014 16:53:32 +0200
Subject: [PATCH 04/44] [FIX] stock: when delivering a product in average cost,
 make sure the price_unit on the stock.move is up to date (opw 607272)

bzr revid: mat@openerp.com-20140429145332-s3c22w47aihdsfub
---
 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 9a1c93f436e..d2d5ba3fab1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2322,7 +2322,9 @@ class stock_move(osv.osv):
 
         # if product is set to average price and a specific value was entered in the picking wizard,
         # we use it
-        if move.product_id.cost_method == 'average' and move.price_unit:
+        if move.location_dest_id.usage != 'internal' and move.product_id.cost_method == 'average':
+            reference_amount = qty * move.product_id.standard_price
+        elif move.product_id.cost_method == 'average' and move.price_unit:
             reference_amount = qty * move.price_unit
             reference_currency_id = move.price_currency_id.id or reference_currency_id
 

From c1601e75d37cea87cb41fd7fe501d2eb8fc5ff74 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 30 Apr 2014 13:37:30 +0200
Subject: [PATCH 05/44] [FIX] sign in and sign out were broken in rev 10019 as
 it doesn't provide a date to conversion of attendance time to employee
 timezone

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

bzr revid: yannick.vaucher@camptocamp.com-20140430113730-cn3xw66fbik8p32n
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 47fb0a0810d..1d7e701ed14 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -407,6 +407,9 @@ class hr_attendance(osv.osv):
             employee = employee_obj.browse(cr, uid, employee_id, context=context)
             tz = employee.user_id.partner_id.tz
 
+        if not date:
+            date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
         att_tz = timezone(tz or 'utc')
 
         attendance_dt = datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT)

From 434c3c455e90a34cb20215532b5da16205227e5c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 1 May 2014 23:45:01 +0200
Subject: [PATCH 06/44] [FIX] free chs who was stuck in a 2010 spacetime
 continuum

bzr revid: al@openerp.com-20140501214501-dnt6qjxvqa8tm58o
---
 openerp/addons/base/security/base_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index c0f4242198c..755e20c3832 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -43,7 +43,7 @@
 
         <!-- Set accesses to menu -->
         <record model="ir.ui.menu" id="base.menu_administration">
-            <field name="name">Administration</field>
+            <field name="name">Settings</field>
             <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
         </record>
 

From 03b03d04767b99d1a29b0b2131879036c947a332 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 2 May 2014 12:15:25 +0200
Subject: [PATCH 07/44] [FIX] crm: in order the mark as lost action to work,
 the dead stage has to be folded

bzr revid: dle@openerp.com-20140502101525-bzyjpz7jbr1njobl
---
 addons/crm/crm_lead_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 6bb8e2700d4..4defb8d5021 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -14,6 +14,7 @@
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Dead</field>
             <field name="case_default">1</field>
+            <field name="fold">1</field>
             <field name="probability">0</field>
             <field name="on_change">1</field>
             <field name="sequence">30</field>

From df80f783932cae253912f639d9ea03c0aa928041 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Fri, 2 May 2014 14:34:07 +0200
Subject: [PATCH 08/44] [FIX] Webiste google Map - don't force http

bzr revid: jke@openerp.com-20140502123407-ojyzpf2dynewo7u0
---
 addons/website_google_map/views/google_map.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_google_map/views/google_map.xml b/addons/website_google_map/views/google_map.xml
index 1c4254786f2..d9a9d2740e8 100644
--- a/addons/website_google_map/views/google_map.xml
+++ b/addons/website_google_map/views/google_map.xml
@@ -26,10 +26,10 @@
       }
     </style>
     <script>var partner_url = '<t t-raw="partner_url or ''"/>';</script>
-    <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+    <script src="//maps.google.com/maps/api/js?sensor=false"></script>
     <script type="text/javascript" t-attf-src="/google_map/partners.json?partner_ids=#{ partner_ids }"></script>
     <script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
-    <script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
+    <script src="//code.jquery.com/jquery-1.6.1.min.js"></script>
     <script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
   </head>
   <body>

From 7ad6d7a1500f6618eb6c9030c7d1eb444a150144 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 2 May 2014 15:03:10 +0200
Subject: [PATCH 09/44] [FIX] Report: usage of ids in get_action more
 consistent: only pass them when they are useful, else pass an empty list

bzr revid: sle@openerp.com-20140502130310-106au0jsza0b3nwe
---
 addons/account/account_invoice.py             |  2 +-
 .../wizard/account_analytic_balance_report.py |  2 +-
 ...analytic_cost_ledger_for_journal_report.py |  2 +-
 .../account_analytic_cost_ledger_report.py    |  2 +-
 ...ccount_analytic_inverted_balance_report.py |  2 +-
 .../wizard/account_analytic_journal_report.py |  2 +-
 .../wizard/account_financial_report.py        |  2 +-
 .../wizard/account_report_account_balance.py  |  3 ++-
 .../account_report_aged_partner_balance.py    |  2 +-
 .../wizard/account_report_central_journal.py  |  3 ++-
 .../wizard/account_report_general_journal.py  |  3 ++-
 .../wizard/account_report_general_ledger.py   |  2 +-
 .../wizard/account_report_partner_balance.py  |  2 +-
 .../wizard/account_report_partner_ledger.py   |  4 +--
 .../wizard/account_report_print_journal.py    |  4 +--
 addons/account/wizard/account_vat.py          |  2 +-
 .../wizard/account_crossovered_analytic.py    |  3 ++-
 .../wizard/account_budget_analytic.py         |  2 +-
 .../account_budget_crossovered_report.py      |  2 +-
 ...count_budget_crossovered_summary_report.py |  2 +-
 .../wizard/account_budget_report.py           |  2 +-
 .../account_check_writing/account_voucher.py  | 25 ++++++------------
 .../wizard/account_check_batch_printing.py    | 26 +++++--------------
 addons/account_followup/account_followup.py   |  2 +-
 addons/report/models/report.py                |  9 +++++--
 25 files changed, 50 insertions(+), 62 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c23f0c37115..35979cd808e 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -409,7 +409,7 @@ class account_invoice(osv.osv):
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time.'
         self.write(cr, uid, ids, {'sent': True}, context=context)
-        return self.pool['report'].get_action(cr, uid, [], 'account.report_invoice', context=context)
+        return self.pool['report'].get_action(cr, uid, ids, 'account.report_invoice', context=context)
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
         '''
diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py
index 3a3c301cffc..062945fa53e 100644
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@@ -50,6 +50,6 @@ class account_analytic_balance(osv.osv_memory):
 
         datas['form']['active_ids'] = context.get('active_ids', False)
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticbalance', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticbalance', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 125dfda46fb..ab84af4880a 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -49,6 +49,6 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
         }
 
         datas['form']['active_ids'] = context.get('active_ids', False)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledgerquantity', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticcostledgerquantity', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
index 5f00c3c9ac5..978863f5900 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@@ -49,6 +49,6 @@ class account_analytic_cost_ledger(osv.osv_memory):
 
         datas['form']['active_ids'] = context.get('active_ids', False)
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledger', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticcostledger', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index ad79c0b33f6..93946960297 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -47,6 +47,6 @@ class account_analytic_inverted_balance(osv.osv_memory):
             'form': data
         }
         datas['form']['active_ids'] = context.get('active_ids', False)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_invertedanalyticbalance', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_invertedanalyticbalance', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index f2e406bc3a5..d8790e805d8 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -57,7 +57,7 @@ class account_analytic_journal_report(osv.osv_memory):
         context2 = context.copy()
         context2['active_model'] = 'account.analytic.journal'
         context2['active_ids'] = ids_list
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticjournal', data=datas, context=context2)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticjournal', data=datas, context=context2)
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index 6c1b57fa428..721e47193a2 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -89,6 +89,6 @@ class accounting_report(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data['form'].update(self.read(cr, uid, ids, ['date_from_cmp',  'debit_credit', 'date_to_cmp',  'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp',  'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter','target_move'], context=context)[0])
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_financial', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_financial', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 3b9d3c21777..9eba5f24b99 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 
+
 class account_balance_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _name = 'account.balance.report'
@@ -36,6 +37,6 @@ class account_balance_report(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_trialbalance', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_trialbalance', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index c918a1119fd..d7b57eaba02 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -81,6 +81,6 @@ class account_aged_trial_balance(osv.osv_memory):
         data['form'].update(res)
         if data.get('form',False):
             data['ids']=[data['form'].get('chart_account_id',False)]
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_agedpartnerbalance', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_agedpartnerbalance', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index 9f22d49afac..a31fef91ae4 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 
+
 class account_central_journal(osv.osv_memory):
     _name = 'account.central.journal'
     _description = 'Account Central Journal'
@@ -32,6 +33,6 @@ class account_central_journal(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_centraljournal', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_centraljournal', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py
index 3d9d55b19c1..c35a5920428 100644
--- a/addons/account/wizard/account_report_general_journal.py
+++ b/addons/account/wizard/account_report_general_journal.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 
+
 class account_general_journal(osv.osv_memory):
     _inherit = "account.common.journal.report"
     _name = 'account.general.journal'
@@ -32,6 +33,6 @@ class account_general_journal(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_generaljournal', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_generaljournal', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index c75477da40a..5f0a302d720 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -59,6 +59,6 @@ class account_report_general_ledger(osv.osv_memory):
         if data['form']['landscape'] is False:
             data['form'].pop('landscape')
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_generalledger', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_generalledger', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index d4b5fb27d14..7485bec67fe 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -44,6 +44,6 @@ class account_partner_balance(osv.osv_memory):
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_partnerbalance', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerbalance', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index eb743e32e4f..38ff6988fd7 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -58,7 +58,7 @@ class account_partner_ledger(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'filter', 'page_split', 'amount_currency'])[0])
         if data['form'].get('page_split') is True: 
-            return self.pool['report'].get_action(cr, uid, ids, 'account.report_partnerledgerother', data=data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_partnerledger', data=data, context=context)
+            return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerledgerother', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerledger', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index 3aafc63acf4..1f6b6e0cf4d 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -67,8 +67,8 @@ class account_print_journal(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         data['form'].update(self.read(cr, uid, ids, ['sort_selection'], context=context)[0])
         if context.get('sale_purchase_only'):
-            return self.pool['report'].get_action(cr, uid, ids, 'account.report_salepurchasejournal', data=data, context=context)
+            return self.pool['report'].get_action(cr, uid, [], 'account.report_salepurchasejournal', data=data, context=context)
         else:
-            return self.pool['report'].get_action(cr, uid, ids, 'account.report_journal', data=data, context=context)
+            return self.pool['report'].get_action(cr, uid, [], 'account.report_journal', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 5cc5c678df1..e7c806be2f9 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -61,6 +61,6 @@ class account_vat_declaration(osv.osv_memory):
         taxcode = taxcode_obj.browse(cr, uid, [taxcode_id], context=context)[0]
         datas['form']['company_id'] = taxcode.company_id.id
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_vat', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_vat', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index ccac123c681..1bdc91f2995 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -24,6 +24,7 @@ import time
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+
 class account_crossovered_analytic(osv.osv_memory):
     _name = "account.crossovered.analytic"
     _description = "Print Crossovered Analytic"
@@ -65,6 +66,6 @@ class account_crossovered_analytic(osv.osv_memory):
              'model': 'account.analytic.account',
              'form': data
         }
-        return self.pool['report'].get_action(cr, uid, ids, 'account_analytic_plans.report_crossoveredanalyticplans', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_analytic_plans.report_crossoveredanalyticplans', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index a58b804ebbf..bd3bbdc8d99 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -46,6 +46,6 @@ class account_budget_analytic(osv.osv_memory):
             'form': data
         }
         datas['form']['ids'] = datas['ids']
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_analyticaccountbudget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_analyticaccountbudget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index 96561df5af0..e47ff5cb421 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -47,6 +47,6 @@ class account_budget_crossvered_report(osv.osv_memory):
         }
         datas['form']['ids'] = datas['ids']
         datas['form']['report'] = 'analytic-full'
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_crossoveredbudget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_crossoveredbudget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
index 6b676ecc684..d79e6097787 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
@@ -49,6 +49,6 @@ class account_budget_crossvered_summary_report(osv.osv_memory):
         }
         datas['form']['ids'] = datas['ids']
         datas['form']['report'] = 'analytic-one'
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_crossoveredbudget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_crossoveredbudget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 2308b5ff9ac..fb1814a9171 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -47,6 +47,6 @@ class account_budget_report(osv.osv_memory):
         }
         datas['form']['ids'] = datas['ids']
         datas['form']['report'] = 'analytic-full'
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_budget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_budget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index c3abe28eef0..779ff61be44 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -74,26 +74,17 @@ class account_voucher(osv.osv):
 
     def print_check(self, cr, uid, ids, context=None):
         if not ids:
-            return  {}
+            raise osv.except_osv(_('Printing error'), _('No check selected '))
 
-        check_layout_report = {
-            'top' : 'account.print.check.top',
-            'middle' : 'account.print.check.middle',
-            'bottom' : 'account.print.check.bottom',
+        data = {
+            'id': ids and ids[0],
+            'ids': ids,
         }
 
-        check_layout = self.browse(cr, uid, ids[0], context=context).company_id.check_layout
-        return {
-            'type': 'ir.actions.report.xml', 
-            'report_name':check_layout_report[check_layout],
-            'datas': {
-                    'model':'account.voucher',
-                    'id': ids and ids[0] or False,
-                    'ids': ids and ids or [],
-                    'report_type': 'pdf'
-                },
-            'nodestroy': True
-            }
+        return self.pool['report'].get_action(
+            cr, uid, [], 'account_check_writing.report_check', data=data, context=context
+        )
+
     def create(self, cr, uid, vals, context=None):
         if vals.get('amount') and vals.get('journal_id') and 'amount_in_word' not in vals:
             vals['amount_in_word'] = self._amount_to_text(cr, uid, vals['amount'], vals.get('currency_id') or \
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
index c3a13e2c687..bf59557d904 100644
--- a/addons/account_check_writing/wizard/account_check_batch_printing.py
+++ b/addons/account_check_writing/wizard/account_check_batch_printing.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 from openerp.tools.translate import _
-
 from openerp.osv import fields, osv
 
+
 class account_check_write(osv.osv_memory):
     _name = 'account.check.write'
     _description = 'Prin Check in Batch'
@@ -64,23 +64,11 @@ class account_check_write(osv.osv_memory):
         ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
 
         #print the checks
-        check_layout_report = {
-            'top' : 'account.print.check.top',
-            'middle' : 'account.print.check.middle',
-            'bottom' : 'account.print.check.bottom',
+        data = {
+            'id': voucher_ids and voucher_ids[0],
+            'ids': voucher_ids,
         }
-        check_layout = voucher_obj.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout
-        if not check_layout:
-            check_layout = 'top'
-        return {
-            'type': 'ir.actions.report.xml', 
-            'report_name':check_layout_report[check_layout],
-            'datas': {
-                'model':'account.voucher',
-                'ids': voucher_ids,
-                'report_type': 'pdf'
-                },
-            'nodestroy': True
-            }
-
 
+        return self.pool['report'].get_action(
+            cr, uid, [], 'account_check_writing.report_check', data=data, context=context
+        )
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index eae361913ad..82ae10a0937 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -188,7 +188,7 @@ class res_partner(osv.osv):
              'model': 'account_followup.followup',
              'form': data
         }
-        return self.pool['report'].get_action(cr, uid, wizard_partner_ids, 'account_followup.report_followup', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_followup.report_followup', data=datas, context=context)
 
     def do_partner_mail(self, cr, uid, partner_ids, context=None):
         if context is None:
diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index 8dd8a4dce6f..fed6a2335ee 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -260,11 +260,17 @@ class Report(osv.Model):
     def get_action(self, cr, uid, ids, report_name, data=None, context=None):
         """Return an action of type ir.actions.report.xml.
 
+        :param ids: Ids of the records to print (if not used, pass an empty list)
         :param report_name: Name of the template to generate an action for
         """
         if context is None:
             context = {}
 
+        if ids:
+            if not isinstance(ids, list):
+                ids = [ids]
+            context['active_ids'] = ids
+
         report_obj = self.pool['ir.actions.report.xml']
         idreport = report_obj.search(cr, uid, [('report_name', '=', report_name)], context=context)
         try:
@@ -272,7 +278,7 @@ class Report(osv.Model):
         except IndexError:
             raise osv.except_osv(_('Bad Report'), _('This report is not loaded into the database.'))
 
-        action = {
+        return {
             'context': context,
             'data': data,
             'type': 'ir.actions.report.xml',
@@ -280,7 +286,6 @@ class Report(osv.Model):
             'report_type': report.report_type,
             'report_file': report.report_file,
         }
-        return action
 
     #--------------------------------------------------------------------------
     # Report generation helpers

From 66f5bbcf671a7544426960b67509b795c5ecf978 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 2 May 2014 15:03:40 +0200
Subject: [PATCH 10/44] [FIX] account report_invoice: more space to display the
 taxes, right field to display the fiscal position

bzr revid: sle@openerp.com-20140502130340-22dyefrmj4kqrzdb
---
 addons/account/views/report_invoice.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 6757095a7d4..2620e230ec1 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -100,7 +100,7 @@
             </div>
 
             <div class="row" t-if="o.tax_line">
-                <div class="col-xs-3">
+                <div class="col-xs-6">
                     <table class="table table-condensed">
                         <thead>
                             <tr>
@@ -136,7 +136,7 @@
             </p>
             <p t-if="o.fiscal_position">
                 <strong>Fiscal Position:</strong>
-                <span t-field="o.fiscal_position.note"/>
+                <span t-field="o.fiscal_position"/>
             </p>
         </div>
     </t>

From 139c35800f92b1c788bf54481db1adc3f277a26a Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 2 May 2014 15:17:06 +0200
Subject: [PATCH 11/44] [FIX] account report_invoice: display the unit of
 measure in the same cell as the quantity

bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
---
 addons/account/views/report_invoice.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 2620e230ec1..6c4b701c6cf 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -47,7 +47,6 @@
                     <tr>
                         <th>Description</th>
                         <th>Quantity</th>
-                        <th groups="product.group_uom">Unit of measure</th>
                         <th class="text-right">Unit Price</th>
                         <th class="text-right" groups="sale.group_discount_per_so_line">Discount (%)</th>
                         <th class="text-right">Taxes</th>
@@ -57,8 +56,10 @@
                 <tbody class="invoice_tbody">
                     <tr t-foreach="o.invoice_line" t-as="l">
                         <td><span t-field="l.name"/></td>
-                        <td><span t-field="l.quantity"/></td>
-                        <td groups="product.group_uom"><span t-field="l.uos_id"/></td>
+                        <td>
+                            <span t-field="l.quantity"/>
+                            <span t-field="l.uos_id"  groups="product.group_uom"/>
+                        </td>
                         <td class="text-right">
                             <span t-field="l.price_unit"/>
                         </td>

From deb091ea64f7f38a09938295e1cb80ee1689b778 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 2 May 2014 15:41:35 +0200
Subject: [PATCH 12/44] [FIX] website: missing acl for manage website menu

bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
---
 addons/website/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website/security/ir.model.access.csv b/addons/website/security/ir.model.access.csv
index 1a9ccccba5c..8682a349f70 100644
--- a/addons/website/security/ir.model.access.csv
+++ b/addons/website/security/ir.model.access.csv
@@ -2,6 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_website_public,website,website.model_website,,1,0,0,0
 access_website,website,website.model_website,base.group_website_designer,1,1,1,1
 access_website_menu,access_website_menu,model_website_menu,,1,0,0,0
+access_website_menu_designer,Web Menu Manager,model_website_menu,base.group_website_designer,1,1,1,1
 access_website,web menu manager,website.model_website,base.group_website_designer,1,1,1,1
 access_website_converter_test,access_website_converter_test,model_website_converter_test,,1,1,1,1
 access_website_converter_test_sub,access_website_converter_test_sub,model_website_converter_test_sub,,1,1,1,1

From 61d212298773d0c49048fde9f0a1af9f1a2d1df1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 May 2014 16:44:31 +0200
Subject: [PATCH 13/44] [FIX] mail.mail: avoid prefetching attachment data in
 memory while processing mail queue, could fail due to memory limit

Specifically when there are many emails in the queue, prefetching
all their attachments at once when processing the first one
could fail, so not even one mail would be sent.

Added explicit logging when an email triggers a MemoryError,
as well as logging when each email is successfully sent.

bzr revid: odo@openerp.com-20140502144431-r3brgagl4gel4wmt
---
 addons/mail/mail_mail.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index f984f8f3482..0bd15374ee2 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -240,13 +240,17 @@ class mail_mail(osv.Model):
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
+        ir_attachment = self.pool['ir.attachment']
                 
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
-                # handle attachments
-                attachments = []
-                for attach in mail.attachment_ids:
-                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+                # load attachment binary data with a separate read(), as prefetching all
+                # `datas` (binary field) could bloat the browse cache, triggerring
+                # soft/hard mem limits with temporary data.
+                attachment_ids = [a.id for a in mail.attachment_ids]
+                attachments = ((a['datas_fname'], base64.b64decode(a['datas']))
+                                 for a in ir_attachment.read(cr, uid, attachment_ids,
+                                                             ['datas_fname', 'datas']))
                 # specific behavior to customize the send email for notified partners
                 email_list = []
                 if mail.email_to:
@@ -295,10 +299,14 @@ class mail_mail(osv.Model):
                 # /!\ can't use mail.state here, as mail.refresh() will cause an error
                 # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
                 if mail_sent:
+                    _logger.info('Mail with ID %r and Message-Id %r successfully sent', mail.id, mail.message_id)
                     self._postprocess_sent_message(cr, uid, mail, context=context)
             except MemoryError:
                 # prevent catching transient MemoryErrors, bubble up to notify user or abort cron job
                 # instead of marking the mail as failed
+                _logger.exception('MemoryError while processing mail with ID %r and Msg-Id %r. '\
+                                      'Consider raising the --limit-memory-hard startup option',
+                                  mail.id, mail.message_id)
                 raise
             except Exception as e:
                 _logger.exception('failed sending mail.mail %s', mail.id)

From ce88158381e6a78af7f343aa58eac49065edc5e3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 2 May 2014 16:58:23 +0200
Subject: [PATCH 14/44] [FIX] crm: typo, interrests to interest

bzr revid: dle@openerp.com-20140502145823-vtkqkd7njqf31682
---
 addons/crm/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/static/description/index.html b/addons/crm/static/description/index.html
index 70f52d0ca87..d1fe80f0275 100644
--- a/addons/crm/static/description/index.html
+++ b/addons/crm/static/description/index.html
@@ -88,7 +88,7 @@ Find duplicates, merge leads and assign them to the right salesperson in one ope
             <p class="oe_mt32">
 Get your opportunities organized to stay focused on the best deals. Manage all your customer interactions from the opportunity like emails, phone calls, internal notes, meetings and quotations.
             </p><p>
-Follow opportunities that interrests you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc.
+Follow opportunities that interest you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc.
             </p>
         </div>
     </div>

From f426972e37a6fc2f8bd603fc81f65c94b706c8a7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 4 May 2014 06:27:21 +0000
Subject: [PATCH 15/44] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
---
 addons/account_analytic_analysis/i18n/de.po |  38 +++----
 addons/account_followup/i18n/nl.po          |   8 +-
 addons/base_setup/i18n/fa.po                |  52 ++++-----
 addons/mail/i18n/lt.po                      |  16 +--
 addons/mail/i18n/nl.po                      |  10 +-
 addons/mrp/i18n/de.po                       |  93 ++++++++--------
 addons/mrp_byproduct/i18n/de.po             |  10 +-
 addons/mrp_operations/i18n/de.po            |  75 +++++++------
 addons/project/i18n/lt.po                   |  30 +++---
 openerp/addons/base/i18n/ab.po              |   4 +-
 openerp/addons/base/i18n/af.po              |   4 +-
 openerp/addons/base/i18n/am.po              |   4 +-
 openerp/addons/base/i18n/ar.po              |   4 +-
 openerp/addons/base/i18n/bg.po              |   2 +-
 openerp/addons/base/i18n/bn.po              |   4 +-
 openerp/addons/base/i18n/bs.po              |   4 +-
 openerp/addons/base/i18n/ca.po              |   4 +-
 openerp/addons/base/i18n/cs.po              |   4 +-
 openerp/addons/base/i18n/da.po              |   4 +-
 openerp/addons/base/i18n/de.po              | 114 ++++++++++++++++++--
 openerp/addons/base/i18n/el.po              |   4 +-
 openerp/addons/base/i18n/en_GB.po           |   4 +-
 openerp/addons/base/i18n/es.po              |   4 +-
 openerp/addons/base/i18n/es_AR.po           |   4 +-
 openerp/addons/base/i18n/es_BO.po           |   4 +-
 openerp/addons/base/i18n/es_CL.po           |   4 +-
 openerp/addons/base/i18n/es_CR.po           |   4 +-
 openerp/addons/base/i18n/es_DO.po           |   4 +-
 openerp/addons/base/i18n/es_EC.po           |   4 +-
 openerp/addons/base/i18n/es_MX.po           |   4 +-
 openerp/addons/base/i18n/es_PE.po           |   4 +-
 openerp/addons/base/i18n/es_VE.po           |   4 +-
 openerp/addons/base/i18n/et.po              |   4 +-
 openerp/addons/base/i18n/eu.po              |   4 +-
 openerp/addons/base/i18n/fa.po              |   4 +-
 openerp/addons/base/i18n/fa_AF.po           |   4 +-
 openerp/addons/base/i18n/fi.po              |   4 +-
 openerp/addons/base/i18n/fr.po              |   4 +-
 openerp/addons/base/i18n/fr_CA.po           |   4 +-
 openerp/addons/base/i18n/gl.po              |   4 +-
 openerp/addons/base/i18n/gu.po              |   4 +-
 openerp/addons/base/i18n/he.po              |   4 +-
 openerp/addons/base/i18n/hi.po              |   2 +-
 openerp/addons/base/i18n/hr.po              |   4 +-
 openerp/addons/base/i18n/hu.po              |   6 +-
 openerp/addons/base/i18n/hy.po              |   4 +-
 openerp/addons/base/i18n/id.po              |   4 +-
 openerp/addons/base/i18n/is.po              |   4 +-
 openerp/addons/base/i18n/it.po              |   4 +-
 openerp/addons/base/i18n/ja.po              |   4 +-
 openerp/addons/base/i18n/ka.po              |   4 +-
 openerp/addons/base/i18n/kk.po              |   4 +-
 openerp/addons/base/i18n/ko.po              |   4 +-
 openerp/addons/base/i18n/lt.po              |   4 +-
 openerp/addons/base/i18n/lv.po              |   4 +-
 openerp/addons/base/i18n/mk.po              |   4 +-
 openerp/addons/base/i18n/mn.po              |   4 +-
 openerp/addons/base/i18n/nb.po              |   4 +-
 openerp/addons/base/i18n/nl.po              |   4 +-
 openerp/addons/base/i18n/nl_BE.po           |   4 +-
 openerp/addons/base/i18n/pl.po              |   4 +-
 openerp/addons/base/i18n/pt.po              |   4 +-
 openerp/addons/base/i18n/pt_BR.po           |   4 +-
 openerp/addons/base/i18n/ro.po              |   4 +-
 openerp/addons/base/i18n/ru.po              |   4 +-
 openerp/addons/base/i18n/sk.po              |   4 +-
 openerp/addons/base/i18n/sl.po              |   4 +-
 openerp/addons/base/i18n/sq.po              |   4 +-
 openerp/addons/base/i18n/sr.po              |   4 +-
 openerp/addons/base/i18n/sr@latin.po        |   4 +-
 openerp/addons/base/i18n/sv.po              |   4 +-
 openerp/addons/base/i18n/th.po              |   4 +-
 openerp/addons/base/i18n/tlh.po             |   4 +-
 openerp/addons/base/i18n/tr.po              |   4 +-
 openerp/addons/base/i18n/uk.po              |   4 +-
 openerp/addons/base/i18n/ur.po              |   4 +-
 openerp/addons/base/i18n/vi.po              |   4 +-
 openerp/addons/base/i18n/zh_CN.po           |   4 +-
 openerp/addons/base/i18n/zh_HK.po           |   4 +-
 openerp/addons/base/i18n/zh_TW.po           |   4 +-
 80 files changed, 410 insertions(+), 314 deletions(-)

diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index bebe5db7593..56fa2cb71f0 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-25 11:47+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\n"
+"PO-Revision-Date: 2014-05-01 10:17+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@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: 2014-01-26 05:15+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -26,12 +26,12 @@ msgstr "Kein Auftrag abzurechnen, erstellen"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:547
 #, python-format
 msgid "Timesheets to Invoice of %s"
-msgstr "Stundenzettel in Rechnung von %s"
+msgstr "Abzurechnende Stundenzettel von %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "Gruppierung ..."
+msgstr "Gruppieren nach …"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -41,7 +41,7 @@ msgstr "Vorlage"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr "Abrechnen"
+msgstr "Abzurechnen"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -76,7 +76,7 @@ msgstr "=> Rechnung"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Abgerechnet"
+msgstr "Abgerechneter Betrag"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
@@ -86,7 +86,7 @@ msgstr "Datum der letzten Abrechnung"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr "Summe abzurechnende Beträge"
+msgstr "Angebotssummen zu diesem Vertrag"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_sales_order
@@ -207,7 +207,7 @@ msgstr "Enddatum"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Account Manager"
-msgstr "Buchhalter"
+msgstr "Kostenstellenverantwortlicher"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -536,7 +536,7 @@ msgstr "Status"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr "Theoretische Einnahmen"
+msgstr "Planumsatz"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -637,7 +637,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr "Umsatz pro Stunde"
+msgstr "Erzielter Umsatz pro Zeiteinheit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -787,12 +787,12 @@ msgstr "Theoretische Marge"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr "Summe verbleibende Abrechnung"
+msgstr "Verbleibende Summe"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Berechnungsformel: Rechnungsbetrag - Gesamtkosten."
+msgstr "Berechnungsformel: Abgerechnete Summe - Gesamtkosten."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
@@ -833,7 +833,7 @@ msgstr "sale.config.settings"
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr "Zwingende Nutzung von Vorlagen"
+msgstr "Verbindliche Nutzung von Vorlagen"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
@@ -854,12 +854,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr "Erwartete Gesamtabrechnung"
+msgstr "Erwartete Gesamtsumme"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr "Verbleibender Gewinn"
+msgstr "Verbleibender Umsatz"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -882,8 +882,8 @@ msgstr "Gesamtzeit"
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
 msgstr ""
-"ein Auswahl für die Projektvorlage und Vertragseinstellungen sind "
-"erforderlich"
+"Das Feld Vorlage aus der Kostenstellenrechnung und dem Vertragswesen wird "
+"erforderlich sein."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 7677027a68b..6b43c32a919 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-14 09:53+0000\n"
+"PO-Revision-Date: 2014-05-03 08:41+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -520,7 +520,7 @@ msgid ""
 "action."
 msgstr ""
 "Het betalingsherinneringschema wat is gedefinieerd voor het huidige bedrijf, "
-"heeft gen opvolgende actie."
+"heeft geen opvolgende actie."
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 34221e4c9fd..45faaaa9d02 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-03 21:19+0000\n"
+"Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: Persian <fa@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: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -25,17 +25,17 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "مهمان"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "تماس ها"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
@@ -59,22 +59,22 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "فروش"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "عضو"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "دسترسی پورتال"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "احراز هویت"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -86,7 +86,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "تنظیمات عمومی"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -96,12 +96,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "ایمیل"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -111,12 +111,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "امکان بارگذاری فایل CSV توسط کاربران"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "مدیریت چند شرکت"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -141,7 +141,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -151,7 +151,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -183,7 +183,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "مشتری"
 
 #. module: base_setup
 #: help:sale.config.settings,module_web_linkedin:0
@@ -218,7 +218,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -241,7 +241,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "base.setup.terminology"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -268,7 +268,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "همکار"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -279,7 +279,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "تنظیمات فروش"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -351,7 +351,7 @@ msgstr "لغو"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "اعمال"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -362,9 +362,9 @@ msgstr ""
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "یا"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "تنظیم اطلاعات شرکت"
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 8206fdcfcb5..129e5b017e0 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-21 12:36+0000\n"
-"Last-Translator: Eimis <eimislap@gmail.com>\n"
+"PO-Revision-Date: 2014-04-30 16:38+0000\n"
+"Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-11-21 06:18+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-01 06:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -139,7 +139,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:268
 #, python-format
 msgid "updated document"
-msgstr ""
+msgstr "atnaujino dukomentą"
 
 #. module: mail
 #. openerp-web
@@ -409,7 +409,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:294
 #, python-format
 msgid "notified"
-msgstr ""
+msgstr "informuotas"
 
 #. module: mail
 #. openerp-web
@@ -1508,7 +1508,7 @@ msgstr "Atsakyti"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Informuoti partneriai"
 
 #. module: mail
 #. openerp-web
@@ -1644,7 +1644,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:154
 #, python-format
 msgid "Attach a note that will not be sent to the followers"
-msgstr ""
+msgstr "Pridėkite pastabą kuri nebus nusiųsta prenumeratoriams"
 
 #. module: mail
 #. openerp-web
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 3ca7d4f9bb8..4c7732829e4 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-06 11:09+0000\n"
+"PO-Revision-Date: 2014-05-03 09:56+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2013-11-21 06:18+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -1535,9 +1535,7 @@ msgstr "Aanmaak maand"
 #: help:mail.message,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
-"Relaties die een notificatie hebben, die dit bericht doorgestuurd hebben "
-"naar hun e-mailbox"
+msgstr "Relaties welke berichten ontvangen via de e-mail."
 
 #. module: mail
 #: view:mail.message:0
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 2a5b2baf1f0..ea408377e92 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-20 09:00+0000\n"
-"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
+"PO-Revision-Date: 2014-05-01 17:39+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@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: 2014-01-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16901)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -47,7 +47,7 @@ msgstr "Anzahl Zyklen"
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr "Maßgeblicher Lagerort für Verfügbarkeit von Waren."
+msgstr "Lagerort für Komponenten der Produktion."
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -112,7 +112,7 @@ msgstr "Für Lager- und Verbrauchsprodukte"
 #: help:mrp.production,message_unread:0
 #: help:mrp.production.workcenter.line,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "Als zu erledigen markieren"
+msgstr "Wenn markiert, erfordern neue Nachrichten Ihr Handeln."
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -196,7 +196,7 @@ msgstr ""
 #. module: mrp
 #: field:change.production.qty,product_qty:0
 msgid "Product Qty"
-msgstr "Anzahl"
+msgstr "Produktmenge"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -357,12 +357,12 @@ msgstr "Verwalte Arbeitspläne"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Produkt zu fertigen"
+msgstr "Produkt fertigen"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr "Fehler! Sie können keine rekursiven Stücklisten erstellen"
+msgstr "Fehler! Sie dürfen keine rekursiven Stücklisten erstellen"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -419,7 +419,7 @@ msgstr "Referenz muss je Unternehmen eindeutig sein"
 #: report:mrp.production.order:0
 #, python-format
 msgid "Quantity"
-msgstr "Anzahl"
+msgstr "Menge"
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -427,8 +427,8 @@ msgid ""
 "Fill this product to easily track your production costs in the analytic "
 "accounting."
 msgstr ""
-"Tragen Sie hier ein Produkt ein, zur Verfolgung der Arbeitskosten auf einer "
-"Kostenstelle."
+"Tragen Sie hier ein Produkt ein, zur Verfolgung der Fertigungskosten in der "
+"Kostenstellenrechnung."
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
@@ -595,7 +595,7 @@ msgstr "Produkttyp ist Service (Dienstleistung)"
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr "Kosten des Arbeitsplatzes je Zyklus"
+msgstr "Arbeitsplatzkosten je Zyklus"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -611,7 +611,7 @@ msgstr "Für Dienstleistungsprodukte."
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr "Anfrage für Angebot"
+msgstr "Angebotsanfrage"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -661,7 +661,7 @@ msgstr "Bestandswert"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Struktur Stückliste"
+msgstr "Produkt-Stücklistenstruktur"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -677,12 +677,12 @@ msgstr "Bestimmt die Reihenfolge der angezeigten Arbeitsplätze"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Stückliste Hierachie"
+msgstr "Stücklistenhierachie"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr "Zu produzieren"
+msgstr "Zu fertigen"
 
 #. module: mrp
 #: help:mrp.config.settings,module_stock_no_autopicking:0
@@ -721,7 +721,7 @@ msgstr "Komponenten"
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr "Vorbereitung"
+msgstr "Vorbereitungszeit"
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -747,7 +747,7 @@ msgstr "Verbrauchte Produkte"
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Arbeitsplatz Auslastung"
+msgstr "Arbeitsplatzauslastung"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:55
@@ -931,13 +931,13 @@ msgstr "Warnung!"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Printing date"
-msgstr "Datum Druck"
+msgstr "Druckdatum"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr "Anfrage Angebot"
+msgstr "Angebotsanfrage"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
@@ -1119,7 +1119,8 @@ msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
 msgstr ""
-"BItte zuerst den internen Lieferschein dieses Fertigungsauftrags stornieren!"
+"BItte zuerst die interne Kommissionierung dieses Fertigungsauftrags "
+"stornieren!"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
@@ -1155,12 +1156,12 @@ msgstr "Kurzbez."
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "Anzahl Stunden"
+msgstr "Stundenanzahl"
 
 #. module: mrp
 #: view:mrp.property:0
 msgid "Property Group"
-msgstr "Fertigungsmerkmale Gruppe"
+msgstr "Merkmalsgruppe"
 
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_routings:0
@@ -1170,7 +1171,7 @@ msgstr "Verwalte Arbeitspläne und Arbeitsaufträge "
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr "Fertigungsplanung"
+msgstr "Produktionsplanung"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1194,8 +1195,8 @@ msgid ""
 "subcontracting demand for instance."
 msgstr ""
 "Wenn einem Dienstleistungsprodukt 'Einkauf' als Beschaffungsmethode "
-"zugewiesen wird, wird eine Anfrage für eine Fremdvergabe an Lieferanten "
-"erstellt."
+"zugewiesen wird, wird eine Anfrage für die Fremdvergabe an externe "
+"Dienstleister erstellt."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1210,7 +1211,7 @@ msgstr "Beschaffe an Lager"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "Stückliste Bezeichnung"
+msgstr "Stücklistenbezeichnung"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1249,7 +1250,7 @@ msgstr "Bezeichnung"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "Fertigung Auftragsnummer:"
+msgstr "Fertigungsauftragsnummer:"
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
@@ -1362,7 +1363,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr "Kostenstellen Journal"
+msgstr "Kostenstellenjournal"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1389,8 +1390,8 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 "Das System wartet bis das Produkt als Bestand im Lager verfügbar ist. Diese "
-"Produkte werden typischerweise manuell bestellt oder es werden über die "
-"Meldebestandsregeln Bestellvorschläge erstellt."
+"Produkte werden typischerweise manuell oder über Meldebestandsregeln "
+"beschafft."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1487,7 +1488,7 @@ msgstr "Priorität"
 #: model:ir.model,name:mrp.model_stock_picking
 #: field:mrp.production,picking_id:0
 msgid "Picking List"
-msgstr "Pickliste"
+msgstr "Kommissionierschein"
 
 #. module: mrp
 #: help:mrp.production,bom_id:0
@@ -1555,7 +1556,7 @@ msgstr "Definieren von Hersteller "
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
 #: view:mrp.product_price:0
 msgid "Product Cost Structure"
-msgstr "Produkte Kostenübersicht"
+msgstr "Produktkostenstruktur"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1576,12 +1577,12 @@ msgstr "Suche nach Arbeitsplatz"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "Stückliste Struktur"
+msgstr "Stücklistenstruktur"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 msgid "Start Date"
-msgstr "Start Datum"
+msgstr "Anfangsdatum"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
@@ -1633,7 +1634,7 @@ msgstr ""
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr "Arbeitsplatz Auslastungen"
+msgstr "Arbeitsplätzeauslastung"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1659,7 +1660,7 @@ msgstr "Meldebestandregel Material"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Extra Information"
+msgstr "Zusatzinformation"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
@@ -1669,12 +1670,12 @@ msgstr "Ändere die Mengen für die Produkte"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr "Löst Beschaffungsaufträge für Komponenten aus ."
+msgstr "Löst Beschaffungsaufträge für Komponenten aus."
 
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
-msgstr "Produkt VE Menge"
+msgstr "Produktmenge in VE"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1684,7 +1685,7 @@ msgstr "Sachkonto"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr "Auftrag Nummer"
+msgstr "Auftragsnummer"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:505
@@ -1721,7 +1722,7 @@ msgstr "Verantwortlicher"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Startbereit für Fertigung"
+msgstr "Auszuführende Fertigungsaufträge"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
@@ -1846,7 +1847,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,date_finished:0
 msgid "End Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
@@ -1956,7 +1957,7 @@ msgstr "Dienstleistung"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Cancelled"
-msgstr "Storniert"
+msgstr "Abgebrochen"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1970,8 +1971,8 @@ msgid ""
 "lines (in the \"Work Centers\" tab).\n"
 "                This installs the module mrp_operations."
 msgstr ""
-"Hierdurch können Sie Status, das geplante Datum, das voraussichtliche Ende "
-"Datum für die einzelnen Arbeitsaufträge (im Aktenreiter Arbeitsaufträge) "
+"Hierdurch können Sie Status, das Anfangsdatum, das voraussichtliche Enddatum "
+"für die einzelnen Arbeitsaufträge (im Aktenreiter Arbeitsaufträge) "
 "definieren. \n"
 "Es wird das Modul mrp_operations installiert."
 
diff --git a/addons/mrp_byproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po
index 0bd55833b36..518375c6a51 100644
--- a/addons/mrp_byproduct/i18n/de.po
+++ b/addons/mrp_byproduct/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-01 07:30+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@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: 2013-11-21 06:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -54,7 +54,7 @@ msgstr "Fertigungsauftrag"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr "Ändere Menge bei Produkten"
+msgstr "Ändere Menge der Produkte"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index b32e2efd29a..f40ce20147c 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-06 21:44+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2014-05-01 12:17+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@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: 2013-11-21 06:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -30,7 +29,7 @@ msgstr "Arbeitsaufträge"
 #: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
-msgstr "Vorgang ist bereits beendet"
+msgstr "Vorgang ist bereits abgeschlossen!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -56,7 +55,7 @@ msgstr "Information von der Arbeitsplan Definition"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "Unit of Measure"
-msgstr "ME"
+msgstr "Mengeneinheit"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -103,7 +102,7 @@ msgstr "Fertigungsauftrag"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr "Arbeitsaufträge"
+msgstr "MRP-Vorgänge"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -114,7 +113,7 @@ msgstr "Tag"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Cancel Order"
-msgstr "Storno Bestellung"
+msgstr "Auftrag abbrechen"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -129,7 +128,7 @@ msgstr "Ausnahme Lieferauftrag"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr "Erstellung von Arbeitsaufträgen"
+msgstr "Erstellung des Arbeitsauftrags"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -145,14 +144,14 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
-msgstr "Fehler !"
+msgstr "Fehler!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr "Storniert"
+msgstr "Abgebrochen"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:477
@@ -164,18 +163,18 @@ msgstr "Vorgang ist bereits storniert"
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr "Arbeitsaufträge"
+msgstr "Vorgänge"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr "Lieferung"
+msgstr "Lagerbuchung"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
-msgstr "Es gibt keinen Auftrag, der storniert werden könnte."
+msgstr "Kein Vorgang zum Abbrechen."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:474
@@ -183,7 +182,7 @@ msgstr "Es gibt keinen Auftrag, der storniert werden könnte."
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
 msgstr ""
-"Um einen Vorgang abzuschließen muss dieser Im Status Start oder "
+"Um einen Vorgang abschließen zu können, muss dieser Im Status Start oder "
 "Wiederaufnahme sein!"
 
 #. module: mrp_operations
@@ -214,7 +213,7 @@ msgstr "Arbeitsplatz"
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -233,8 +232,8 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
-"Hier finden Sie je einen Arbeitsauftrag je Arbeitsplatz. Diese Information "
-"wird generiert von der Anzahl der Arbeitszyklen oder der Zyklendauer."
+"Es gibt einen Arbeitsauftrag je Arbeitsplatz. Information zu Anzahl der "
+"Arbeitszyklen oder der Zyklendauer."
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
@@ -244,18 +243,18 @@ msgstr "Statistik Arbeitsaufträge"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
 msgid "Work Orders By Resource"
-msgstr "Arbeitsaufträge"
+msgstr "Arbeitsaufträge nach Ressource"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr "Geplantes Datum"
+msgstr "Plandatum"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr "Produkt Anz."
+msgstr "Produktmenge"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:134
@@ -347,7 +346,7 @@ msgstr "Arbeitsauftrag wurde storniert"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Pause Work Order"
-msgstr "Unterbreche Arbeitsauftrag"
+msgstr "Arbeitsauftrag aussetzen"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -368,7 +367,7 @@ msgstr "Monat"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Canceled"
-msgstr "Storniert"
+msgstr "Abgebrochen"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
@@ -378,13 +377,13 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr "Bericht Arbeitsauftrag"
+msgstr "Arbeitsaufträge-Bericht"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr "Start Datum"
+msgstr "Startdatum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -415,7 +414,7 @@ msgstr "In Bearbeitung"
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
-"Um einen Vorgang zu unterbrechen, muss dieser den Status Start oder "
+"Um einen Vorgang auszusetzen, muss dieser den Status Start oder "
 "Wiederaufnahme haben"
 
 #. module: mrp_operations
@@ -481,7 +480,7 @@ msgstr "August"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr "Start Datum"
+msgstr "Begonnen"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -517,7 +516,7 @@ msgstr "Abhängige Lieferungen"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr "Planung Arbeitsaufträge"
+msgstr "Arbeitsaufträgeplanung"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -564,7 +563,7 @@ msgstr "Arbeitsauftrag wurde noch nicht gestartet !"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr "Information zum Fertigungsauftrag."
+msgstr "Information aus dem Fertigungsauftrag."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:454
@@ -599,12 +598,12 @@ msgstr "Auftragskürzel"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr "Anzahl"
+msgstr "Menge"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr "Arbeitsauftrag erledigt"
+msgstr "Arbeitsauftrag abgeschlossen"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -725,7 +724,7 @@ msgstr "Arbeitsplatz"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr "Geplantes Datum"
+msgstr "Plantermin"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
@@ -746,8 +745,8 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
-"Aktivieren Sie diese Option, wenn Sie möchten, dass unabhängig voneinander "
-"alle Fertigungsaufträge verschoben werden können."
+"Aktivieren Sie diese Option, wenn Sie Fertigungsaufträge ohne "
+"Berücksichtigung von Abhängikeiten verschieben möchten."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -785,12 +784,12 @@ msgstr "Februar"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr "Arbeitsauftrag storniert"
+msgstr "Vorgang abgebrochen"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr "Starte Arbeitsauftrag"
+msgstr "Vorgang beginnen"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -800,7 +799,7 @@ msgstr "April"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr "Arbeitsauftrag erledigt"
+msgstr "Vorgang abgeschlossen"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index c4c6e039bd7..63a78d05939 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-05-09 06:10+0000\n"
+"PO-Revision-Date: 2014-04-30 16:34+0000\n"
 "Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@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: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-01 06:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: project
 #: view:project.project:0
@@ -235,7 +235,7 @@ msgstr "Priskirtas"
 #: model:mail.message.subtype,name:project.mt_project_task_closed
 #: model:mail.message.subtype,name:project.mt_task_closed
 msgid "Task Done"
-msgstr ""
+msgstr "Užduotis atlikta"
 
 #. module: project
 #: view:project.project:0
@@ -276,7 +276,7 @@ msgstr "Projekto užduoties delegavimas"
 #: model:mail.message.subtype,name:project.mt_project_task_started
 #: model:mail.message.subtype,name:project.mt_task_started
 msgid "Task Started"
-msgstr ""
+msgstr "Užduotis pradėta"
 
 #. module: project
 #: view:project.task:0
@@ -458,7 +458,7 @@ msgstr ""
 #: model:mail.message.subtype,name:project.mt_project_task_blocked
 #: model:mail.message.subtype,name:project.mt_task_blocked
 msgid "Task Blocked"
-msgstr ""
+msgstr "Užduotis užblokuota"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -478,7 +478,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_blocked
 msgid "Task blocked"
-msgstr ""
+msgstr "Užduotis užblokuota"
 
 #. module: project
 #: view:project.task:0
@@ -997,7 +997,7 @@ msgstr "Vartotojai"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Etapas pakeistas"
 
 #. module: project
 #: view:project.project:0
@@ -1252,7 +1252,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_stage
 msgid "Task Stage Changed"
-msgstr ""
+msgstr "Užduotis etapas pakeistas"
 
 #. module: project
 #: view:project.task:0
@@ -1324,7 +1324,7 @@ msgstr "Pradžios data"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blokuota"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1492,7 +1492,7 @@ msgstr "Likusios valandos"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Etapas pakeistas"
 
 #. module: project
 #: constraint:project.task:0
@@ -1599,7 +1599,7 @@ msgstr "Deleguoti savo užduotį kitam naudotojui"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_started
 msgid "Task started"
-msgstr ""
+msgstr "Užduotis pradėta"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -1760,7 +1760,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "Užduotis sukurta"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1947,7 +1947,7 @@ msgstr "Juodraštis"
 #: field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanban statusas"
 
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
@@ -2026,7 +2026,7 @@ msgstr ""
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Created"
-msgstr ""
+msgstr "Užduotis sukurta"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index cd513ef7507..588e4d0192c 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:24+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:43+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 6db28359325..3d966597d98 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:43+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 3f9d48ce249..3ddda383fff 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index b192aac5287..97ede03c0f2 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index fcb2fa1fcea..a0537f0c0c0 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index f2cbedbe806..d73672df028 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index d652ea6bbba..fe7660038e7 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index ca2d622ee3c..db92eef8ea4 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index bcb98493fc9..7e8eb75a11d 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "X-Language: cs_CZ\n"
 "X-Source-Language: en\n"
 
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 74bc935bb85..3a98a511565 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 91cc6e9175f..9d49252d0d7 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-04-19 16:21+0000\n"
+"PO-Revision-Date: 2014-05-01 14:38+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@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: 2014-04-20 05:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
@@ -1256,7 +1256,7 @@ msgstr "Oman"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr "Bedarfsplanung"
+msgstr "Material- und Ressourcenplanung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_attendance
@@ -3308,6 +3308,38 @@ msgid ""
 "and\n"
 "directly integrated in the core accounting. \n"
 msgstr ""
+"\n"
+"Fügen Sie in Rechnungen eine zusätzliche Auswertungsebene für "
+"Konsolidierungen hinzu \n"
+"============================================================================="
+"==\n"
+"\n"
+"Standardmäßig können Kunden- und Lieferantenrechnungen an einen Kontakt\n"
+"innerhalb des Unternehmens gebunden werden, in der Datenstruktur ist \n"
+"das Unternehmen jedoch nicht fest mit einer Rechnung verknüpft. Journale "
+"sind\n"
+"hingegen immer fest auf ein Unternehmen bezogen und nicht auf Kontakte,\n"
+"so dass kreditorische und debitorische Konten immer korrekt behandelt "
+"werden\n"
+"und auf Unternehmensebene korrekt konsolidiert werden. \n"
+"\n"
+"Wenn viele verschiedene Kontakte/Abteilungen unter einer Unternehmensmutter\n"
+"konsolidiert werden, kann dies das Berichtswesen erschweren; Berichte "
+"basieren \n"
+"unmittelbar auf der Datenbankstruktur und liefern daher nicht die "
+"notwendige\n"
+"konsolidierte/aggregierte Dimension.\n"
+"\n"
+"Dieses Modul löst das Problem, indem eine explizite Referenz auf das "
+"Unternehmen\n"
+"in die Rechnungen eingebracht wird, welche automatisch aus dem Kontakt der \n"
+"Rechnung ermittelt wird. Dieser neue Bezug wird nun zum Gruppieren in Listen "
+"\n"
+"und in der Rechnungsübersicht nach Partnern verwendet.\n"
+"\n"
+"Hinweis: Mit großer Wahrscheinlichkeit wird dieses Modul in der nächsten\n"
+"Hauptversion von OpenERP in den Kern der Finanzmodule verankert und somit \n"
+"entfallen. \n"
 
 #. module: base
 #: model:res.country,name:base.ai
@@ -10229,6 +10261,53 @@ msgid ""
 "of creation of distribution models.\n"
 "        "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Verwendung mehrerer Umlagepläne gemäß der "
+"Kostenstelle.\n"
+"============================================================================="
+"============\n"
+"\n"
+"Hier werden mehrere Buchungen angelegt, wenn die Rechnung oder\n"
+"die Buchungen genehmigt werden.\n"
+"\n"
+"Zum Beispiel können Sie die folgene Kostenstellenstruktur definieren:\n"
+"--------------------------------------------------------------------------\n"
+"* **Projekte**\n"
+"* Projekt 1\n"
+"+ TeilProj 1.1\n"
+"\n"
+"+ TeilProj 1.2\n"
+"\n"
+"* Projekt 2\n"
+"\n"
+"* **Verkäufer**\n"
+"* Erik\n"
+"\n"
+"* Fabien\n"
+"\n"
+"Wir haben hier zwei Pläne: Projekte und Verkäufer. Eine Rechnungsposition "
+"muss Kosten auf beide Pläne umlegen können: TeilProj 1.1 und Fabien. Die "
+"Beträge können auch aufgeteilt werden.\n"
+"\n"
+"Das folgende Beispiel zeigt den Fall einer Rechnung, die beide Teilprojekte "
+"betrifft und einem Verkäufer zugeordent ist:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"**Plan1:**\n"
+"\n"
+"* TeilProjekt 1.1 : 50%\n"
+"\n"
+"* TeilProjekt 1.2 : 50%\n"
+"\n"
+"**Plan2:**\n"
+"Erik: 100%\n"
+"\n"
+"Wenn diese Rechnungsposition bestätigt wird, wird sie drei "
+"Kostenstellenbuchungen für eine Finanzbuchung erzeugen.\n"
+"\n"
+"Der Umlageplan prüft die minimale bzw. maximale Umlage zum Zeitpunkt der "
+"Anlage des Umlageschlüssels.\n"
+"        "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -11198,6 +11277,9 @@ msgid ""
 "related to a model that uses the need_action mechanism, this field is set to "
 "true. Otherwise, it is false."
 msgstr ""
+"Wenn der Menüeintrag eine act_window -Aktion ist und diese Aktion mit dem "
+"need_action -Mechanismus agiert, ist dieses Feld auf Wahr gesetzt. "
+"Anderenfalls ist es Falsch."
 
 #. module: base
 #: code:addons/orm.py:3961
@@ -11740,7 +11822,7 @@ msgstr "Benutzer-Interface"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_byproduct
 msgid "MRP Byproducts"
-msgstr "MRP nach Produkten"
+msgstr "MRP Kuppelprodukte"
 
 #. module: base
 #: field:res.request,ref_partner_id:0
@@ -12181,7 +12263,7 @@ msgstr "Neue Sprache (leere Übersetzungsvorlage)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_report_company
 msgid "Invoice Analysis per Company"
-msgstr ""
+msgstr "Rechnungsprüfung je Unternehmen"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -14124,6 +14206,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"    Klicken Sie, um eine neue Partner-Kategorie anzulegen.\n"
+"</p><p>\n"
+"    Verwalten Sie Partnerkategorien, um diese besser zu klassifizieren und "
+"für Analysezwecke.\n"
+"    Ein Partner kann mehreren Kategorien angehören und Kategorien können "
+"hierarchisch strukturiert sein; \n"
+"    ein Partner einer Kategorie gehört auch seiner Übergeordbeten Kategorie "
+"an.\n"
+"</p>\n"
+"            "
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -14144,6 +14237,11 @@ msgid ""
 "a new contact should be created under that new company. You can use the "
 "\"Discard\" button to abandon this change."
 msgstr ""
+"Das Unternehmen eines Kontaktes sollte nur geändert werden, wenn dieses nie "
+"korrekt gepflegt wurde. Wenn ein bestehender Kontakt für ein Unternehmen zu "
+"arbeiten beginnt, sollte dieser in diesem (möglicherweise neuen) Unternehmen "
+"neu angelegt werden. Sie können \"abbrechen\" wählen, um diese Änderung zu "
+"verwerfen."
 
 #. module: base
 #: help:res.partner,customer:0
@@ -14865,7 +14963,7 @@ msgstr "Falklandinseln"
 #: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch!"
-msgstr ""
+msgstr "Geben Sie bitte eine zu startende Aktion an."
 
 #. module: base
 #: model:res.country,name:base.lb
@@ -15552,7 +15650,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:295
 #, python-format
 msgid "Size of the field can never be less than 0 !"
-msgstr ""
+msgstr "Die Größe des Feldes darf niemals kleiner als 0 sein!"
 
 #. module: base
 #: help:ir.actions.server,sequence:0
@@ -19228,7 +19326,7 @@ msgstr "Kontext"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
 msgid "Sales and MRP Management"
-msgstr "Verkaufs- und Fertigungsplanung"
+msgstr "Verkauf und Fertigungsplanung"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_form
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 2f4e6a3ccbc..6e0e6cf95bc 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 0c48f809e1b..60c09f8fbdf 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 791861f93dd..3e2e43cf878 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: help:ir.actions.act_window,res_id:0
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index ab4822147c2..6a2b174a1e5 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 521160bb0e1..8589e50544a 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 0c6bf121a42..0c3dbd87a7f 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 1cedd08cd1c..e49d73a7661 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index b4b07072f4e..8a80555cd29 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 23795d2098e..a3e0dea0da3 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:00+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index cf8a48e13cc..48f3474e178 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:00+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index 09411a50ed9..14ea6ec46dd 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:00+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index 436202e55b4..5dc77512e23 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index b13e98ddec2..5d1002b41d7 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 3e68d2841c1..34ef1492aca 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 11704cbc627..1f6989fd736 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 43591aa2e1f..c62abb31716 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:01+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index b98dc96cd4c..03a5f427814 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index e7bac5bf2bb..e99c36b47c1 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index c8d28eaf3b6..4cda6729392 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index d1570a296ea..38f2650ed7d 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 3f9a60600f5..dd5485f122b 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index a7d926f466f..11a530bc154 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: he\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index cb0c9f9b047..d93da0df53a 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-19 06:34+0000\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index ab565579309..4a444862822 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 3213fa81d20..239fa88c66a 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
 "PO-Revision-Date: 2013-06-14 11:19+0000\n"
-"Last-Translator: Csaba TOTH <csaba.toth@i3rendszerhaz.hu>\n"
+"Last-Translator: Csaba TOTH <tsabi@tsabi.hu>\n"
 "Language-Team: Hungarian <hu@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: 2014-04-12 09:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 099f41ebba1..4ab99460442 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 1e4622ed19e..5120095c551 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 628210885ba..89eed343710 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 461555cde22..3be431ba87c 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index c58bb767caa..92e947b78bb 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index a011dff3bd3..bdc54179ad9 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index d186b75e868..ec1cfe38c7f 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 9fc2f56d292..911b28b5972 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index d57f0319380..46acc01f9cf 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 5f6e6d0f9b1..374edddbd75 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 4d92ff8d978..5656e9dc19a 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: mk\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 364c347a944..281b3477992 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 17d20e7d623..bf0c8fcdca8 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 663c3e813e4..bc66d2afb9d 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index fad9155c823..5deb09257da 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index c23cbd9dddc..fee6e78151d 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 437493a7e2d..ae1cdd4c60a 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index ae64496adf1..b79ca897c09 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 3841f3d4a24..cfbe450f235 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index b3498fead28..c853ceac1c1 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 11d380b69b5..317a345df87 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 6ca483ec4cf..ef46ef7f18e 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index d539cb25d57..0a27e13f5d4 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 55e7a48d2a8..34f65fc970f 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 324a680a5fc..8e3667cc9e8 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:01+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 7373e77674f..c6608433dfc 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 7b9aae4552f..43b78261235 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index b0172cf3453..5f534d66862 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 2a9ce6708fa..7528f74182c 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index a47d17affc3..6b5501eaf80 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 29e92a5e5d0..7f193e562a7 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 0c8ca127f98..97cf0dad81d 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 4a8d5cedcc2..065c1df91df 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 5be82b0a219..7fc4326ee57 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 2aedacbdad3..f8bf4a7e578 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

From 188930bb01e93d7d142d19c2ac171814257347dc Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 5 May 2014 09:46:36 +0200
Subject: [PATCH 16/44] [FIX] convert: gracefully ignore missing XML IDs when
 processing <delete> tags + warn in log

bzr revid: odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u
---
 openerp/tools/convert.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 870f9d19dd2..bd7c214fd24 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -266,12 +266,17 @@ form: module.record_id""" % (xml_id,)
 
         if d_search:
             idref = _get_idref(self, cr, self.uid, d_model, context={}, idref={})
-            ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref))
+            try:
+                ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref))
+            except ValueError:
+                _logger.warning('Skipping deletion for failed search `%r`', d_search, exc_info=True)
+                pass
         if d_id:
             try:
                 ids.append(self.id_get(cr, d_id))
-            except:
+            except ValueError:
                 # d_id cannot be found. doesn't matter in this case
+                _logger.warning('Skipping deletion for missing XML ID `%r`', d_id, exc_info=True)
                 pass
         if ids:
             self.pool.get(d_model).unlink(cr, self.uid, ids)

From a918e8999502d7e70c94de772b53035b74a87f38 Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <>
Date: Mon, 5 May 2014 11:43:29 +0200
Subject: [PATCH 17/44] [FIX] mail: change copy call to copy_data to avoid
 resending email during duplication (opw 607295)

bzr revid: mat@openerp.com-20140505094329-vr7h4c92i43ezob4
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 83f3693e3be..90ae3cf0aa3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -316,14 +316,14 @@ class mail_thread(osv.AbstractModel):
         fol_obj.unlink(cr, SUPERUSER_ID, fol_ids, context=context)
         return res
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         # avoid tracking multiple temporary changes during copy
         context = dict(context or {}, mail_notrack=True)
 
         default = default or {}
         default['message_ids'] = []
         default['message_follower_ids'] = []
-        return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
+        return super(mail_thread, self).copy_data(cr, uid, id, default=default, context=context)
 
     #------------------------------------------------------
     # Automatically log tracked fields

From 5e406734abd0336503548803fd53ea44bc859869 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 5 May 2014 14:18:40 +0200
Subject: [PATCH 18/44] [FIX] module: do not crash in case of not found module

bzr revid: mat@openerp.com-20140505121840-f84u36mng3p1gstn
---
 openerp/modules/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 82e86e83ce2..0ccb2865796 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -177,7 +177,7 @@ def load_information_from_description_file(module, mod_path=None):
 
     if not mod_path:
         mod_path = get_module_path(module)
-    terp_file = opj(mod_path, '__openerp__.py')
+    terp_file = mod_path and opj(mod_path, '__openerp__.py') or False
     if terp_file:
         info = {}
         if os.path.isfile(terp_file):

From 4f1dbde8d595fc3c977401e364adac3e50c94296 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 5 May 2014 14:38:52 +0200
Subject: [PATCH 19/44] [FIX] mail: attachments present for first recipient,
 but not for the others

attachments should be an array and not a generator [x for x in y] instead of (x for x in y)

bzr revid: dle@openerp.com-20140505123852-kjc6z0npiot9c54l
---
 addons/mail/mail_mail.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 0bd15374ee2..1cc033e8926 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -241,16 +241,16 @@ class mail_mail(osv.Model):
         """
         ir_mail_server = self.pool.get('ir.mail_server')
         ir_attachment = self.pool['ir.attachment']
-                
+
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
                 # load attachment binary data with a separate read(), as prefetching all
                 # `datas` (binary field) could bloat the browse cache, triggerring
                 # soft/hard mem limits with temporary data.
                 attachment_ids = [a.id for a in mail.attachment_ids]
-                attachments = ((a['datas_fname'], base64.b64decode(a['datas']))
-                                 for a in ir_attachment.read(cr, uid, attachment_ids,
-                                                             ['datas_fname', 'datas']))
+                attachments = [(a['datas_fname'], base64.b64decode(a['datas']))
+                                 for a in ir_attachment.read(cr, SUPERUSER_ID, attachment_ids,
+                                                             ['datas_fname', 'datas'])]
                 # specific behavior to customize the send email for notified partners
                 email_list = []
                 if mail.email_to:

From 41e6840169ab79b424990b91031ec1f5d9a6cb32 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 5 May 2014 15:02:26 +0200
Subject: [PATCH 20/44] [FIX] account_analytic_analysis: recurring invoices,
 prepare_invoice method actually prepare the invoice, without creating it.
 _recurring_create_invoice return value is the list of created invoices ids

bzr revid: dle@openerp.com-20140505130226-ylcycmzmj0hm35w6
---
 .../account_analytic_analysis.py              | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 5aa4b5a49db..a25950783ad 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -655,7 +655,6 @@ class account_analytic_account(osv.osv):
     def _prepare_invoice(self, cr, uid, contract, context=None):
         context = context or {}
 
-        inv_obj = self.pool.get('account.invoice')
         journal_obj = self.pool.get('account.journal')
         fpos_obj = self.pool.get('account.fiscal.position')
 
@@ -679,20 +678,19 @@ class account_analytic_account(osv.osv):
             currency_id = contract.company_id.currency_id.id
 
         inv_data = {
-           'reference': contract.code or False,
            'account_id': contract.partner_id.property_account_receivable.id,
            'type': 'out_invoice',
            'partner_id': contract.partner_id.id,
            'currency_id': currency_id,
            'journal_id': len(journal_ids) and journal_ids[0] or False,
            'date_invoice': contract.recurring_next_date,
-           'origin': contract.name,
+           'origin': contract.code,
            'fiscal_position': fpos and fpos.id,
            'payment_term': partner_payment_term,
            'company_id': contract.company_id.id or False,
         }
-        invoice_id = inv_obj.create(cr, uid, inv_data, context=context)
 
+        invoice_line_vals = []
         for line in contract.recurring_invoice_line_ids:
 
             res = line.product_id
@@ -704,7 +702,7 @@ class account_analytic_account(osv.osv):
             taxes = res.taxes_id or False
             tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
-            invoice_line_vals = {
+            invoice_line_vals.append({
                 'name': line.name,
                 'account_id': account_id,
                 'account_analytic_id': contract.id,
@@ -712,13 +710,13 @@ class account_analytic_account(osv.osv):
                 'quantity': line.quantity,
                 'uos_id': line.uom_id.id or False,
                 'product_id': line.product_id.id or False,
-                'invoice_id' : invoice_id,
+                # 'invoice_id' : invoice_id,
                 'invoice_line_tax_id': [(6, 0, tax_id)],
-            }
-            self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)
+            })
 
-        inv_obj.button_compute(cr, uid, [invoice_id], context=context)
-        return invoice_id
+        inv_data['invoice_line'] = [(0, 0, line_vals) for line_vals in invoice_line_vals]
+
+        return inv_data
 
     def recurring_create_invoice(self, cr, uid, ids, context=None):
         return self._recurring_create_invoice(cr, uid, ids, context=context)
@@ -728,6 +726,7 @@ class account_analytic_account(osv.osv):
 
     def _recurring_create_invoice(self, cr, uid, ids, automatic=False, context=None):
         context = context or {}
+        invoice_ids = []
         current_date =  time.strftime('%Y-%m-%d')
         if ids:
             contract_ids = ids
@@ -735,8 +734,8 @@ class account_analytic_account(osv.osv):
             contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
         for contract in self.browse(cr, uid, contract_ids, context=context):
             try:
-                invoice_id = self._prepare_invoice(cr, uid, contract, context=context)
-
+                invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
+                invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
                 next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
                 interval = contract.recurring_interval
                 if contract.recurring_rule_type == 'daily':
@@ -754,7 +753,7 @@ class account_analytic_account(osv.osv):
                     _logger.error(traceback.format_exc())
                 else:
                     raise
-        return True
+        return invoice_ids
 
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"

From 80c77d0355b60f578beabd2c3f87285e24d22222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 5 May 2014 16:51:38 +0200
Subject: [PATCH 21/44] [FIX] web: view_form: fixed effective_readonly behavior
 of the binary multi files widget. The option to add an attachment should be
 available only in edit mode.

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

bzr revid: tde@openerp.com-20140505145138-x9iwzp74ha2q0bp2
---
 addons/web/static/src/js/view_form.js | 6 +++++-
 addons/web/static/src/xml/base.xml    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6014e83dba1..d93b59bc520 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5408,7 +5408,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
  * Options on attribute ; "blockui" {Boolean} block the UI or not
  * during the file is uploading
  */
-instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend({
+instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: "FieldBinaryFileUploader",
     init: function(field_manager, node) {
         this._super(field_manager, node);
@@ -5426,6 +5426,9 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
     start: function() {
         this._super(this);
         this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change );
+        this.on("change:effective_readonly", this, function () {
+            this.render_value();
+        });
     },
     set_value: function(value_) {
         value_ = value_ || [];
@@ -5462,6 +5465,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
     },
     render_value: function () {
         var self = this;
+        this.$('.oe_add').css('visibility', this.get('effective_readonly') ? 'hidden': '');
         this.read_name_values().then(function (ids) {
             var render = $(instance.web.qweb.render('FieldBinaryFileUploader.files', {'widget': self, 'values': ids}));
             render.on('click', '.oe_delete', _.bind(self.on_file_delete, self));
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 82a3822a9c8..bda1a2b8fc3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1336,7 +1336,7 @@
 <t t-name="FieldBinaryFileUploader">
     <div t-att-style="widget.node.attrs.style" t-attf-class="oe_fileupload #{widget.node.attrs.class ? widget.node.attrs.class :''}">
         <div class="oe_placeholder_files"/>
-        <div class="oe_add" t-if="!widget.get('effective_readonly')">
+        <div class="oe_add">
             <!-- uploader of file -->
             <button class="oe_attach"><span class="oe_e">'</span></button> 
             <span class='oe_attach_label'><t t-esc="widget.string"/></span>

From 3f032f3f9737c50a113331c12edc9b39a6e30d14 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 17:07:22 +0200
Subject: [PATCH 22/44] [FIX] website editor: background image

bzr revid: chm@openerp.com-20140505150722-gwewelvu3uv6joen
---
 .../website/static/src/js/website.editor.js   |  1 +
 .../static/src/js/website.snippets.editor.js  | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 2119d05f650..d7b7843de00 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1056,6 +1056,7 @@
             this.trigger("saved");
         },
         cancel: function () {
+            this.trigger("cancel");
         },
         close: function () {
             this.$el.modal('hide');
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index bae014029e1..51e8bc3b991 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -362,7 +362,7 @@
         },
         clean_for_save: function () {
             var self = this;
-            $(website.snippet.globalSelector).each(function () {
+            this.dom_filter(website.snippet.globalSelector).each(function () {
                 var $snippet = $(this);
                 self.make_active($snippet);
                 self.make_active(false);
@@ -875,20 +875,29 @@
             this._super(np);
             if (np.$next) {
                 if (np.$next.hasClass("oe_custom_bg")) {
-                    var editor = new website.editor.ImageDialog();
-                    editor.on('start', self, function (o) {o.url = np.$prev && np.$prev.data("src") || np.$next && np.$next.data("src") || "";});
-                    editor.on('save', self, function (o) {
-                        self._set_bg(o.url);
-                        np.$next.data("src", o.url);
+                    var $image = $('<img class="hidden"/>');
+                    $image.attr("src", np.$prev ? np.$prev.data("src") : '');
+                    $image.appendTo(self.$target);
+
+                    self.element = new CKEDITOR.dom.element($image[0]);
+                    var editor = new website.editor.MediaDialog(self, self.element);
+                    editor.appendTo(document.body);
+                    editor.$('[href="#editor-media-video"], [href="#editor-media-icon"]').addClass('hidden');
+
+                    $image.on('saved', self, function (o) {
+                        var src = $image.attr("src");
+                        self._set_bg(src);
+                        np.$next.data("src", src);
                         self.$target.trigger("snippet-style-change", [self, np]);
+                        $image.remove();
                     });
                     editor.on('cancel', self, function () {
                         if (!np.$prev || np.$prev.data("src") === "") {
                             self.$target.removeClass(np.$next.data("value"));
                             self.$target.trigger("snippet-style-change", [self, np]);
                         }
+                        $image.remove();
                     });
-                    editor.appendTo($('body'));
                 } else {
                     this._set_bg(np.$next.data("src"));
                 }

From 55479a4cc2fc15c30aad23aa8db2574d9d008312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 5 May 2014 17:45:23 +0200
Subject: [PATCH 23/44] [FIX] website_forum: new batch of fixes : - fixed
 reopen link that was broken (python code appearing) - fixed close link that
 was leading to a 500 error due to post -> question - fixed link to question
 author, was redirecting to the current user - fixed displayed number of
 questions in the forum, now displaying actual question number, not number of
 displayed questions in the page - improved guidelines: added link back to the
 forum - fixed tags display: now by posts_count desc, unused tags are not
 shown - users are now displayed by desc karma - converting a comment as an
 answer does not allow to create a new answer if another one by uid is already
 present, it just moves the comment

bzr revid: tde@openerp.com-20140505154523-6dld9sfm0nc0oulu
---
 addons/website_forum/controllers/main.py     | 16 +++++++++-------
 addons/website_forum/views/website_forum.xml | 15 ++++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 365221f9574..cd36a802422 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -124,6 +124,7 @@ class WebsiteForum(http.Controller):
         values.update({
             'main_object': tag or forum,
             'question_ids': question_ids,
+            'question_count': question_count,
             'pager': pager,
             'tag': tag,
             'filters': filters,
@@ -134,7 +135,7 @@ class WebsiteForum(http.Controller):
 
     @http.route(['/forum/<model("forum.forum"):forum>/faq'], type='http', auth="public", website=True, multilang=True)
     def forum_faq(self, forum, **post):
-        values = self._prepare_forum_values(forum=forum, searches=dict(), **post)
+        values = self._prepare_forum_values(forum=forum, searches=dict(), header={'is_guidelines': True}, **post)
         return request.website.render("website_forum.faq", values)
 
     @http.route('/forum/get_tags', type='http', auth="public", multilang=True, methods=['GET'], website=True)
@@ -147,7 +148,7 @@ class WebsiteForum(http.Controller):
     def tags(self, forum, page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
         Tag = request.registry['forum.tag']
-        obj_ids = Tag.search(cr, uid, [('forum_id', '=', forum.id)], limit=None, context=context)
+        obj_ids = Tag.search(cr, uid, [('forum_id', '=', forum.id), ('posts_count', '>', 0)], limit=None, order='posts_count DESC', context=context)
         tags = Tag.browse(cr, uid, obj_ids, context=context)
         values = self._prepare_forum_values(forum=forum, searches={'tags': True}, **post)
         values.update({
@@ -426,7 +427,7 @@ class WebsiteForum(http.Controller):
         tag_count = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], count=True, context=context)
         pager = request.website.pager(url="/forum/users", total=tag_count, page=page, step=step, scope=30)
 
-        obj_ids = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], limit=step, offset=pager['offset'], context=context)
+        obj_ids = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], limit=step, offset=pager['offset'], order='karma DESC', context=context)
         users = User.browse(cr, SUPERUSER_ID, obj_ids, context=context)
         searches['users'] = 'True'
 
@@ -590,12 +591,13 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/convert_to_answer', type='http', auth="public", multilang=True, website=True)
     def convert_comment_to_answer(self, forum, post, comment, **kwarg):
-        values = {
-            'content': comment.body,
-        }
+        body = comment.body
         request.registry['mail.message'].unlink(request.cr, request.uid, [comment.id], context=request.context)
         question = post.parent_id if post.parent_id else post
-        return self.post_new(forum, question, **values)
+        for answer in question.child_ids:
+            if answer.create_uid.id == request.uid:
+                return self.post_comment(forum, answer, comment=html2plaintext(body))
+        return self.post_new(forum, question, content=body)
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/convert_to_comment', type='http', auth="user", multilang=True, website=True)
     def convert_answer_to_comment(self, forum, post, **kwarg):
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index bd8b47f0817..e75b85387b0 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -92,7 +92,8 @@
                         </div>
                         <div class="panel-body">
                             <t t-raw="forum.description"/><br/>
-                            <a t-attf-href="/forum/#{slug(forum)}/faq" class="fa fa-arrow-right"> Read Guidelines</a>
+                            <a t-if="not header.get('is_guidelines')" t-attf-href="/forum/#{slug(forum)}/faq" class="fa fa-arrow-right"> Read Guidelines</a>
+                            <a t-if="header.get('is_guidelines')" t-attf-href="/forum/#{slug(forum)}" class="fa fa-arrow-right"> Back to <span t-field="forum.name"/></a>
                         </div>
                     </div>
                     <div t-if="header.get('question_data')">
@@ -208,7 +209,7 @@
 <template id="forum_index" name="Forum">
     <t t-call="website_forum.header">
         <h1 class="page-header mt0">
-            <t t-esc="len(question_ids)"/> <span>Questions</span>
+            <t t-esc="question_count"/> <span>Questions</span>
             <t t-esc="search"/>
             <small class="dropdown" t-if="filters in ('all', 'unanswered','followed', 'tag')">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -332,12 +333,12 @@
             users having a high karma can see closed questions to moderate
             them.
         </p>
-        <form t-attf-action="/forum/#{ slug(forum) }/question/#{slug(post)}/close" method="post" role="form" class="form-horizontal mt32 mb64">
+        <form t-attf-action="/forum/#{ slug(forum) }/question/#{slug(question)}/close" method="post" role="form" class="form-horizontal mt32 mb64">
             <input name="post_id" t-att-value="question.id" type="hidden"/>
             <div class="form-group">
                 <label class="col-md-3 control-label" for="reason">Question:</label>
                 <div class="col-md-8 mt8">
-                    <span t-field="post.name"/>
+                    <span t-field="question.name"/>
                 </div>
             </div>
             <div class="form-group">
@@ -354,7 +355,7 @@
                 <div class="col-md-offset-3 col-md-8">
                     <button class="btn btn-primary">Close question</button>
                     <span class="text-muted">or</span>
-                    <a class="btn btn-link" t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(post) }">back to question</a>
+                    <a class="btn btn-link" t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }">back to question</a>
                 </div>
             </div>
         </form>
@@ -451,7 +452,7 @@
                                 <a class="text-muted fa fa-times" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"> Close</a>
                             </li>
                             <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
-                                <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)/reopen">reopen</a>
+                                <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"> Reopen</a>
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <a class="text-muted fa fa-edit" t-attf-href="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"> Edit</a>
@@ -467,7 +468,7 @@
                     <div>
                         <span t-field="question.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
                         <div>
-                            <a t-attf-href="/forum/#{ slug(forum) }/user/#{ user.id }"
+                            <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
                                 t-field="question.create_uid"
                                 t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                                 style="display: inline-block;"/>

From 5f5fd653db5608da3facb0d9179c8555b7027a0a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 6 May 2014 07:27:15 +0000
Subject: [PATCH 24/44] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072715-4m7kz3factf743c9
---
 addons/account/i18n/nl.po |  8 ++++----
 addons/stock/i18n/hr.po   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 089d94953d5..ea39418274e 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-04-20 06:40+0000\n"
+"PO-Revision-Date: 2014-05-05 10:40+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2014-04-21 05:08+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-06 07:26+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5133,7 +5133,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "Alle geboekte boekingen"
+msgstr "Alleen definitieve boekingen"
 
 #. module: account
 #: field:report.aged.receivable,name:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 7e484eca201..f387ab46671 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-03-05 10:52+0000\n"
+"PO-Revision-Date: 2014-05-05 09:49+0000\n"
 "Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@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: 2014-03-06 06:15+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-06 07:27+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1070,7 +1070,7 @@ msgstr "Pošiljke u dolasku"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation date, usually the time of the order."
-msgstr "Datum kreiranja, obično vrijeme naloga"
+msgstr "Datum naloga"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1754,7 +1754,7 @@ msgstr ""
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr "Datum kreiranja"
+msgstr "Datum naloga"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
@@ -4558,7 +4558,7 @@ msgstr "_Primjeni"
 #: field:stock.picking.in,max_date:0
 #: field:stock.picking.out,max_date:0
 msgid "Max. Expected Date"
-msgstr "Max. Expected Date"
+msgstr "Krajnji očekivani datum"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0

From 6b26a3896bb255e4271994cc9bf12c3a4b32b191 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 6 May 2014 09:51:26 +0200
Subject: [PATCH 25/44] [FIX] website_sale: manifest typo

bzr revid: dle@openerp.com-20140506075126-mv6g869aqdl1yt5g
---
 addons/website_sale/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/static/description/index.html b/addons/website_sale/static/description/index.html
index f6a9d50443e..8a006ff9c56 100644
--- a/addons/website_sale/static/description/index.html
+++ b/addons/website_sale/static/description/index.html
@@ -122,7 +122,7 @@
 <section class="oe_container oe_dark">
     <div class="oe_row">
         <h2 class="oe_slogan">Fine Tune Your Catalog</h2>
-        <h3 class="oe_slogan">Boost Sales by Emphasazing Best Products</h3>
+        <h3 class="oe_slogan">Boost Sales by Emphasizing Best Products</h3>
         <div class="oe_span6">
           <p class='oe_mt32'>
 			  Get a full control on how you display your products in

From ae6a0fcb735a9b75f9c379377ecb5346297be66d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 6 May 2014 11:06:49 +0200
Subject: [PATCH 26/44] [FIX] account_analytic_analysis: split _prepare_invoice
 into two methods, one for the 'generic' data for invoices (customers, fiscal
 position, etc) and one for generate the recurring invoice line, so they can
 be reused in other methods

bzr revid: dle@openerp.com-20140506090649-141s4io4329ybu69
---
 .../account_analytic_analysis.py              | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a25950783ad..d69cd04b6be 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -652,11 +652,10 @@ class account_analytic_account(osv.osv):
             'nodestroy': True,
         }
 
-    def _prepare_invoice(self, cr, uid, contract, context=None):
+    def _prepare_invoice_data(self, cr, uid, contract, context=None):
         context = context or {}
 
         journal_obj = self.pool.get('account.journal')
-        fpos_obj = self.pool.get('account.fiscal.position')
 
         if not contract.partner_id:
             raise osv.except_osv(_('No Customer Defined!'),_("You must first select a Customer for Contract %s!") % contract.name )
@@ -677,7 +676,7 @@ class account_analytic_account(osv.osv):
         elif contract.company_id:
             currency_id = contract.company_id.currency_id.id
 
-        inv_data = {
+        invoice = {
            'account_id': contract.partner_id.property_account_receivable.id,
            'type': 'out_invoice',
            'partner_id': contract.partner_id.id,
@@ -689,20 +688,23 @@ class account_analytic_account(osv.osv):
            'payment_term': partner_payment_term,
            'company_id': contract.company_id.id or False,
         }
+        return invoice
 
-        invoice_line_vals = []
+    def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position, context=None):
+        fpos_obj = self.pool.get('account.fiscal.position')
+        invoice_lines = []
         for line in contract.recurring_invoice_line_ids:
 
             res = line.product_id
             account_id = res.property_account_income.id
             if not account_id:
                 account_id = res.categ_id.property_account_income_categ.id
-            account_id = fpos_obj.map_account(cr, uid, fpos, account_id)
+            account_id = fpos_obj.map_account(cr, uid, fiscal_position, account_id)
 
             taxes = res.taxes_id or False
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            tax_id = fpos_obj.map_tax(cr, uid, fiscal_position, taxes)
 
-            invoice_line_vals.append({
+            invoice_lines.append((0, 0, {
                 'name': line.name,
                 'account_id': account_id,
                 'account_analytic_id': contract.id,
@@ -710,13 +712,14 @@ class account_analytic_account(osv.osv):
                 'quantity': line.quantity,
                 'uos_id': line.uom_id.id or False,
                 'product_id': line.product_id.id or False,
-                # 'invoice_id' : invoice_id,
                 'invoice_line_tax_id': [(6, 0, tax_id)],
-            })
+            }))
+        return invoice_lines
 
-        inv_data['invoice_line'] = [(0, 0, line_vals) for line_vals in invoice_line_vals]
-
-        return inv_data
+    def _prepare_invoice(self, cr, uid, contract, context=None):
+        invoice = self._prepare_invoice_data(cr, uid, contract, context=context)
+        invoice['invoice_line'] = self._prepare_invoice_lines(cr, uid, contract, invoice['fiscal_position'], context=context)
+        return invoice
 
     def recurring_create_invoice(self, cr, uid, ids, context=None):
         return self._recurring_create_invoice(cr, uid, ids, context=context)

From bde55baaa92da0565f654b99dd614ead7faea1c7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 11:37:16 +0200
Subject: [PATCH 27/44] [IMP] gamification: performance improvement on the goal
 computation

Removing the inheritance to mail.thread will avoid posting message at creation and other tracking mechanism at each write. Updating a challenge with a large number of users will be significantly faster.

bzr revid: mat@openerp.com-20140506093716-xvpe1n2ase2zix0v
---
 addons/gamification/models/challenge.py | 11 +++++++----
 addons/gamification/models/goal.py      |  4 +---
 addons/gamification/views/goal.xml      |  4 ----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index ecb4c495d94..a6c467f0177 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -355,10 +355,13 @@ class gamification_challenge(osv.Model):
                 if write_op:
                     self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
 
-                if to_remove_ids:
-                    self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=None)
-                if to_add_ids:
-                    self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
+                if challenge.report_message_frequency != 'never':
+                    if to_remove_ids:
+                        self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=context)
+                    if to_add_ids:
+                        self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
+                else:
+                    self.message_unsubscribe_users(cr, uid, [challenge.id], old_user_ids, context=context)
 
         return True
 
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index af9a763236d..7fcf8e5f981 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -138,7 +138,6 @@ class gamification_goal(osv.Model):
 
     _name = 'gamification.goal'
     _description = 'Gamification goal instance'
-    _inherit = 'mail.thread'
 
     def _get_completion(self, cr, uid, ids, field_name, arg, context=None):
         """Return the percentage of completeness of the goal, between 0 and 100"""
@@ -226,8 +225,7 @@ class gamification_goal(osv.Model):
                 temp_obj = self.pool.get('email.template')
                 template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_reminder', context)
                 body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.goal', goal.id, context=context)
-
-                self.message_post(cr, uid, goal.id, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
+                self.pool['mail.thread'].message_post(cr, uid, 0, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
                 return {'to_update': True}
         return {}
 
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index 528d5db0511..884467404ce 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -86,10 +86,6 @@
                             </group>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
                 </form>
             </field>
         </record>

From ccf4d142b0674dc6894eff5c9e1c4ac77d78d18d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 12:29:42 +0200
Subject: [PATCH 28/44] [FIX] gamification: avoid recomputing every goal for
 every challenge

bzr revid: mat@openerp.com-20140506102942-obopc9j5a2136cxh
---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index a6c467f0177..f4704f2de29 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -396,9 +396,9 @@ class gamification_challenge(osv.Model):
         :param list(int) ids: the list of challenge concerned"""
 
         goal_obj = self.pool.get('gamification.goal')
-        to_update = []
         for challenge in self.browse(cr, uid, ids, context=context):
             (start_date, end_date) = start_end_date_for_period(challenge.period)
+            to_update = []
 
             # if no periodicity, use challenge dates
             if not start_date and challenge.start_date:

From 697dcae728c045ae0cbfb9d48821a8417856e25c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 13:21:09 +0200
Subject: [PATCH 29/44] [IMP] gamification: move write in goal update inside
 the first loop to be able to group the computation by definition (and
 potentially apply intermediate commits)

bzr revid: mat@openerp.com-20140506112109-z4rsx5umet5x6n26
---
 addons/gamification/models/goal.py | 31 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 7fcf8e5f981..2cbb8869eb7 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -241,7 +241,6 @@ class gamification_goal(osv.Model):
             context = {}
 
         goals_by_definition = {}
-        goals_to_write = {}
         all_goals = {}
         for goal in self.browse(cr, uid, ids, context=context):
             if goal.state in ('draft', 'canceled'):
@@ -249,10 +248,10 @@ class gamification_goal(osv.Model):
                 continue
 
             goals_by_definition.setdefault(goal.definition_id, []).append(goal)
-            goals_to_write[goal.id] = {}
             all_goals[goal.id] = goal
 
         for definition, goals in goals_by_definition.items():
+            goals_to_write = dict((goal.id, {}) for goal in goals)
             if definition.computation_mode == 'manually':
                 for goal in goals:
                     goals_to_write[goal.id].update(self._check_remind_delay(cr, uid, goal, context))
@@ -343,22 +342,22 @@ class gamification_goal(osv.Model):
                         if new_value != goal.current:
                             goals_to_write[goal.id]['current'] = new_value
 
-        for goal_id, value in goals_to_write.items():
-            if not value:
-                continue
-            goal = all_goals[goal_id]
+            for goal_id, value in goals_to_write.items():
+                if not value:
+                    continue
+                goal = all_goals[goal_id]
 
-            # check goal target reached
-            if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
-              or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
-                value['state'] = 'reached'
+                # check goal target reached
+                if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
+                  or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
+                    value['state'] = 'reached'
 
-            # check goal failure
-            elif goal.end_date and fields.date.today() > goal.end_date:
-                value['state'] = 'failed'
-                value['closed'] = True
-            if value:
-                self.write(cr, uid, [goal.id], value, context=context)
+                # check goal failure
+                elif goal.end_date and fields.date.today() > goal.end_date:
+                    value['state'] = 'failed'
+                    value['closed'] = True
+                if value:
+                    self.write(cr, uid, [goal.id], value, context=context)
         return True
 
     def action_start(self, cr, uid, ids, context=None):

From a233e26f710bd6cc990d8d1897f379cb93580e87 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 13:38:31 +0200
Subject: [PATCH 30/44] [IMP] gamification: commit for each goal definition in
 cron

bzr revid: mat@openerp.com-20140506113831-iut3aqbwfwbnertv
---
 addons/gamification/models/challenge.py | 6 ++++++
 addons/gamification/models/goal.py      | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index f4704f2de29..e7176e8cb09 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -264,6 +264,9 @@ class gamification_challenge(osv.Model):
         - Create the missing goals (eg: modified the challenge to add lines)
         - Update every running challenge
         """
+        if context is None:
+            context = {}
+
         # start scheduled challenges
         planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'draft'),
@@ -281,6 +284,9 @@ class gamification_challenge(osv.Model):
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')], context=context)
 
+        # in cron mode, will do intermediate commits
+        # TODO in trunk: replace by parameter
+        context.update({'commit_gamification': True})
         return self._update_all(cr, uid, ids, context=context)
 
     def _update_all(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 2cbb8869eb7..b4a47a0d07a 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -239,6 +239,7 @@ class gamification_goal(osv.Model):
         the target value being reached, the goal is set as failed."""
         if context is None:
             context = {}
+        commit = context.get('commit_gamification', False)
 
         goals_by_definition = {}
         all_goals = {}
@@ -358,6 +359,8 @@ class gamification_goal(osv.Model):
                     value['closed'] = True
                 if value:
                     self.write(cr, uid, [goal.id], value, context=context)
+            if commit:
+                cr.commit()
         return True
 
     def action_start(self, cr, uid, ids, context=None):

From 409bf269d3f6f6c34b0469bc52feb86730519e64 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 13:52:45 +0200
Subject: [PATCH 31/44] [FIX] gamification: be sure that not challenge get
 subscribers depending of the report_message_frequency

bzr revid: mat@openerp.com-20140506115245-ktuxhcsml466ym6u
---
 addons/gamification/models/challenge.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index e7176e8cb09..b1f297abde0 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -240,6 +240,11 @@ class gamification_challenge(osv.Model):
 
         write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
 
+        if vals.get('report_message_frequency', 'never') != 'never':
+            # _recompute_challenge_users do not set users for challenges with no reports, subscribing them now
+            for challenge in self.browse(cr, uid, ids, context=context):
+                self.message_subscribe(cr, uid, [challenge.id], [user.partner_id.id for user in challenge.user_ids], context=context)
+
         if vals.get('state') == 'inprogress':
             self._recompute_challenge_users(cr, uid, ids, context=context)
             self._generate_goals_from_challenge(cr, uid, ids, context=context)

From 69ec02b2d4af803f43654577aadfbba63adc1e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 May 2014 14:30:01 +0200
Subject: [PATCH 32/44] [FIX] website_forum: more fixes : - display tag name in
 'filter' bar when filtering on a tag - display active tag in a blue color -
 order answers: correct first, then most upvoted

bzr revid: tde@openerp.com-20140506123001-fz5gt6i9zw6ondcu
---
 addons/website_forum/models/forum.py                   | 1 +
 addons/website_forum/static/src/css/website_forum.css  | 3 +++
 addons/website_forum/static/src/css/website_forum.sass | 2 ++
 addons/website_forum/views/website_forum.xml           | 9 ++++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 7a8385d1a82..061b9e55eb8 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -70,6 +70,7 @@ class Post(osv.Model):
     _name = 'forum.post'
     _description = 'Forum Post'
     _inherit = ['mail.thread', 'website.seo.metadata']
+    _order = "is_correct DESC, vote_count DESC"
 
     def _get_user_vote(self, cr, uid, ids, field_name, arg, context):
         res = dict.fromkeys(ids, 0)
diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index ab8ea684aae..b90c1786e24 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -21,6 +21,9 @@
   background-color: #cccccc;
   margin-left: 4px;
 }
+.question .badge-active {
+  background-color: #428bca;
+}
 
 .oe_grey {
   background-color: #eeeeee;
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index da2df1460aa..f8e46f06b79 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -17,6 +17,8 @@
   .badge
     background-color: #ccc
     margin-left: 4px
+  .badge-active
+    background-color: #428bca
 
 .oe_grey
   background-color: #eeeeee
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index e75b85387b0..c73486d7d39 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -145,8 +145,11 @@
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>
             </div>
-            <t t-foreach="question.tag_ids" t-as="tag">
-                <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ tag.id }/questions" class="badge pull-right" t-field="tag.name"/>
+            <t t-foreach="question.tag_ids" t-as="question_tag">
+                <a t-attf-href="/forum/#{ slug(forum) }/tag/#{slug(question_tag)}/questions">
+                    <span t-attf-class="pull-right badge #{tag and tag.name == question_tag.name and 'badge-active' ''}" t-field="question_tag.name"
+                        style="margin-right: 4px;"/>
+                </a>
             </t>
             <div class="text-muted">
                 by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
@@ -216,7 +219,7 @@
                   <t t-if="filters == 'all'">All</t>
                   <t t-if="filters == 'unanswered'">Unanswered</t>
                   <t t-if="filters == 'followed'">Followed</t>
-                  <t t-if="filters == 'tag'">Tag</t>
+                  <t t-if="tag"><span t-field="tag.name"/></t>
                   <t t-if="sorting == 'date'"> by activity date</t>
                   <t t-if="sorting == 'answered'"> by most answered</t>
                   <t t-if="sorting == 'vote'"> by most voted</t>

From 687d675de5eb01dd2e1ef803c79acfb30d9dabc7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 15:48:05 +0200
Subject: [PATCH 33/44] [FIX] gamification: using batch mode to check rewards

bzr revid: mat@openerp.com-20140506134805-4nsurv82cg9anfvm
---
 addons/gamification/models/challenge.py | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index b1f297abde0..5668f5d8682 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -712,34 +712,35 @@ class gamification_challenge(osv.Model):
             rewarded_users = []
             challenge_ended = end_date == yesterday.strftime(DF) or force
             if challenge.reward_id and challenge_ended or challenge.reward_realtime:
-                for user in challenge.user_ids:
-                    reached_goal_ids = self.pool.get('gamification.goal').search(cr, uid, [
-                        ('challenge_id', '=', challenge.id),
-                        ('user_id', '=', user.id),
-                        ('start_date', '=', start_date),
-                        ('end_date', '=', end_date),
-                        ('state', '=', 'reached')
-                    ], context=context)
-                    if len(reached_goal_ids) == len(challenge.line_ids):
+                # not using start_date as intemportal goals have a start date but no end_date
+                reached_goals = self.pool.get('gamification.goal').read_group(cr, uid, [
+                    ('challenge_id', '=', challenge.id),
+                    ('end_date', '=', end_date),
+                    ('state', '=', 'reached')
+                ], fields=['user_id'], groupby=['user_id'], context=context)
+                for reach_goals_user in reached_goals:
+                    if reach_goals_user['user_id_count'] == len(challenge.line_ids):
                         # the user has succeeded every assigned goal
+                        user_id = reach_goals_user['user_id'][0]
                         if challenge.reward_realtime:
                             badges = self.pool['gamification.badge.user'].search(cr, uid, [
                                 ('challenge_id', '=', challenge.id),
                                 ('badge_id', '=', challenge.reward_id.id),
-                                ('user_id', '=', user.id),
+                                ('user_id', '=', user_id),
                             ], count=True, context=context)
                             if badges > 0:
                                 # has already recieved the badge for this challenge
                                 continue
-                        self.reward_user(cr, uid, user.id, challenge.reward_id.id, challenge.id, context=context)
-                        rewarded_users.append(user)
+                        self.reward_user(cr, uid, user_id, challenge.reward_id.id, challenge.id, context=context)
+                        rewarded_users.append(user_id)
 
             if challenge_ended:
                 # open chatter message
                 message_body = _("The challenge %s is finished." % challenge.name)
 
                 if rewarded_users:
-                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user.name for user in rewarded_users])))
+                    user_names = self.pool['res.users'].name_get(cr, uid, rewarded_users, context=context)
+                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user for user in user_names])))
                 else:
                     message_body += _("<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge.")
 

From 3cdb9803d4095165054c3224a8e90d87e2f81005 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 15:59:53 +0200
Subject: [PATCH 34/44] [IMP] unsubscribing at each cron run is overkill

bzr revid: mat@openerp.com-20140506135953-3hssq2lycvy1c3df
---
 addons/gamification/models/challenge.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 5668f5d8682..4c1823c655c 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -366,13 +366,12 @@ class gamification_challenge(osv.Model):
                 if write_op:
                     self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
 
+                # TODO for trunk: use proper parameter
                 if challenge.report_message_frequency != 'never':
                     if to_remove_ids:
                         self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=context)
                     if to_add_ids:
                         self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
-                else:
-                    self.message_unsubscribe_users(cr, uid, [challenge.id], old_user_ids, context=context)
 
         return True
 

From 3fa27518556355c108e8a47b66b3475e22430956 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 16:38:34 +0200
Subject: [PATCH 35/44] [FIX] name_get returns tuple

bzr revid: mat@openerp.com-20140506143834-od28gkhbpbhsgde4
---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 4c1823c655c..d3297a048d3 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -739,7 +739,7 @@ class gamification_challenge(osv.Model):
 
                 if rewarded_users:
                     user_names = self.pool['res.users'].name_get(cr, uid, rewarded_users, context=context)
-                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user for user in user_names])))
+                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([name for (user_id, name) in user_names])))
                 else:
                     message_body += _("<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge.")
 

From d1bba709b44b59c7936f48f5cf9680cfe4ef5a3e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 6 May 2014 17:34:59 +0200
Subject: [PATCH 36/44] [FIX] account_analytic_analysis: recurring invoices,
 map_tax and map_account methods of fiscal position model expect a browse
 record

bzr revid: dle@openerp.com-20140506153459-0vv6rcttihl628l3
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index d69cd04b6be..6c71f940e8a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -690,8 +690,9 @@ class account_analytic_account(osv.osv):
         }
         return invoice
 
-    def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position, context=None):
+    def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position_id, context=None):
         fpos_obj = self.pool.get('account.fiscal.position')
+        fiscal_position = fpos_obj.browse(cr, uid,  fiscal_position_id, context=context)
         invoice_lines = []
         for line in contract.recurring_invoice_line_ids:
 

From fd50793820dfb2996ca5009b4fc5f8d1a7b4831f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 7 May 2014 11:56:16 +0200
Subject: [PATCH 37/44] [IMP] gamification: avoid subscription hacks and send
 directly relevant messages to followers of the challenge, remove the goals of
 users not matching the user domain anymore

bzr revid: mat@openerp.com-20140507095616-1xvetgj4qel7iqii
---
 addons/gamification/models/challenge.py | 35 +++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index d3297a048d3..63c23f30cff 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -217,15 +217,7 @@ class gamification_challenge(osv.Model):
                 vals['user_ids'] = []
             vals['user_ids'] += [(4, user_id) for user_id in user_ids]
 
-        create_res = super(gamification_challenge, self).create(cr, uid, vals, context=context)
-
-        # subscribe new users to the challenge
-        if vals.get('user_ids'):
-            # done with browse after super to be sure catch all after orm process
-            challenge = self.browse(cr, uid, create_res, context=context)
-            self.message_subscribe_users(cr, uid, [challenge.id], [user.id for user in challenge.user_ids], context=context)
-
-        return create_res
+        return super(gamification_challenge, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int,long)):
@@ -366,13 +358,6 @@ class gamification_challenge(osv.Model):
                 if write_op:
                     self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
 
-                # TODO for trunk: use proper parameter
-                if challenge.report_message_frequency != 'never':
-                    if to_remove_ids:
-                        self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=context)
-                    if to_add_ids:
-                        self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
-
         return True
 
 
@@ -439,7 +424,15 @@ class gamification_challenge(osv.Model):
 
                 cr.execute(query, query_params)
                 user_with_goal_ids = cr.dictfetchall()
-                user_without_goal_ids = list(set([user.id for user in challenge.user_ids]) - set([user['user_id'] for user in user_with_goal_ids]))
+
+                participant_user_ids = [user.id for user in challenge.user_ids]
+                user_without_goal_ids = list(set(participant_user_ids) - set([user['user_id'] for user in user_with_goal_ids]))
+                user_squating_challenge_ids = list(set([user['user_id'] for user in user_with_goal_ids]) - set(participant_user_ids))
+                if user_squating_challenge_ids:
+                    # users that used to match the challenge 
+                    goal_to_remove_ids = goal_obj.search(cr, uid, [('challenge_id', '=', challenge.id), ('user_id', 'in', user_squating_challenge_ids)], context=context)
+                    goal_obj.unlink(cr, uid, goal_to_remove_ids, context=context)
+
 
                 values = {
                     'definition_id': line.definition_id.id,
@@ -627,9 +620,10 @@ class gamification_challenge(osv.Model):
             ctx.update({'challenge_lines': lines_boards})
             body_html = temp_obj.render_template(cr, uid, challenge.report_template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
 
-            # send to every follower of the challenge
+            # send to every follower and participant of the challenge
             self.message_post(cr, uid, challenge.id,
                 body=body_html,
+                partner_ids=[user.partner_id.id for user in challenge.user_ids],
                 context=context,
                 subtype='mail.mt_comment')
             if challenge.report_message_group_id:
@@ -760,7 +754,10 @@ class gamification_challenge(osv.Model):
                         self.reward_user(cr, uid, third_user.id, challenge.reward_second_id.id, challenge.id, context=context)
                         message_body += "<br/> 3. %s - %s" % (third_user.name, challenge.reward_third_id.name)
 
-                self.message_post(cr, uid, challenge.id, body=message_body, context=context)
+                self.message_post(cr, uid, challenge.id,
+                    partner_ids=[user.partner_id.id for user in challenge.user_ids],
+                    body=message_body,
+                    context=context)
 
         return True
 

From 883f695b6794e3b5ce6f938b4e04e4de45090a07 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 7 May 2014 12:24:14 +0200
Subject: [PATCH 38/44] [FIX] auth_oauth: missing field body in formview

The body is the field used to actually display the 'log in with ...'
As not shown in the view, when adding a new provider, this field was empty and therefore wasnt visible on the login form...

bzr revid: dle@openerp.com-20140507102414-vz7ur7zvh4ptuk2e
---
 addons/auth_oauth/auth_oauth_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index ffc39752ec6..5c889d3a686 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -11,6 +11,7 @@
                             <field name="name" />
                             <field name="client_id" />
                             <field name="enabled" />
+                            <field name="body" />
                         </group>
                         <group>
                             <field name="auth_endpoint" />

From 95ba80f174a71cbf14b1d94f1c02527fe8d04a9f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 7 May 2014 12:25:50 +0200
Subject: [PATCH 39/44] [FIX] warning: make blocking warning actually doing
 something (opw 607380)

Instead of raising an exception (which only interupt the call of the onchange methods), return a dictionnary to set the forbidden partner or product to an empty value.
The call is not blocking in a way it forbid to create a record that uses this partner/product but it make it not possible to select it through the web interface.

bzr revid: mat@openerp.com-20140507102550-sms5nbf0u7pdkci9
---
 addons/warning/warning.py | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index a3627e0021d..c1a2f92a9fd 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -63,14 +63,14 @@ class sale_order(osv.osv):
         message = False
         partner = self.pool.get('res.partner').browse(cr, uid, part, context=context)
         if partner.sale_warn != 'no-message':
-            if partner.sale_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.sale_warn_msg)
             title =  _("Warning for %s") % partner.name
             message = partner.sale_warn_msg
             warning = {
                     'title': title,
                     'message': message,
             }
+            if partner.sale_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
 
         result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part, context=context)
 
@@ -92,14 +92,15 @@ class purchase_order(osv.osv):
         message = False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.purchase_warn != 'no-message':
-            if partner.purchase_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.purchase_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.purchase_warn_msg
             warning = {
                 'title': title,
                 'message': message
                 }
+            if partner.purchase_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)
 
         if result.get('warning',False):
@@ -126,15 +127,16 @@ class account_invoice(osv.osv):
         message = False
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
         if partner.invoice_warn != 'no-message':
-            if partner.invoice_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.invoice_warn_msg)
-
             title = _("Warning for %s") % partner.name
             message = partner.invoice_warn_msg
             warning = {
                 'title': title,
                 'message': message
                 }
+
+            if partner.invoice_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice=date_invoice, payment_term=payment_term, 
             partner_bank_id=partner_bank_id, company_id=company_id)
@@ -158,14 +160,15 @@ class stock_picking(osv.osv):
         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
             }
+            if partner.picking_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(stock_picking, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -188,14 +191,15 @@ class stock_picking_in(osv.osv):
         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
             }
+            if partner.picking_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -214,14 +218,15 @@ class stock_picking_out(osv.osv):
         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
             }
+            if partner.picking_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -262,12 +267,12 @@ class sale_order_line(osv.osv):
         message = False
 
         if product_info.sale_line_warn != 'no-message':
-            if product_info.sale_line_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (product_info.name), product_info.sale_line_warn_msg)
             title = _("Warning for %s") % product_info.name
             message = product_info.sale_line_warn_msg
             warning['title'] = title
             warning['message'] = message
+            if product_info.sale_line_warn == 'block':
+                return {'value': {'product_id': False}, 'warning': warning}
 
         result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
@@ -295,12 +300,12 @@ class purchase_order_line(osv.osv):
         message = False
 
         if product_info.purchase_line_warn != 'no-message':
-            if product_info.purchase_line_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (product_info.name), product_info.purchase_line_warn_msg)
             title = _("Warning for %s") % product_info.name
             message = product_info.purchase_line_warn_msg
             warning['title'] = title
             warning['message'] = message
+            if product_info.purchase_line_warn == 'block':
+                return {'value': {'product_id': False}, 'warning': warning}
 
         result =  super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order, fiscal_position_id)

From 0f9917c9a3245aa21efc427d3d7a7b1402c92c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 May 2014 13:06:37 +0200
Subject: [PATCH 40/44] [FIX] service: wrapper: fixed context fetching. Indeed
 call_kw set its context in kwargs of kwargs, leading to a kwargception.

bzr revid: tde@openerp.com-20140507110637-qlj1rj8lrcpkejf6
---
 openerp/service/model.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/service/model.py b/openerp/service/model.py
index d65cbd77333..2bbba4ef72a 100644
--- a/openerp/service/model.py
+++ b/openerp/service/model.py
@@ -54,7 +54,8 @@ def check(f):
                 if args and isinstance(args[-1], dict):
                     ctx = args[-1]
             elif isinstance(kwargs, dict):
-                ctx = kwargs.get('context', {})
+                # kwargception because call_kw set its context in kwargs['kwargs']
+                ctx = kwargs.get('context', kwargs.get('kwargs', {}).get('context', {}))
 
             uid = 1
             if args and isinstance(args[0], (long, int)):

From ada19d175d530b616f88e7c3d81ec194f7ad6a0d Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 7 May 2014 14:01:44 +0200
Subject: [PATCH 41/44] [FIX] POS - Write the state to Paid before the
 create_picking. It's allow to stay in a valid state in workflow. And let the
 current stock picking out to 'Ready for delivery'

bzr revid: jke@openerp.com-20140507120144-m177kqxa3fbfl37r
---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 3480ab47221..0a2b96fd273 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1167,8 +1167,8 @@ class pos_order(osv.osv):
         return self.write(cr, uid, ids, {'state': 'payment'}, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        self.create_picking(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'paid'}, context=context)
+        self.create_picking(cr, uid, ids, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):

From e0fb0a643429cb85f8f0e920460d0c3d810c772a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 7 May 2014 15:35:52 +0200
Subject: [PATCH 42/44] [FIX] account: when creating partial reconcilation
 after unreconciliating one invoice, make sure we create this partial
 reconcilation only if we have at least two lines

bzr revid: mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
---
 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 61619276df7..4da965167ba 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1029,7 +1029,7 @@ class account_move_line(osv.osv):
             if opening_reconciliation:
                 obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
             obj_move_rec.unlink(cr, uid, unlink_ids)
-            if all_moves:
+            if len(all_moves) >= 2:
                 obj_move_line.reconcile_partial(cr, uid, all_moves, 'auto',context=context)
         return True
 

From 643871c20f096223b38ef69e846dcaa9f1e44051 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 7 May 2014 15:41:27 +0200
Subject: [PATCH 43/44] [FIX] website_forum: set config parameter via dedicated
 function

bzr revid: chs@openerp.com-20140507134127-xmp9kza1mvy37jf1
---
 addons/website_forum/data/forum_data.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 245169c23e9..a387a8de7ae 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -13,10 +13,7 @@
             <field name="sequence" type="int">35</field>
         </record>
 
-        <record id="default_allow_auth_signup" model="ir.config_parameter"> 
-            <field name="key">auth_signup.allow_uninvited</field>
-            <field name="value" eval="True"/>
-        </record>
+        <function model="ir.config_parameter" name="set_param" eval="('auth_signup.allow_uninvited', True)" />
 
         <!-- JUMP TO FORUM AT INSTALL -->
         <record id="action_open_forum" model="ir.actions.act_url">

From 9a271eef168df0df94e0d8cecf85f037320187ef Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 7 May 2014 18:42:07 +0200
Subject: [PATCH 44/44] [FIX] mail: correct code indentation introduced during
 previous forward-port

bzr revid: chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
---
 addons/mail/mail_mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index c4466a9f0c4..9811fcd6aef 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -293,7 +293,7 @@ class mail_mail(osv.Model):
                 # /!\ can't use mail.state here, as mail.refresh() will cause an error
                 # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
                 self._postprocess_sent_message(cr, uid, mail, context=context, mail_sent=mail_sent)
-                    _logger.info('Mail with ID %r and Message-Id %r successfully sent', mail.id, mail.message_id)
+                _logger.info('Mail with ID %r and Message-Id %r successfully sent', mail.id, mail.message_id)
             except MemoryError:
                 # prevent catching transient MemoryErrors, bubble up to notify user or abort cron job
                 # instead of marking the mail as failed