From 229c057f3bdeacb4c646e217734030fc2f3ef7f4 Mon Sep 17 00:00:00 2001
From: "Jignesh Rathod (OpenERP)" <jir@tinyerp.com>
Date: Mon, 2 Dec 2013 11:23:31 +0530
Subject: [PATCH 01/72] [IMP] Add colors in tree view of components..

bzr revid: jir@tinyerp.com-20131202055331-jk00a7cgpu55vnwf
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2576235586f..5c2b45cc900 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -680,7 +680,7 @@
                             <group>
                                 <group string="Products to Consume">
                                     <field name="move_lines" nolabel="1" options="{'reload_on_button': true}">
-                                        <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                        <tree colors="red:state in ('confirmed','waiting');blue:state == 'draft';black:state in ('picking_except','ready','assigned','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>

From 3abf050afc33a4baa16431e236801b1999546a7f Mon Sep 17 00:00:00 2001
From: "Pooja Zankhariya (OpenERP)" <pza@tinyerp.com>
Date: Mon, 9 Dec 2013 14:49:48 +0500
Subject: [PATCH 02/72] [IMP]Improved colors for components

bzr revid: pza@tinyerp.com-20131209094948-4zne4efiijzm2ly6
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 5c2b45cc900..55973d6f47c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -680,7 +680,7 @@
                             <group>
                                 <group string="Products to Consume">
                                     <field name="move_lines" nolabel="1" options="{'reload_on_button': true}">
-                                        <tree colors="red:state in ('confirmed','waiting');blue:state == 'draft';black:state in ('picking_except','ready','assigned','in_production');gray:state in ('cancel','done') " string="Products to Consume">
+                                        <tree colors="blue:state == 'draft';black:state in ('ready','assigned','in_production');gray:state in ('cancel','done');red:state in ('confirmed','picking_except','waiting')" string="Products to Consume">
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>

From 1daeaed37646208f5f1f94afe900c6f78edd621d Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Tue, 18 Feb 2014 13:32:11 +0100
Subject: [PATCH 03/72] [FIX] use copy_data rather than doing a write after
 that the moves are created

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

bzr revid: guewen.baconnier@camptocamp.com-20140218123211-3l3bvi3at1s91lfi
---
 addons/stock/stock.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 02fd28611e6..53f43f73083 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -727,10 +727,6 @@ class stock_picking(osv.osv):
         if 'invoice_state' not in default and picking_obj.invoice_state == 'invoiced':
             default['invoice_state'] = '2binvoiced'
         res = super(stock_picking, self).copy(cr, uid, id, default, context)
-        if res:
-            picking_obj = self.browse(cr, uid, res, context=context)
-            for move in picking_obj.move_lines:
-                move_obj.write(cr, uid, [move.id], {'tracking_id': False, 'prodlot_id': False, 'move_history_ids2': [(6, 0, [])], 'move_history_ids': [(6, 0, [])]})
         return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
@@ -1806,12 +1802,17 @@ class stock_move(osv.osv):
                                              _('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
         return  super(stock_move, self).write(cr, uid, ids, vals, context=context)
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         default = default.copy()
-        default.update({'move_history_ids2': [], 'move_history_ids': []})
-        return super(stock_move, self).copy(cr, uid, id, default, context=context)
+        default.update({
+            'tracking_id': False,
+            'prodlot_id': False,
+            'move_history_ids2': [],
+            'move_history_ids': []
+        })
+        return super(stock_move, self).copy_data(cr, uid, id, default, context=context)
 
     def _auto_init(self, cursor, context=None):
         res = super(stock_move, self)._auto_init(cursor, context=context)

From 0ff86218f617f210495832b5145c40009f8fc3f0 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Mon, 24 Feb 2014 10:03:54 +0100
Subject: [PATCH 04/72] Use setdefault to allow a copy with one of this field
 with a value

bzr revid: guewen.baconnier@camptocamp.com-20140224090354-wcsnd4wzs91w553e
---
 addons/stock/stock.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 53f43f73083..1e6291b739c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1806,12 +1806,10 @@ class stock_move(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default.update({
-            'tracking_id': False,
-            'prodlot_id': False,
-            'move_history_ids2': [],
-            'move_history_ids': []
-        })
+        default.setdefault('tracking_id', False)
+        default.setdefault('prodlot_id', False)
+        default.setdefault('move_history_ids', [])
+        default.setdefault('move_history_ids2', [])
         return super(stock_move, self).copy_data(cr, uid, id, default, context=context)
 
     def _auto_init(self, cursor, context=None):

From 89df55eec1eb8e29527885ea03016274bbefc723 Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP)" <mka@tinyerp.com>
Date: Thu, 13 Mar 2014 12:32:51 +0530
Subject: [PATCH 05/72] [IMP] Done Followuplevel's Configuration.

bzr revid: mka@tinyerp.com-20140313070251-e7ugd8devtrls8qa
---
 addons/account_followup/__openerp__.py         |  3 ++-
 .../account_followup/account_followup_view.xml |  4 +++-
 addons/account_followup/res_config_view.xml    | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 addons/account_followup/res_config_view.xml

diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index dbb4ea6583e..24dc1964f80 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -29,7 +29,7 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 
 You can define your multiple levels of recall through the menu:
 ---------------------------------------------------------------
-    Configuration / Follow-Up Levels
+    Configuration / Follow-up / Follow-up Levels
     
 Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
 ------------------------------------------------------------------------------------------------------
@@ -55,6 +55,7 @@ Note that if you want to check the follow-up level for a given partner/account e
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
+        'res_config_view.xml'
     ],
     'demo': ['account_followup_demo.xml'],
     'test': [
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index e233feb489e..55e8d099cce 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -130,8 +130,10 @@
              parent="menu_finance_followup"
              sequence="0"
              id="menu_manual_reconcile_followup"/>
+       
+       <menuitem id="account_followup_main_menu" parent="account.menu_finance_configuration" name="Follow-up"/>
 
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>
+        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
diff --git a/addons/account_followup/res_config_view.xml b/addons/account_followup/res_config_view.xml
new file mode 100644
index 00000000000..89a848562e5
--- /dev/null
+++ b/addons/account_followup/res_config_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_config_settings_inherit" model="ir.ui.view">
+            <field name="name">account settings</field>
+            <field name="model">account.config.settings</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="arch" type="xml">
+               <xpath expr="//label[@for='module_account_followup']" position="after">
+                    <button type="action"
+                                    name="%(action_account_followup_definition_form)d"
+                                    string="Configure your follow-up levels" class="oe_link"/>
+                </xpath>         
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From f7c0288478ee4655752479d68418a4d88d734a8d Mon Sep 17 00:00:00 2001
From: "Chirag Dodiya (OpenERP)" <cod@tinyerp.com>
Date: Thu, 13 Mar 2014 16:56:25 +0530
Subject: [PATCH 06/72] [IMP]Improved view of followup level and set method on
 link to open form view of followup level

bzr revid: cod@tinyerp.com-20140313112625-jaqka8ezgcn0exs6
---
 addons/account_followup/account_followup.py     | 17 +++++++++++++++--
 .../account_followup/account_followup_view.xml  |  5 ++++-
 addons/account_followup/res_config_view.xml     |  5 +----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 9237282ad80..db4cc74be72 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -31,7 +31,7 @@ class followup(osv.osv):
     _columns = {
         'followup_line': fields.one2many('account_followup.followup.line', 'followup_id', 'Follow-up'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'name': fields.related('company_id', 'name', string = "Name"),
+        'name': fields.related('company_id', 'name', string = "Name", readonly=True, type="char"),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account_followup.followup', context=c),
@@ -480,5 +480,18 @@ class res_partner(osv.osv):
                                                     multi="followup",
                                                     fnct_search=_payment_earliest_date_search),
         }
-
+class account_config_settings(osv.osv_memory):
+    _name = 'account.config.settings'
+    _inherit = 'account.config.settings'
+    
+    def open_followup_level_form(self, cr, uid, ids, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        res_ids = self.pool.get('account_followup.followup').search(cr, uid, [('company_id','=', user.company_id.id)])
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Payment Follow-ups',
+            'res_model': 'account_followup.followup',
+            'res_id': res_ids and res_ids[0] or False,
+            'view_mode': 'form,tree',
+        }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 55e8d099cce..7ca30837ebb 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -71,7 +71,9 @@
             <field name="model">account_followup.followup</field>
             <field name="arch" type="xml">
                 <form string="Follow-up" version="7.0">
-                    <h1><field name="company_id" widget="selection" class="oe_inline"/></h1>
+                    <h1><field name="name"/></h1>
+                    <label for="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" widget="selection" class="oe_inline" groups="base.group_multi_company"/>
                     <p class="oe_grey">
                         To remind customers of paying their invoices, you can
                         define different actions depending on how severely
@@ -113,6 +115,7 @@
             <field name="res_model">account_followup.followup</field>
             <field name="search_view_id" ref="view_account_followup_filter"/>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to define follow-up levels and their related actions.
diff --git a/addons/account_followup/res_config_view.xml b/addons/account_followup/res_config_view.xml
index 89a848562e5..25e15aca562 100644
--- a/addons/account_followup/res_config_view.xml
+++ b/addons/account_followup/res_config_view.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
@@ -8,9 +7,7 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="arch" type="xml">
                <xpath expr="//label[@for='module_account_followup']" position="after">
-                    <button type="action"
-                                    name="%(action_account_followup_definition_form)d"
-                                    string="Configure your follow-up levels" class="oe_link"/>
+                    <button type="object" name="open_followup_level_form" string="Configure your follow-up levels" class="oe_link"/>
                 </xpath>         
             </field>
         </record>

From a06919ccc7e22cc950c921763b95d01b4012e837 Mon Sep 17 00:00:00 2001
From: "Chirag Dodiya (OpenERP)" <cod@tinyerp.com>
Date: Thu, 13 Mar 2014 18:16:45 +0530
Subject: [PATCH 07/72] [IMP]Improved code to open form view of followup level

bzr revid: cod@tinyerp.com-20140313124645-tdbawyh2tbfsw5ho
---
 addons/account_followup/account_followup.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index db4cc74be72..ce0efea6a08 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -485,13 +485,14 @@ class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     
     def open_followup_level_form(self, cr, uid, ids, context=None):
+        ir_model_obj = self.pool.get('ir.model.data')
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         res_ids = self.pool.get('account_followup.followup').search(cr, uid, [('company_id','=', user.company_id.id)])
-        return {
-            'type': 'ir.actions.act_window',
-            'name': 'Payment Follow-ups',
-            'res_model': 'account_followup.followup',
-            'res_id': res_ids and res_ids[0] or False,
-            'view_mode': 'form,tree',
-        }
+        
+        model, action_id = ir_model_obj.get_object_reference(cr, uid, 'account_followup', 'action_account_followup_definition_form')
+        action = self.pool.get(model).read(cr, uid, action_id, context=context)
+        if res_ids:
+            action['res_id'] = res_ids[0]
+            action['views'] = [(False, u'form'), (False, u'tree')]
+        return action
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 26f807fa025ca99a9d0cf4e0212d395bb726d570 Mon Sep 17 00:00:00 2001
From: Amit Dodiya <ado@tinyerp.com>
Date: Tue, 25 Mar 2014 11:17:43 +0530
Subject: [PATCH 08/72] [FIX] account_voucher: forward port of 6.0 revision:
 5094, for issue cancel_voucher method is unlinking the whole
 account_move_reconciliation record

bzr revid: ado@tinyerp.com-20140325054743-opywyna9w1toyjp8
---
 addons/account_voucher/account_voucher.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f58c640b11c..86755ce17b6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -947,19 +947,15 @@ class account_voucher(osv.osv):
     def cancel_voucher(self, cr, uid, ids, context=None):
         reconcile_pool = self.pool.get('account.move.reconcile')
         move_pool = self.pool.get('account.move')
-
+        move_line_pool = self.pool.get('account.move.line')
         for voucher in self.browse(cr, uid, ids, context=context):
-            # refresh to make sure you don't unlink an already removed move
-            voucher.refresh()
-            recs = []
             for line in voucher.move_ids:
                 if line.reconcile_id:
-                    recs += [line.reconcile_id.id]
-                if line.reconcile_partial_id:
-                    recs += [line.reconcile_partial_id.id]
-
-            reconcile_pool.unlink(cr, uid, recs)
-
+                    move_lines = [move_line.id for move_line in line.reconcile_id.line_id]
+                    move_lines.remove(line.id)
+                    reconcile_pool.unlink(cr, uid, [line.reconcile_id.id])
+                    if len(move_lines) >= 2:
+                        move_line_pool.reconcile_partial(cr, uid, move_lines, 'auto',context=context)
             if voucher.move_id:
                 move_pool.button_cancel(cr, uid, [voucher.move_id.id])
                 move_pool.unlink(cr, uid, [voucher.move_id.id])

From c3869dc5fb4d5974240d6c7fc4fb5015acf0d5af Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP)" <mka@tinyerp.com>
Date: Thu, 10 Apr 2014 12:36:17 +0530
Subject: [PATCH 09/72] [FIX] Fixed issues got when merged with main

bzr revid: mka@tinyerp.com-20140410070617-rwxia7tf4hkgm398
---
 addons/account_followup/__openerp__.py            | 3 ---
 addons/account_followup/account_followup_view.xml | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index afea4e75d42..3ff409d5034 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -55,12 +55,9 @@ Note that if you want to check the follow-up level for a given partner/account e
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
-<<<<<<< TREE
         'res_config_view.xml'
-=======
         'views/report_followup.xml',
         'account_followup_reports.xml'
->>>>>>> MERGE-SOURCE
     ],
     'demo': ['account_followup_demo.xml'],
     'test': [
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 87b79baa445..675edd1d52c 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -136,12 +136,10 @@
        
        <menuitem id="account_followup_main_menu" parent="account.menu_finance_configuration" name="Follow-up"/>
 
-<<<<<<< TREE
+
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
-=======
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>
->>>>>>> MERGE-SOURCE
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>

From 43e19980bac858ad8cd417ead68b157c84233e20 Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP)" <mka@tinyerp.com>
Date: Fri, 11 Apr 2014 12:45:43 +0530
Subject: [PATCH 10/72] [Fix] Fixed an issue occured as branch merged with main

bzr revid: mka@tinyerp.com-20140411071543-kxn4go9bgng37wk1
---
 addons/account_followup/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 3ff409d5034..f85ecc4ee90 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -55,7 +55,7 @@ Note that if you want to check the follow-up level for a given partner/account e
         'account_followup_view.xml',
         'account_followup_customers.xml',
         'wizard/account_followup_print_view.xml',
-        'res_config_view.xml'
+        'res_config_view.xml',
         'views/report_followup.xml',
         'account_followup_reports.xml'
     ],

From 3b00ebebf4d061c8b1455fb85e87b5e2245d98db Mon Sep 17 00:00:00 2001
From: "Rakesh Sindhav (OpenERP)" <rsi@tinyerp.com>
Date: Fri, 11 Apr 2014 18:45:01 +0530
Subject: [PATCH 11/72] [IMP]base: Need view improvements in some modules

bzr revid: rsi@tinyerp.com-20140411131501-rvdrg4v2if1akhsg
---
 openerp/addons/base/res/res_bank_view.xml    | 1 +
 openerp/addons/base/res/res_country_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/openerp/addons/base/res/res_bank_view.xml b/openerp/addons/base/res/res_bank_view.xml
index 09197e37dc5..be9918be27c 100644
--- a/openerp/addons/base/res/res_bank_view.xml
+++ b/openerp/addons/base/res/res_bank_view.xml
@@ -74,6 +74,7 @@
                         <field name="code"/>
                     </group>
                     <field name="field_ids"/>
+                    <label for="format_layout"/>
                     <field name="format_layout"/>
                 </form>
             </field>
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index e4784c3d9ca..35eb0a592ed 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -32,6 +32,7 @@
                             <field name="code"/>
                         </group>
                     </group>
+                    <label for="address_format"/>
                     <field name="address_format" groups="base.group_no_one" placeholder="Address format..."/>
                 </form>
             </field>

From f081a5e441a0df6b1586f3e2560d47cfa52708f5 Mon Sep 17 00:00:00 2001
From: "Rakesh Sindhav (OpenERP)" <rsi@tinyerp.com>
Date: Fri, 11 Apr 2014 18:48:42 +0530
Subject: [PATCH 12/72] [IMP]account,purchse,warehouse,sale: view improvement
 in addons  modules

bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
---
 addons/account/account_view.xml               |  3 ++-
 addons/delivery/delivery_view.xml             |  5 ++--
 addons/hr_expense/hr_expense_view.xml         |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         | 14 +++++++----
 addons/l10n_fr_rib/bank_view.xml              |  8 +++----
 addons/lunch/lunch_view.xml                   | 16 ++++++++-----
 addons/product/pricelist_view.xml             | 24 ++++++++++++-------
 addons/product/product_view.xml               |  2 +-
 .../purchase_requisition_view.xml             | 18 ++++++++------
 addons/resource/resource_view.xml             |  2 +-
 addons/stock/stock_view.xml                   |  4 ++--
 11 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 48d6320fbc3..dc15e645086 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1628,6 +1628,7 @@
                         <field name="name"/>
                         <field name="active"/>
                     </group>
+                    <label for="note"/>
                     <field name="note" placeholder="Payment term explanation for the customer..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
@@ -2444,7 +2445,7 @@
                         <field name="style_overwrite"/>
                     </group>
                     <notebook>
-                        <page string="Report">
+                        <page string="Report" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
                             <group>
                                 <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
                                 <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 1ad729d9c09..743391d1522 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -43,9 +43,8 @@
                                 <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                                 <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                             </div>
+                            <field name="use_detailed_pricelist"/>
                         </group>
-                        <newline/>
-                        <field name="use_detailed_pricelist"/>
                     </group>
                     <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
                         <tree string="Delivery grids">
@@ -142,7 +141,7 @@
                         </page>
                         <page string="Destination">
                             <group string="Countries">
-                                <field name="country_ids"/>
+                                <field name="country_ids" nolabel="1"/>
                             </group>
                             <group string="States">
                                 <field colspan="2" name="state_ids" nolabel="1"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 33f737aa66e..457d8f33a07 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -203,7 +203,7 @@
         </record>
 
         <record id="hr_expense_product" model="ir.actions.act_window">
-            <field name="name">Products</field>
+            <field name="name">Expense Categories</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4410784c63c..564edf57c02 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -500,11 +500,15 @@
             <field name="name">hr.contribution.register.form</field>
             <field name="model">hr.contribution.register</field>
             <field name="arch" type="xml">
-                <form string="Contribution">
-                    <field name="name"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    <separator string="Description"/>
-                    <field name="note" nolabel="1"/>
+                <form string="Contribution" version="7.0">
+                    <group>
+                        <field name="name"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" class="oe_inline"/>
+                    </group>
+                    <newline/>
+                    <group>
+                    <separator string="Description"/><newline/>
+                    <field name="note" nolabel="1"/></group>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 414ad51954a..9a2b92c176a 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -22,11 +22,11 @@
             <field name="inherit_id" ref="base.view_partner_bank_form" />
             <field name="arch" type="xml">
                 <field name="acc_number" position="before">
-                    <field name="bank_code" />
-                    <field name="office" />
+                    <field name="bank_code" attrs="{'invisible':[('state','!=','rib')]}"/>
+                    <field name="office" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
-                    <field name="rib_acc_number" />
-                    <field name="key" />
+                    <field name="rib_acc_number" attrs="{'invisible':[('state','!=','rib')]}"/>
+                    <field name="key" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
                 </field>
             </field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index c5fa52afe29..dc2cd126fe0 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -427,12 +427,16 @@
                     </header>
                     <sheet>
                         <group>
-                            <field name='name'/>
-                            <field name='category_id'/>
-                            <field name='supplier'/>
-                            <field name='price'/>
+                            <group>
+                                <field name='name'/>
+                                <field name='category_id'/>
+                            </group>
+                            <group>
+                                <field name='supplier'/>
+                                <field name='price'/>
+                            </group>
                         </group>
-                        <label for='description'/>
+                        <separator String='Description'/>
                         <field name='description'/>
                     </sheet>
                 </form>
@@ -461,7 +465,7 @@
                     <sheet>
                         <group string="Schedule Date">
                             <group>
-                                <field name="alter_type"/>
+                                <field name="alter_type" class="oe_inline"/>
                                 <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
                             </group>
                         </group>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 784a14228d5..8d725b3beee 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -12,15 +12,23 @@
             <field name="model">product.pricelist.version</field>
             <field name="arch" type="xml">
                 <form string="Pricelist Version" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="active"/>
-                        <field colspan="4" name="pricelist_id"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="pricelist_id"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
+                        <group>
+                            <field name="date_start"/>
+                            <field name="date_end"/>
+                            <field name="active"/>
+                        </group>
                     </group>
-                    <field name="items_id"/>
+                    <notebook>
+                    <page string="Item List">
+                        <field name="items_id"/>
+                    </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4946a71f80b..0746f261339 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -583,7 +583,7 @@
             <field name="name">product.ul.form.view</field>
             <field name="model">product.ul</field>
             <field name="arch" type="xml">
-                <form string="Packaging" version="7.0">
+                <form string="Packaging" version="7.0" class="col-md-6">
                     <group>
                         <field name="name"/>
                         <field name="type"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index da3a6d132ee..edb39de7637 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -37,15 +37,19 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <div class="oe_edit_only">
+                <div class="oe_edit_only pull-left">
                     <label for="name" class="oe_inline"/>
-                    <label for="origin" class="oe_inline"/>
+                    <h1>
+                        <field name="name" class="oe_inline"/>
+                    </h1>
+                </div>
+                <div class="oe_edit_only pull-left">
+                    <label for="origin" class="oe_inline"/>
+                    <h1>
+                        <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
+                        <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
+                    </h1>
                 </div>
-                <h1>
-                    <field name="name" class="oe_inline"/>
-                    <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
-                    <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
-                </h1>
                 <group>
                     <group>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}"/>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 74f71ecfeea..752026005a3 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -216,7 +216,7 @@
                         </group>
                         <group>
                             <field name="calendar_id"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company" attrs="{'invisible':[('calendar_id','=',False)]}"/>
                         </group>
                     </group>
                     <group>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e96652c11aa..f6c611e7a41 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1557,7 +1557,7 @@
             <field name="name">stock.incoterms.form</field>
             <field name="model">stock.incoterms</field>
             <field name="arch" type="xml">
-                <form string="Incoterms" version="7.0">
+                <form string="Incoterms" version="7.0" class="col-md-6">
                     <group>
                         <field name="name"/>
                         <field name="code"/>
@@ -1690,7 +1690,7 @@
             <field name="name">Stock Journals</field>
             <field name="model">stock.journal</field>
             <field name="arch" type="xml">
-                <form string="Stock Journal" version="7.0">
+                <form string="Stock Journal" version="7.0" class="col-md-6">
                     <group>
                         <field name="name"/>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'stock.group_stock_manager']}"/>

From 7a61539141bc988b6bfce6beb6ceabde9198c176 Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP)" <mka@tinyerp.com>
Date: Mon, 14 Apr 2014 15:11:29 +0530
Subject: [PATCH 13/72] [REM] Removed Duplicated Menu

bzr revid: mka@tinyerp.com-20140414094129-dyeeu4zk6pgnz951
---
 addons/account_followup/account_followup_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 675edd1d52c..24fff3a8833 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -139,7 +139,6 @@
 
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
         <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
-        <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" name="Follow-up Levels"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>

From 4a8168a7dc7d0ae27bbf234a42a46b4bebcd05ad Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Tue, 15 Apr 2014 14:44:28 +0530
Subject: [PATCH 14/72] [FIX] account_anglo_saxon: Enabled the multi-currency
 support for price diff calculation. (Maintenance Case: 606408)

bzr revid: rgo@tinyerp.com-20140415091428-az1rx5ngz79j4fh6
---
 addons/account_anglo_saxon/invoice.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index f27d9b3ae72..a08346a29ed 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -117,9 +117,14 @@ class account_invoice_line(osv.osv):
                         for line in res:
                             if a == line['account_id'] and i_line.product_id.id == line['product_id']:
                                 uom = i_line.product_id.uos_id or i_line.product_id.uom_id
-                                standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
-                                if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
-                                    price_diff = i_line.price_unit - standard_price
+                                converted_standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
+                                if inv.currency_id.id != company_currency:
+                                    standard_price = self.pool.get('res.currency').compute(cr, uid, company_currency, inv.currency_id.id, converted_standard_price, context={'date': inv.date_invoice})
+                                else:
+                                    standard_price = converted_standard_price
+                                price_unit = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.price_unit, i_line.uos_id.id)
+                                if standard_price != price_unit and line['price_unit'] == i_line.price_unit and acc:
+                                    price_diff = price_unit - standard_price
                                     line.update({'price':standard_price * line['quantity']})
                                     diff_res.append({
                                         'type':'src',

From f658a55e4e66afeba98fdff37d30506ec38a2420 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 15 Apr 2014 18:03:31 +0200
Subject: [PATCH 15/72] [FIX] stock: before creating chained pickings, regroup
 moves by chained auto packing

Before, all moves issued from a same purchase order were put in the same chained picking, and, therefore, the moves were all treated with the same behavior (manually, automaticaly, ...)

bzr revid: dle@openerp.com-20140415160331-kzgib87qabvpc86p
---
 addons/stock/stock.py | 75 +++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index eaacbcb06a1..715578541eb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2082,41 +2082,46 @@ class stock_move(osv.osv):
         if context is None:
             context = {}
         seq_obj = self.pool.get('ir.sequence')
-        for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
-            ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
-            if picking:
-                # name of new picking according to its type
-                if ptype == 'internal':
-                    new_pick_name = seq_obj.get(cr, uid,'stock.picking')
-                else :
-                    new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
-                pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
-                # Need to check name of old picking because it always considers picking as "OUT" when created from Sales Order
-                old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
-                if old_ptype != picking.type:
-                    old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
-                    self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name, 'type': old_ptype}, context=context)
-            else:
-                pickid = False
-            for move, (loc, dummy, delay, dummy, company_id, ptype, invoice_state) in todo:
-                new_id = move_obj.copy(cr, uid, move.id, {
-                    'location_id': move.location_dest_id.id,
-                    'location_dest_id': loc.id,
-                    'date': time.strftime('%Y-%m-%d'),
-                    'picking_id': pickid,
-                    'state': 'waiting',
-                    'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
-                    'move_history_ids': [],
-                    'date_expected': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
-                    'move_history_ids2': []}
-                )
-                move_obj.write(cr, uid, [move.id], {
-                    'move_dest_id': new_id,
-                    'move_history_ids': [(4, new_id)]
-                })
-                new_moves.append(self.browse(cr, uid, [new_id])[0])
-            if pickid:
-                wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
+        for picking, chained_moves in self._chain_compute(cr, uid, moves, context=context).items():
+            # We group the moves by automatic move type, so it creates different pickings for different types
+            moves_by_type = {}
+            for move in chained_moves:
+                moves_by_type.setdefault(move[1][1], []).append(move)
+            for todo in moves_by_type.values():
+                ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
+                if picking:
+                    # name of new picking according to its type
+                    if ptype == 'internal':
+                        new_pick_name = seq_obj.get(cr, uid,'stock.picking')
+                    else :
+                        new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
+                    pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
+                    # Need to check name of old picking because it always considers picking as "OUT" when created from Sales Order
+                    old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
+                    if old_ptype != picking.type:
+                        old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
+                        self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name, 'type': old_ptype}, context=context)
+                else:
+                    pickid = False
+                for move, (loc, dummy, delay, dummy, company_id, ptype, invoice_state) in todo:
+                    new_id = move_obj.copy(cr, uid, move.id, {
+                        'location_id': move.location_dest_id.id,
+                        'location_dest_id': loc.id,
+                        'date': time.strftime('%Y-%m-%d'),
+                        'picking_id': pickid,
+                        'state': 'waiting',
+                        'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
+                        'move_history_ids': [],
+                        'date_expected': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
+                        'move_history_ids2': []}
+                    )
+                    move_obj.write(cr, uid, [move.id], {
+                        'move_dest_id': new_id,
+                        'move_history_ids': [(4, new_id)]
+                    })
+                    new_moves.append(self.browse(cr, uid, [new_id])[0])
+                if pickid:
+                    wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
         if new_moves:
             new_moves += self.create_chained_picking(cr, uid, new_moves, context)
         return new_moves

From 1ab962d33829fd07d0cef84e3dbe4d913333aadb Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 15 Apr 2014 18:14:41 +0200
Subject: [PATCH 16/72] [FIX] mail: convert attachments to binary as it is the
 expected format of message_post opw 604205

The double convertion (render_message and send_mail) is done to keep the API but should be changed in next version.

bzr revid: mat@openerp.com-20140415161441-q6pfueetvv0namgw
---
 addons/email_template/email_template.py    | 3 ++-
 addons/mail/wizard/mail_compose_message.py | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 8890226f28b..30417acb70a 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -305,7 +305,7 @@ class email_template(osv.osv):
                           is taken from template definition)
            :returns: a dict containing all relevant fields for creating a new
                      mail.mail entry, with one extra key ``attachments``, in the
-                     format expected by :py:meth:`mail_thread.message_post`.
+                     format [(report_name, data)] where data is base64 encoded.
         """
         if context is None:
             context = {}
@@ -340,6 +340,7 @@ class email_template(osv.osv):
                 ctx['lang'] = self.render_template(cr, uid, template.lang, template.model, res_id, context)
             service = netsvc.LocalService(report_service)
             (result, format) = service.create(cr, uid, [res_id], {'model': template.model}, ctx)
+            # TODO in trunk, change return format to binary to match message_post expected format
             result = base64.b64encode(result)
             if not report_name:
                 report_name = report_service
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 301dff515b3..7e269ab7379 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import base64
 import re
 from openerp import tools
 from openerp import SUPERUSER_ID
@@ -237,12 +238,15 @@ class mail_compose_message(osv.TransientModel):
                     'parent_id': wizard.parent_id and wizard.parent_id.id,
                     'partner_ids': [partner.id for partner in wizard.partner_ids],
                     'attachment_ids': [attach.id for attach in wizard.attachment_ids],
+                    'attachments': [],
                 }
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:
                     email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
                     post_values['partner_ids'] += email_dict.pop('partner_ids', [])
-                    post_values['attachments'] = email_dict.pop('attachments', [])
+                    for filename, attachment_data in email_dict.pop('attachments', []):
+                        # decode as render message return in base64 while message_post expect binary
+                        post_values['attachments'].append((filename, base64.b64decode(attachment_data)))
                     attachment_ids = []
                     for attach_id in post_values.pop('attachment_ids'):
                         new_attach_id = ir_attachment_obj.copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)

From 31a8dfaf4354b68ad750f5f1051ace73812027ef Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 16 Apr 2014 07:06:27 +0000
Subject: [PATCH 17/72] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140416070627-eneildfcgmfpyjxy
---
 addons/auth_signup/i18n/zh_CN.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 31b1cff4192..a4d8533c0c1 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.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-02-17 02:37+0000\n"
-"Last-Translator: jackjc <jackjc27@hotmail.com>\n"
+"PO-Revision-Date: 2014-04-16 05:21+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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-02-18 05:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-16 07:06+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -32,14 +32,14 @@ msgstr "注册令牌（Token）类型"
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr "允许外部用户登录"
+msgstr "允许外部用户注册"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
 #, python-format
 msgid "Confirm Password"
-msgstr "口令确认"
+msgstr "确认密码"
 
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0

From 40d3ae1e0f6efd644f05f151635a428a28c44caf Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 16 Apr 2014 10:29:24 +0200
Subject: [PATCH 18/72] [FIX] Record id are not always an integer. It could be
 a virtual id (str) as in calendar.

bzr revid: jke@openerp.com-20140416082924-t52pvja4617zpkce
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3015bb9c2e5..5030a977f18 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1216,7 +1216,7 @@ class DataSet(http.Controller):
                 records = getattr(request.session.model(model), method)(*args, **kwargs)
                 for record in records:
                     record['display_name'] = \
-                        names.get(record['id']) or "%s#%d" % (model, (record['id']))
+                        names.get(record['id']) or "{0}#{1}".format(model, (record['id']))
                 return records
 
         if method.startswith('_'):

From c4164204b5496d0ed77f7049b09dc4596d84d5b8 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 16 Apr 2014 10:34:11 +0200
Subject: [PATCH 19/72] [FIX] Website - fix path of script watch.js

bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
---
 addons/website/views/website_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index e7f76e7e4aa..1640c9f51e2 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -43,7 +43,7 @@
           t-att-data-view-xmlid="xmlid if editable else None"
           t-att-data-main-object="repr(main_object) if editable else None">
         <head>
-            <script type="text/javascript" src="/web/static/js/watch.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/watch.js"></script>
             <t t-if="main_object and 'website_meta_title' in main_object">
                 <t t-set="title" t-value="main_object.website_meta_title"/>
             </t>

From 91930b470d000b863511b841b40d42c9ce1b0c98 Mon Sep 17 00:00:00 2001
From: Mohammed Shekha <msh@tinyerp.com>
Date: Wed, 16 Apr 2014 14:08:57 +0530
Subject: [PATCH 20/72] [FIX]Fixed the issue of reference field throws
 traceback that view is undefined, the reason is that reference field passing
 DefaultFieldManager while creating instance of many2one widget and
 DefaultFieldManager is eventually extending instance.web.widget not
 instance.web.form.FormWidget and hence DefaultFieldmanager will nto having
 view attribute, instead of calling self.view.do_onchange, trigger
 changed_value which is going to do the same job.

bzr revid: msh@tinyerp.com-20140416083857-sug0k4a28nkvgg27
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index edb44e7ea06..11e2c4e6b7c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3148,7 +3148,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.display_value = {};
                 self.render_value();
                 self.focus();
-                self.view.do_onchange(self);
+                self.trigger('changed_value');
             });
         });
 

From 3298051016f3e43799d27b7c4eb874a50c58fe66 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 16 Apr 2014 13:22:39 +0200
Subject: [PATCH 21/72] [FIX] base: search groups by full name not working with
 operators 'in' nor with operand boolean

bzr revid: dle@openerp.com-20140416112239-vl20z3xzgp61vygu
---
 openerp/addons/base/res/res_users.py   | 36 ++++++++++++++++++++------
 openerp/addons/base/test/base_test.yml | 14 ++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 995d6a59cf9..69aa273c07e 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -28,7 +28,7 @@ import openerp
 from openerp import SUPERUSER_ID
 from openerp import pooler, tools
 import openerp.exceptions
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, expression
 from openerp.osv.orm import browse_record
 from openerp.tools.translate import _
 
@@ -51,13 +51,33 @@ class groups(osv.osv):
     def _search_group(self, cr, uid, obj, name, args, context=None):
         operand = args[0][2]
         operator = args[0][1]
-        values = operand.split('/')
-        group_name = values[0]
-        where = [('name', operator, group_name)]
-        if len(values) > 1:
-            application_name = values[0]
-            group_name = values[1]
-            where = ['|',('category_id.name', operator, application_name)] + where
+        lst = True
+        if isinstance(operand, bool):
+            domains = [[('name', operator, operand)], [('category_id.name', operator, operand)]]
+            if operator in expression.NEGATIVE_TERM_OPERATORS == (not operand):
+                return expression.AND(domains)
+            else:
+                return expression.OR(domains)
+        if isinstance(operand, basestring):
+            lst = False
+            operand = [operand]
+        where = []
+        for group in operand:
+            values = filter(bool, group.split('/'))
+            group_name = values.pop().strip()
+            category_name = values and '/'.join(values).strip() or group_name
+            group_domain = [('name', operator, lst and [group_name] or group_name)]
+            category_domain = [('category_id.name', operator, lst and [category_name] or category_name)]
+            if operator in expression.NEGATIVE_TERM_OPERATORS and not values:
+                category_domain = expression.OR([category_domain, [('category_id', '=', False)]])
+            if (operator in expression.NEGATIVE_TERM_OPERATORS) == (not values):
+                sub_where = expression.AND([group_domain, category_domain])
+            else:
+                sub_where = expression.OR([group_domain, category_domain])
+            if operator in expression.NEGATIVE_TERM_OPERATORS:
+                where = expression.AND([where, sub_where])
+            else:
+                where = expression.OR([where, sub_where])
         return where
 
     _columns = {
diff --git a/openerp/addons/base/test/base_test.yml b/openerp/addons/base/test/base_test.yml
index 1aea2363f84..11f243592fa 100644
--- a/openerp/addons/base/test/base_test.yml
+++ b/openerp/addons/base/test/base_test.yml
@@ -302,3 +302,17 @@
             float_round(0.01, precision_digits=3, precision_rounding=0.01)
         except AssertionError:
             pass
+-
+   Test res.groups name search
+-
+     !python {model: res.groups}: |
+         all_groups = self.search(cr, uid, [])
+         full_names = [(group.id, group.full_name) for group in self.browse(cr, uid, all_groups)]
+         group_ids = self.search(cr, uid, [('full_name', 'like', '%Sale%')])
+         assert set(group_ids) == set([id for (id, full_name) in full_names if 'Sale' in full_name]), "did not match search for 'Sale'"
+         group_ids = self.search(cr, uid, [('full_name', 'like', '%Technical%')])
+         assert set(group_ids) == set([id for (id, full_name) in full_names if 'Technical' in full_name]), "did not match search for 'Technical'"
+         group_ids = self.search(cr, uid, [('full_name', 'like', '%Sales /%')])
+         assert set(group_ids) == set([id for (id, full_name) in full_names if 'Sales /' in full_name]), "did not match search for 'Sales /'"
+         group_ids = self.search(cr, uid, [('full_name', 'in', ['Administration / Access Rights','Contact Creation'])])
+         assert group_ids, "did not match search for 'Administration / Access Rights' and 'Contact Creation'"

From fdb5200d807fda730e2758d64a4a8d1174ea51ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 16 Apr 2014 15:03:56 +0200
Subject: [PATCH 22/72] [FIX] crm_todo: usability fix: the lead was not present
 in the task form view, but in the tree view, it is now present in both view
 when coming from 'my tasks' in crm menu.

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

bzr revid: tde@openerp.com-20140416130356-i3a5pqcib8smdx47
---
 addons/crm_todo/crm_todo_view.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 0b3de338808..0d1fd30fc5f 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -42,6 +42,17 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="project_task_crm_form">
+        <field name="name">project.task.form.crm</field>
+        <field name="model">project.task</field>
+        <field name="priority">20</field>
+        <field name="inherit_id" ref="project.view_task_form2" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="lead_id" invisible="not context.get('lead_id', False)"/>
+            </field>
+        </field>
+    </record>
 
     <record model="ir.actions.act_window" id="crm_todo_action">
         <field name="name">My Tasks</field>

From d344f53a684dcd1702ee4ff85d201c4c953df395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 16 Apr 2014 15:08:04 +0200
Subject: [PATCH 23/72] [FIX] crm_helpdesk: when creating a new helpdesk
 category it was not possible to re-use the category due to a missing
 object_id.

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

bzr revid: tde@openerp.com-20140416130804-xfgi8dr5703mr49o
---
 addons/crm_helpdesk/crm_helpdesk_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index d833e7bbcf6..404e84f4629 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -64,7 +64,7 @@
                                 </group>
                                 <group string="Categorization">
                                     <field name="priority"/>
-                                    <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]"/>
+                                    <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]" context="{'object_name': 'crm.helpdesk'}"/>
                                     <field name="channel_id"/>
                                 </group>
                             </group>

From f6a75093b9b072f362967874fb6fb3001f4bc653 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 16 Apr 2014 15:09:24 +0200
Subject: [PATCH 24/72] [FIX] gamification: add security rule for multicompany
 (avoid getting error messages on home page when displaying top 3 goals)

bzr revid: mat@openerp.com-20140416130924-8pyuejefcu7hnzmf
---
 addons/gamification/security/gamification_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml
index 904ba50721e..5339b400061 100644
--- a/addons/gamification/security/gamification_security.xml
+++ b/addons/gamification/security/gamification_security.xml
@@ -39,5 +39,12 @@
             <field name="domain_force">[(1, '=', 1)]</field>
         </record>
 
+        <record id="goal_global_multicompany" model="ir.rule">
+            <field name="name">User can only see his/her goals or goal from the same challenge in board visibility</field>
+            <field name="model_id" ref="model_gamification_goal"/>
+            <field name="domain_force">[('user_id.company_id', 'child_of', [user.company_id.id])]</field>
+            <field name="global" eval="True"/>
+        </record>
+
     </data>
 </openerp>

From 7b93809fb4c24c3dc358a0eebde2ec6506f01ab9 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 17 Apr 2014 06:53:16 +0000
Subject: [PATCH 25/72] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140417065316-5cle12k1npy96t4m
---
 addons/auth_signup/i18n/zh_CN.po |  4 +--
 addons/hr_payroll/i18n/pl.po     | 52 ++++++++++++++++----------------
 addons/stock/i18n/zh_TW.po       | 31 +++++++++++--------
 3 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index a4d8533c0c1..2a618a249c3 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/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-16 07:06+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-17 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: auth_signup
 #: view:res.users:0
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index d0257e40ecc..1021e15c207 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.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-04-12 14:30+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"PO-Revision-Date: 2014-04-16 13:43+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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-13 06:20+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-17 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -429,7 +429,7 @@ msgstr "Szukaj list płac"
 #: field:hr.payslip.line,amount_percentage_base:0
 #: field:hr.salary.rule,amount_percentage_base:0
 msgid "Percentage based on"
-msgstr ""
+msgstr "Procentowo bazując na"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:90
@@ -450,7 +450,7 @@ msgstr "Wykonano polecenie płatności ? "
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr ""
+msgstr "Pozycje paska wypłaty wg Rejestru Składek"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -488,7 +488,7 @@ msgstr "Refundacja: "
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
 msgid "PaySlip Lines by Contribution Registers"
-msgstr ""
+msgstr "Pozycje paska wypłaty wg Rejestrów Składek"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -539,7 +539,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
 msgid "Details by Salary Rule Category"
-msgstr ""
+msgstr "Szczegóły wg kategorii Reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
@@ -594,7 +594,7 @@ msgstr "Zakres"
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Hierarchia Struktur wynagrodzeń"
 
 #. module: hr_payroll
 #: help:hr.employee,total_wage:0
@@ -616,7 +616,7 @@ msgstr "Korekta"
 #: view:hr.payslip:0
 #: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
 msgid "Payslip Computation Details"
-msgstr ""
+msgstr "Wyliczenia Paska wypłaty szczegółowo"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,appears_on_payslip:0
@@ -627,19 +627,19 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
 msgid "Payslip Input"
-msgstr ""
+msgstr "Wejścia Paska wypłaty"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
 msgid "Salary Rule Categories"
-msgstr ""
+msgstr "Kategorie Reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Cancel Payslip"
-msgstr ""
+msgstr "Anuluj Pasek wypłaty"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,contract_id:0
@@ -683,7 +683,7 @@ msgstr "Kategoria"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Company Contribution"
-msgstr ""
+msgstr "Składki firmowe"
 
 #. module: hr_payroll
 #: help:hr.payslip.run,credit_note:0
@@ -735,7 +735,7 @@ msgstr "Wykonane listy płac"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Payslip Lines by Contribution Register:"
-msgstr ""
+msgstr "Pozycje paska wypłaty wg Rejestrów Składek:"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -779,7 +779,7 @@ msgstr "Reguła"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
 msgid "PaySlip Details"
-msgstr ""
+msgstr "Pasek wypłaty szczegółowo"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -795,7 +795,7 @@ msgstr "Aktywne"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Child Rules"
-msgstr ""
+msgstr "Reguły podrzędne"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_min:0
@@ -861,7 +861,7 @@ msgstr "Warunek Python"
 #. module: hr_payroll
 #: view:hr.contribution.register:0
 msgid "Contribution"
-msgstr "Dotacja"
+msgstr "Składka"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:351
@@ -873,7 +873,7 @@ msgstr ""
 #: field:hr.rule.input,input_id:0
 #: model:ir.model,name:hr_payroll.model_hr_rule_input
 msgid "Salary Rule Input"
-msgstr ""
+msgstr "Wejście Reguły wynagrodzenia"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,quantity:0
@@ -989,13 +989,13 @@ msgstr "Co 2 miesiące"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Pay Slip Details"
-msgstr ""
+msgstr "Pasek wypłaty szczegółowo"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
 #: model:ir.ui.menu,name:hr_payroll.menu_department_tree
 msgid "Employee Payslips"
-msgstr ""
+msgstr "Paski wypłat"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_config_settings
@@ -1008,7 +1008,7 @@ msgstr ""
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr ""
+msgstr "Rejestr składek"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -1035,7 +1035,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
 msgid "Payslips Batches"
-msgstr ""
+msgstr "Generowanie Listy płac"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0
@@ -1063,7 +1063,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr ""
+msgstr "Rejestry składek"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
@@ -1182,7 +1182,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
 msgid "Salary Rule Categories Hierarchy"
-msgstr ""
+msgstr "Hierarchia kategorii Reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:882
@@ -1257,7 +1257,7 @@ msgstr "Księgowość"
 #: field:hr.payslip.line,condition_range:0
 #: field:hr.salary.rule,condition_range:0
 msgid "Range Based on"
-msgstr ""
+msgstr "Zakres bazujący na"
 
 #~ msgid "Cancel"
 #~ msgstr "Anuluj"
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 055503a2c02..15c281d95fd 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.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-04-08 06:46+0000\n"
+"PO-Revision-Date: 2014-04-17 04:26+0000\n"
 "Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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-09 07:06+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-17 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -400,7 +400,7 @@ msgstr "伙伴"
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
 msgid "Allow claim on deliveries"
-msgstr ""
+msgstr "允許在出貨單上有索賠選項"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -920,7 +920,7 @@ msgstr "編號必須在同一公司內唯一！"
 #: code:addons/stock/product.py:448
 #, python-format
 msgid "Future Receptions"
-msgstr ""
+msgstr "日後收貨"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -1209,7 +1209,7 @@ msgstr "檢視"
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "左父項"
 
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
@@ -2404,7 +2404,7 @@ msgstr "總值"
 msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
-msgstr ""
+msgstr "如果連鎖類型並不是Transparent，連動調撥時會寫入庫存日記帳簿。 (如果保持空白，日記簿則不使用)"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -3560,7 +3560,7 @@ msgstr "消耗產品"
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "右父項"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -4575,7 +4575,7 @@ msgstr "未計劃量"
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr ""
+msgstr "連動公司"
 
 #. module: stock
 #: view:stock.picking:0
@@ -4599,7 +4599,7 @@ msgid ""
 "This allows you to manage products by using serial numbers. When you select "
 "a serial number on product moves, you can get the upstream or downstream "
 "traceability of that product."
-msgstr ""
+msgstr "這裡允許您透過使用序號管理存貨。當您在存貨調動選擇一個序號時，您將看到該產品的上下游回溯情形。"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:128
@@ -4658,6 +4658,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                點擊新增此產品的出貨單。\n"
+"              </p><p>\n"
+"                您將在此找到所有此產品相關的送貨記錄，以及所有需出貨給\n"
+"                客戶的產品。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -4726,13 +4733,13 @@ msgstr "目的地點"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Picking Slip"
-msgstr ""
+msgstr "提貨單"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr ""
+msgstr "指定包裝的屬性，例如類型、產品數量等等。"
 
 #. module: stock
 #: view:product.product:0

From f1f3e73604f6ade45cc27bd2a8a37a87667e4de8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Apr 2014 10:34:57 +0200
Subject: [PATCH 26/72] [REL] saas-4

bzr revid: chs@openerp.com-20140417083457-xg5kyml7t92chir7
---
 openerp/release.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/release.py b/openerp/release.py
index 1a9c863660c..99de8e00bde 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -30,7 +30,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
 # properly comparable using normal operarors, for example:
 #  (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
 #  (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
-version_info = (8, 0, 0, ALPHA, 1)
+version_info = (7, 'saas~4', 0, FINAL, 0)
 version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
 series = serie = major_version = '.'.join(map(str, version_info[:2]))
 

From f928ba4f10207c39e02cbecfe8af81350445ad2d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 12:10:00 +0200
Subject: [PATCH 27/72] [FIX] web: double click on save button was trying to
 save the data two times if there is some latency

bzr revid: dle@openerp.com-20140417101000-6gtyxntkm5d7zcoy
---
 addons/web/static/src/js/view_form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c5cc4989d4a..debda6348fa 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -719,8 +719,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             }
         }
     },
-    on_button_save: function() {
+    on_button_save: function(e) {
         var self = this;
+        $(e.delegateTarget).attr("disabled", true);
         return this.save().done(function(result) {
             self.trigger("save", result);
             self.reload().then(function() {
@@ -730,6 +731,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     parent.menu.do_reload_needaction();
                 }
             });
+        }).always(function(){
+            $(e.delegateTarget).attr("disabled", false);
         });
     },
     on_button_cancel: function(event) {

From 7c668d8eac0f5c8ffddc7c6836e45ab821768d26 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 12:12:17 +0200
Subject: [PATCH 28/72] [FIX] web: double click on save button was trying to
 save the data two times if there is some latency, event target should be used
 instead of delegate target

bzr revid: dle@openerp.com-20140417101217-3fwnm76qne6f1vwk
---
 addons/web/static/src/js/view_form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index debda6348fa..d09cfb59ab0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -721,7 +721,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     },
     on_button_save: function(e) {
         var self = this;
-        $(e.delegateTarget).attr("disabled", true);
+        $(e.target).attr("disabled", true);
         return this.save().done(function(result) {
             self.trigger("save", result);
             self.reload().then(function() {
@@ -732,7 +732,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 }
             });
         }).always(function(){
-            $(e.delegateTarget).attr("disabled", false);
+            $(e.target).attr("disabled", false);
         });
     },
     on_button_cancel: function(event) {

From a103ff4ebc5d1da1337c76bf637f39a1c3733d39 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 13:04:35 +0200
Subject: [PATCH 29/72] [FIX] note: folded by default was not considered

bzr revid: dle@openerp.com-20140417110435-u8uwwcf5ji1b54ao
---
 addons/note/note.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 00c67c37191..3e419888c28 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -128,16 +128,15 @@ class note_note(osv.osv):
             current_stage_ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)], context=context)
 
             if current_stage_ids: #if the user have some stages
-
-                #dict of stages: map les ids sur les noms
-                stage_name = dict(self.pool.get('note.stage').name_get(cr, uid, current_stage_ids, context=context))
+                stages = self.pool['note.stage'].browse(cr, uid, current_stage_ids, context=context)
 
                 result = [{ #notes by stage for stages user
                         '__context': {'group_by': groupby[1:]},
-                        '__domain': domain + [('stage_ids.id', '=', current_stage_id)],
-                        'stage_id': (current_stage_id, stage_name[current_stage_id]),
-                        'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', current_stage_id)], context=context, count=True)
-                    } for current_stage_id in current_stage_ids]
+                        '__domain': domain + [('stage_ids.id', '=', stage.id)],
+                        'stage_id': (stage.id, stage.name),
+                        'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', stage.id)], context=context, count=True),
+                        '__fold': stage.fold,
+                    } for stage in stages]
 
                 #note without user's stage
                 nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True)
@@ -153,8 +152,9 @@ class note_note(osv.osv):
                         result = [{
                             '__context': {'group_by': groupby[1:]},
                             '__domain': domain + [dom_not_in],
-                            'stage_id': (current_stage_ids[0], stage_name[current_stage_ids[0]]),
-                            'stage_id_count':nb_notes_ws
+                            'stage_id': (stages[0].id, stages[0].name),
+                            'stage_id_count':nb_notes_ws,
+                            '__fold': stages[0].name,
                         }] + result
 
             else: # if stage_ids is empty

From 7b413e4aff5f4ca97c6507370fc98811164f9d19 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Thu, 17 Apr 2014 13:56:21 +0200
Subject: [PATCH 30/72] [FIX] Mail snippet - Set generic URL

bzr revid: jke@openerp.com-20140417115621-c0j2nj4srlshougy
---
 addons/website_mail/views/snippets.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 0ec93296ddd..110646ce92c 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -390,7 +390,7 @@
                                     <tbody>
                                         <tr>
                                             <td style="border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:4px;padding:15px 5px;border-collapse:collapse;background-color:rgb(101,101,101)" align="center" valign="middle"> 
-                                                <a href="http://r.info.openerp.com/3bbh9o3y3tjskrk.html" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
+                                                <a href="http://www.openerp.com" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
                                                     <span style="color:rgb(255,255,255);font-family:arial;font-size:12px;display:block;width:auto;text-align:center;white-space:nowrap">View Product</span>
                                                 </a>
                                             </td>
@@ -407,7 +407,7 @@
                                     <tbody>
                                         <tr>
                                             <td style="border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:4px;padding:15px 5px;border-collapse:collapse;background-color:rgb(101,101,101)" align="center" valign="middle"> 
-                                                <a href="http://r.info.openerp.com/3bbh9o3y3tjskrk.html" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
+                                                <a href="http://www.openerp.com" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
                                                     <span style="color:rgb(255,255,255);font-family:arial;font-size:12px;display:block;width:auto;text-align:center;white-space:nowrap">View Product</span>
                                                 </a>
                                             </td>
@@ -424,7 +424,7 @@
                                     <tbody>
                                         <tr>
                                             <td style="border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:4px;padding:15px 5px;border-collapse:collapse;background-color:rgb(101,101,101)" align="center" valign="middle"> 
-                                                <a href="http://r.info.openerp.com/3bbh9o3y3tjskrk.html" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
+                                                <a href="http://www.openerp.com" style="text-decoration:none;border:none rgb(221,221,221);font-weight:bold;line-height:100%;text-align:center;color:rgb(0,136,204);word-wrap:break-word!important;background-color:rgb(101,101,101)" target="_blank">
                                                     <span style="color:rgb(255,255,255);font-family:arial;font-size:12px;display:block;width:auto;text-align:center;white-space:nowrap">View Product</span>
                                                 </a>
                                             </td>

From a32ccdbbd158d9c9872d0640aaf789e207eff8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 17 Apr 2014 14:26:33 +0200
Subject: [PATCH 31/72] [FIX] mass_mailing: fixed test mailing wizard, still
 using unsubscribe url that is now delegated on the mail_mail model.

bzr revid: tde@openerp.com-20140417122633-bej72c8yhv2y2y4z
---
 addons/mass_mailing/wizard/test_mailing.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/mass_mailing/wizard/test_mailing.py b/addons/mass_mailing/wizard/test_mailing.py
index 39883d941ae..bd1124a8cdc 100644
--- a/addons/mass_mailing/wizard/test_mailing.py
+++ b/addons/mass_mailing/wizard/test_mailing.py
@@ -25,16 +25,14 @@ class TestMassMailing(osv.TransientModel):
             test_emails = tools.email_split(wizard.email_to)
             mail_ids = []
             for test_mail in test_emails:
-                body = mailing.body_html
-                unsubscribe_url = self.pool['mail.mass_mailing'].get_unsubscribe_url(cr, uid, mailing.id, 0, email=test_mail, context=context)
-                body = tools.append_content_to_html(body, unsubscribe_url, plaintext=False, container_tag='p')
                 mail_values = {
                     'email_from': mailing.email_from,
                     'reply_to': mailing.reply_to,
                     'email_to': test_mail,
                     'subject': mailing.name,
-                    'body_html': body,
+                    'body_html': mailing.body_html,
                     'auto_delete': True,
+                    'mailing_id': wizard.mass_mailing_id.id,
                 }
                 mail_ids.append(Mail.create(cr, uid, mail_values, context=context))
             Mail.send(cr, uid, mail_ids, context=context)

From 5e7b8518d50330927257a4794ed31db4c18e699d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 17 Apr 2014 14:54:12 +0200
Subject: [PATCH 32/72] [FIX] gamification: this noupdate block should be in
 noupdate (no kidding)

bzr revid: mat@openerp.com-20140417125412-4w5wp0ubsendx7nr
---
 addons/gamification/data/goal_base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 66dd7be7431..c8c18564772 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -2,7 +2,7 @@
 <openerp>
     <!-- Mail template is done in a NOUPDATE block
          so users can freely customize/delete them -->
-    <data noupdate="0">
+    <data noupdate="1">
         <!--Email template -->
         
         <record id="email_template_goal_reminder" model="email.template">

From 64ce8f977dafa124f71fdc928046b4ca1e173991 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 15:26:16 +0200
Subject: [PATCH 33/72] [FIX] account_analytics_plan: for bank statement move,
 the analytic distribution must not be written on the counterpart move line

bzr revid: dle@openerp.com-20140417132616-w71ctwn0w653yn0v
---
 .../account_analytic_plans.py                       | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 40484298f1b..2948ac1c19c 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -466,15 +466,10 @@ class account_bank_statement(osv.osv):
     _inherit = "account.bank.statement"
     _name = "account.bank.statement"
 
-    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
-        account_move_line_pool = self.pool.get('account.move.line')
-        account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
-        st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context=context)
-        result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
-        move = st_line.move_ids and st_line.move_ids[0] or False
-        if move:
-            for line in move.line_id:
-                account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context)
+    def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, context=None):
+        result = super(account_bank_statement,self)._prepare_bank_move_line(cr, uid, st_line, 
+            move_id, amount, company_currency_id, context=context)
+        result['analytics_id'] = st_line.analytics_id.id
         return result
 
     def button_confirm_bank(self, cr, uid, ids, context=None):

From 146ee44c663ff8c4ceaed2f7a1a921425111ef36 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Apr 2014 17:39:48 +0200
Subject: [PATCH 34/72] [FIX] website_blog: set oldname for background_image
 field

bzr revid: chs@openerp.com-20140417153948-loqwswgkq1zri462
---
 addons/website_blog/models/website_blog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py
index 031856fff10..ab96cc5b7f8 100644
--- a/addons/website_blog/models/website_blog.py
+++ b/addons/website_blog/models/website_blog.py
@@ -52,7 +52,7 @@ class BlogPost(osv.Model):
         'name': fields.char('Title', required=True, translate=True),
         'subtitle': fields.char('Sub Title', translate=True),
         'author_id': fields.many2one('res.partner', 'Author'),
-        'background_image': fields.binary('Background Image'),
+        'background_image': fields.binary('Background Image', oldname='content_image'),
         'blog_id': fields.many2one(
             'blog.blog', 'Blog',
             required=True, ondelete='cascade',

From 2138892723223ce15731839eb6eb0f39626edba8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Apr 2014 18:03:06 +0200
Subject: [PATCH 35/72] [FIX] survey: handle the case where there is no stage
 available when searching default stage. [FIX] survey: define survey.stage
 before using it in survey.survey

bzr revid: chs@openerp.com-20140417160306-0oeb928gpfwxoxhz
---
 addons/survey/survey.py | 49 +++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 0569c8ab0d5..590d7ae22c8 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -34,6 +34,27 @@ import uuid
 
 _logger = logging.getLogger(__name__)
 
+class survey_stage(osv.Model):
+    """Stages for Kanban view of surveys"""
+
+    _name = 'survey.stage'
+    _description = 'Survey Stage'
+    _order = 'sequence asc'
+
+    _columns = {
+        'name': fields.char(string="Name", required=True, translate=True),
+        'sequence': fields.integer(string="Sequence"),
+        'closed': fields.boolean(string="Closed", help="If closed, people won't be able to answer to surveys in this column."),
+        'fold': fields.boolean(string="Folded in kanban view")
+    }
+    _defaults = {
+        'sequence': 1,
+        'closed': False
+    }
+    _sql_constraints = [
+        ('positive_sequence', 'CHECK(sequence >= 0)', 'Sequence number MUST be a natural')
+    ]
+
 
 class survey_survey(osv.Model):
     '''Settings for a multi-page/multi-question survey.
@@ -175,9 +196,15 @@ class survey_survey(osv.Model):
         'quizz_mode': fields.boolean(string='Quizz mode')
     }
 
+    def _default_stage(self, cr, uid, context=None):
+        ids = self.pool['survey.stage'].search(cr, uid, [], limit=1, context=context)
+        if ids:
+            return ids[0]
+        return False
+
     _defaults = {
         'color': 0,
-        'stage_id': lambda self, cr, uid, context: self.pool.get('survey.stage').search_read(cr, uid, fields=['id'], order='sequence asc', limit=1, context=context)[0]['id']
+        'stage_id': lambda self, *a, **kw: self._default_stage(*a, **kw)
     }
 
     def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
@@ -456,26 +483,6 @@ class survey_survey(osv.Model):
         }
 
 
-class survey_stage(osv.Model):
-    """Stages for Kanban view of surveys"""
-
-    _name = 'survey.stage'
-    _description = 'Survey Stage'
-    _order = 'sequence asc'
-
-    _columns = {
-        'name': fields.char(string="Name", required=True, translate=True),
-        'sequence': fields.integer(string="Sequence"),
-        'closed': fields.boolean(string="Closed", help="If closed, people won't be able to answer to surveys in this column."),
-        'fold': fields.boolean(string="Folded in kanban view")
-    }
-    _defaults = {
-        'sequence': 1,
-        'closed': False
-    }
-    _sql_constraints = [
-        ('positive_sequence', 'CHECK(sequence >= 0)', 'Sequence number MUST be a natural')
-    ]
 
 
 class survey_page(osv.Model):

From e2b8593f9157e141e991933eb470999f049e214a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 17 Apr 2014 18:09:19 +0200
Subject: [PATCH 36/72] [REVERT] web: 4174
 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr, break the kanban drag
 and drop, which is far more important than the show more button wrongly
 displayed in ie.

bzr revid: dle@openerp.com-20140417160919-ftwk0jtci9dwuu7h
---
 addons/web_kanban/static/src/css/kanban.css  | 5 ++++-
 addons/web_kanban/static/src/css/kanban.sass | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 1a0c3f1d9eb..2c2a19724cf 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -140,7 +140,10 @@
   padding: 0px;
   background: white;
 }
-.openerp .oe_kanban_view .oe_kanban_column {
+.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
+  height: 100%;
+}
+.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
   height: 100%;
 }
 .openerp .oe_kanban_view .oe_kanban_aggregates {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 48457789dd2..cac86ac327b 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -161,7 +161,7 @@
             padding: 0px
             background: #ffffff
 
-    .oe_kanban_column
+    .oe_kanban_column, .oe_kanban_column_cards
         height: 100%
     .oe_kanban_aggregates
         padding: 0

From 2024cc28b2dd2b8c1385bc82784c34981e9718b3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Apr 2014 18:28:01 +0200
Subject: [PATCH 37/72] [FIX] when running in threaded mode with
 "--stop-after-init", do not spawn httpd and cron thread

bzr revid: chs@openerp.com-20140417162801-se9s84dsoh45sq0v
---
 openerp/service/server.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 76b415eb01e..c182c10a74d 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -280,7 +280,7 @@ class ThreadedServer(CommonServer):
         t.start()
         _logger.info('HTTP service (werkzeug) running on %s:%s', self.interface, self.port)
 
-    def start(self):
+    def start(self, stop=False):
         _logger.debug("Setting signal handlers")
         if os.name == 'posix':
             signal.signal(signal.SIGINT, self.signal_handler)
@@ -291,8 +291,11 @@ class ThreadedServer(CommonServer):
         elif os.name == 'nt':
             import win32api
             win32api.SetConsoleCtrlHandler(lambda sig: self.signal_handler(sig, None), 1)
-        self.cron_spawn()
-        self.http_spawn()
+
+        if not stop:
+            # only relevant if we are not in "--stop-after-init" mode
+            self.cron_spawn()
+            self.http_spawn()
 
     def stop(self):
         """ Shutdown the WSGI server. Wait for non deamon threads.
@@ -329,7 +332,7 @@ class ThreadedServer(CommonServer):
         The first SIGINT or SIGTERM signal will initiate a graceful shutdown while
         a second one if any will force an immediate exit.
         """
-        self.start()
+        self.start(stop=stop)
 
         rc = preload_registries(preload)
 

From efbf7632b86ee3e9f0ede32dc4d0786b38504cb7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Apr 2014 19:06:20 +0200
Subject: [PATCH 38/72] [FIX] some tests need the http daemon to be available

bzr revid: chs@openerp.com-20140417170620-48tw5nj3jt43zxgk
---
 openerp/service/server.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index c182c10a74d..9dde14c0edb 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -292,10 +292,14 @@ class ThreadedServer(CommonServer):
             import win32api
             win32api.SetConsoleCtrlHandler(lambda sig: self.signal_handler(sig, None), 1)
 
+        test_mode = config['test_enable'] or config['test_file']
+        if not stop or test_mode:
+            # some tests need the http deamon to be available...
+            self.http_spawn()
+
         if not stop:
             # only relevant if we are not in "--stop-after-init" mode
             self.cron_spawn()
-            self.http_spawn()
 
     def stop(self):
         """ Shutdown the WSGI server. Wait for non deamon threads.

From 8364a0faaba81bdf0ef9e96414b06a2c15dcd6f6 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 18 Apr 2014 07:21:54 +0000
Subject: [PATCH 39/72] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140418072154-969nr7hzpppvd0mw
---
 addons/hr/i18n/ja.po       | 16 ++++++++--------
 addons/stock/i18n/zh_TW.po |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index ad14389644b..5781c49dd86 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.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-02-21 03:38+0000\n"
+"PO-Revision-Date: 2014-04-18 02:39+0000\n"
 "Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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-02-22 07:32+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr "OpenERPユーザ"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "マネジャーによるタイムシート検証"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -111,7 +111,7 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "hr_holidays モジュールをインストールします。"
 
 #. module: hr
 #: view:hr.job:0
@@ -126,7 +126,7 @@ msgstr "採用中"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未読メッセージ"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -144,7 +144,7 @@ msgstr "採用予定"
 #. module: hr
 #: view:hr.employee:0
 msgid "Other Information ..."
-msgstr ""
+msgstr "その他情報..."
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -154,7 +154,7 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "hr_recruitment モジュールをインストールします。"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 15c281d95fd..18785a58b5e 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.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-17 06:53+0000\n"
+"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: stock

From e0451e28cd780ad32e2e5ef6abb48dbda0d18c92 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 18 Apr 2014 10:38:18 +0200
Subject: [PATCH 40/72] [FIX] website_hr_recruitment: missing public group in
 security rule for website_published

bzr revid: dle@openerp.com-20140418083818-p11a17k4az2wsa2e
---
 .../security/website_hr_recruitment_security.xml                | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
index 724c4dfddce..792995ca606 100644
--- a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
+++ b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
@@ -5,6 +5,7 @@
         <field name="name">Job Positions: Public</field>
         <field name="model_id" ref="hr.model_hr_job"/>
         <field name="domain_force">[('website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public'))]"/>
         <field name="perm_read" eval="True"/>
         <field name="perm_write" eval="False"/>
         <field name="perm_create" eval="False"/>
@@ -14,6 +15,7 @@
         <field name="name">Job department: Public</field>
         <field name="model_id" ref="hr.model_hr_department"/>
         <field name="domain_force">[('jobs_ids.website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public'))]"/>
         <field name="perm_read" eval="True"/>
         <field name="perm_write" eval="False"/>
         <field name="perm_create" eval="False"/>

From 6f4efd45bb7ba2c72f81b092768b8a85d4978fc9 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 11:05:20 +0200
Subject: [PATCH 41/72] [FIX] gamification: change scope of goal_obj variable

bzr revid: mat@openerp.com-20140418090520-zq4r6s4g9qn78mvx
---
 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 295340a309b..081127d6bf0 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -376,6 +376,7 @@ class gamification_challenge(osv.Model):
         can be called after each change in the list of users or lines.
         :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)
@@ -390,7 +391,6 @@ class gamification_challenge(osv.Model):
                 # FIXME: allow to restrict to a subset of users
                 for user in challenge.user_ids:
 
-                    goal_obj = self.pool.get('gamification.goal')
                     domain = [('line_id', '=', line.id), ('user_id', '=', user.id)]
                     if start_date:
                         domain.append(('start_date', '=', start_date))

From 66ba3092cf2fdd3a768ad072df90d2d6c84e67a8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 18 Apr 2014 13:55:56 +0200
Subject: [PATCH 42/72] [FIX] http: correct detection of old (v7) routes that
 still take "req" as first argument

bzr revid: chs@openerp.com-20140418115556-717tlcwejszmi0lb
---
 openerp/http.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 8d7497fc40d..c9181d2c211 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -600,8 +600,8 @@ class ControllerType(type):
 
         # flag old-style methods with req as first argument
         for k, v in attrs.items():
-            if inspect.isfunction(v):
-                spec = inspect.getargspec(v)
+            if inspect.isfunction(v) and hasattr(v, 'original_func'):
+                spec = inspect.getargspec(v.original_func)
                 first_arg = spec.args[1] if len(spec.args) >= 2 else None
                 if first_arg in ["req", "request"]:
                     v._first_arg_is_req = True

From f4d3481546081db66550bb5ca437440322d21625 Mon Sep 17 00:00:00 2001
From: "Rakesh Sindhav (OpenERP)" <rsi@tinyerp.com>
Date: Fri, 18 Apr 2014 17:29:13 +0530
Subject: [PATCH 43/72] [IMP] improve strings and labels

bzr revid: rsi@tinyerp.com-20140418115913-xt4a4090u2oobzu6
---
 addons/account/account_view.xml  | 4 ++--
 addons/l10n_fr_rib/bank_view.xml | 2 +-
 addons/lunch/lunch_view.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index dc15e645086..c29371e4c44 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2444,8 +2444,8 @@
                         <field name="sign"/>
                         <field name="style_overwrite"/>
                     </group>
-                    <notebook>
-                        <page string="Report" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
+                    <notebook attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
+                        <page string="Report">
                             <group>
                                 <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
                                 <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index 9a2b92c176a..4bc697b6173 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -21,7 +21,7 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form" />
             <field name="arch" type="xml">
-                <field name="acc_number" position="before">
+                <field name="acc_number" position="after">
                     <field name="bank_code" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <field name="office" attrs="{'invisible':[('state','!=','rib')]}"/>
                     <newline />
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index dc2cd126fe0..cb7ad61e928 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -436,7 +436,7 @@
                                 <field name='price'/>
                             </group>
                         </group>
-                        <separator String='Description'/>
+                        <label for='description'/>
                         <field name='description'/>
                     </sheet>
                 </form>

From 067f21ce5aa9d215f6b174797ec8f79673f7033a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 14:08:46 +0200
Subject: [PATCH 44/72] [FIX] gamification: set data in noupdate blocks to
 allow the user to customise it without loosing changes after update

bzr revid: mat@openerp.com-20140418120846-h8yo4ljult88f1h3
---
 addons/gamification/data/badge.xml              | 4 ----
 addons/gamification/data/cron.xml               | 2 +-
 addons/gamification/data/goal_base.xml          | 4 ----
 addons/gamification/models/challenge.py         | 2 +-
 addons/gamification_sale_crm/sale_crm_goals.xml | 2 +-
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 5a390be9deb..4035c51cfc8 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -32,10 +32,6 @@
             <field name="rule_max_number">2</field>
             <field name="image" type="base64" file="gamification/static/img/badge_idea-image.png"/>
         </record>
-    </data>
-
-
-    <data noupdate="0">
 
         <record id="email_template_badge_received" model="email.template">
             <field name="name">Received Badge</field>
diff --git a/addons/gamification/data/cron.xml b/addons/gamification/data/cron.xml
index 8585771c97d..105f7d25681 100644
--- a/addons/gamification/data/cron.xml
+++ b/addons/gamification/data/cron.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record forcecreate="True" id="ir_cron_check_challenge"
             model="ir.cron">
             <field name="name">Run Goal Challenge Checker</field>
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index c8c18564772..1c18a5a70e5 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -92,10 +92,6 @@
             ]]></field>
         </record>
 
-    </data>
-
-    <data>
-
         <!-- goal definitions -->
         <record model="gamification.goal.definition" id="definition_base_timezone">
             <field name="name">Set your Timezone</field>
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 06d0c44baac..8ac7753898f 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -377,6 +377,7 @@ class gamification_challenge(osv.Model):
         can be called after each change in the list of users or lines.
         :param list(int) ids: the list of challenge concerned"""
 
+        goal_obj = self.pool.get('gamification.goal')
         for challenge in self.browse(cr, uid, ids, context):
             (start_date, end_date) = start_end_date_for_period(challenge.period)
 
@@ -390,7 +391,6 @@ class gamification_challenge(osv.Model):
                 # FIXME: allow to restrict to a subset of users
                 for user in challenge.user_ids:
 
-                    goal_obj = self.pool.get('gamification.goal')
                     domain = [('line_id', '=', line.id), ('user_id', '=', user.id)]
                     if start_date:
                         domain.append(('start_date', '=', start_date))
diff --git a/addons/gamification_sale_crm/sale_crm_goals.xml b/addons/gamification_sale_crm/sale_crm_goals.xml
index 4c1f8e46149..6db77be1aaf 100644
--- a/addons/gamification_sale_crm/sale_crm_goals.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!-- goal definitions -->
         <record model="gamification.goal.definition" id="definition_crm_tot_invoices">

From 9a858f7daa6ee86a51eace446bec38327b7f9960 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 18 Apr 2014 14:50:43 +0200
Subject: [PATCH 45/72] [ADD] website_certification: new module to display
 certificated people on website

bzr revid: rim@openerp.com-20140418125043-mhe8u8f18pov0nce
---
 addons/website_certification/__init__.py      | 23 ++++++++
 addons/website_certification/__openerp__.py   | 38 ++++++++++++
 addons/website_certification/certification.py | 43 ++++++++++++++
 .../controllers/__init__.py                   | 22 +++++++
 .../website_certification/controllers/main.py | 50 ++++++++++++++++
 .../security/ir.model.access.csv              |  7 +++
 .../views/website_certification_templates.xml | 42 ++++++++++++++
 .../views/website_certification_views.xml     | 58 +++++++++++++++++++
 8 files changed, 283 insertions(+)
 create mode 100644 addons/website_certification/__init__.py
 create mode 100644 addons/website_certification/__openerp__.py
 create mode 100644 addons/website_certification/certification.py
 create mode 100644 addons/website_certification/controllers/__init__.py
 create mode 100644 addons/website_certification/controllers/main.py
 create mode 100644 addons/website_certification/security/ir.model.access.csv
 create mode 100644 addons/website_certification/views/website_certification_templates.xml
 create mode 100644 addons/website_certification/views/website_certification_views.xml

diff --git a/addons/website_certification/__init__.py b/addons/website_certification/__init__.py
new file mode 100644
index 00000000000..2a6cb8bee84
--- /dev/null
+++ b/addons/website_certification/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import certification
+import controllers
diff --git a/addons/website_certification/__openerp__.py b/addons/website_certification/__openerp__.py
new file mode 100644
index 00000000000..041014646fe
--- /dev/null
+++ b/addons/website_certification/__openerp__.py
@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Certified People',
+    'category': 'Website',
+    'summary': 'Display your network of certified people on your website',
+    'version': '1.0',
+    'author': 'OpenERP S.A.',
+    'depends': ['marketing', 'website'],
+    'description': """
+    Display your network of certified people on your website
+    """,
+    'data': [
+        'security/ir.model.access.csv',
+        'views/website_certification_views.xml',
+        'views/website_certification_templates.xml',
+    ],
+    'installable': True,
+}
diff --git a/addons/website_certification/certification.py b/addons/website_certification/certification.py
new file mode 100644
index 00000000000..48636e027f7
--- /dev/null
+++ b/addons/website_certification/certification.py
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from openerp.osv import osv, fields
+
+
+class certification_type(osv.Model):
+    _name = 'certification.type'
+    _order = 'name ASC'
+    _columns = {
+        'name': fields.char("Certification Type", required=True)
+    }
+
+
+class certification_certification(osv.Model):
+    _name = 'certification.certification'
+    _order =  'certification_date DESC'
+    _columns = {
+        'partner_id': fields.many2one('res.partner', string="Partner", required=True),
+        'type_id': fields.many2one('certification.type', string="Certification", required=True),
+        'certification_date': fields.date("Certification Date", required=True),
+        'certification_score': fields.char("Certification Score", required=True),
+        'certification_hidden_score': fields.boolean("Hide score on website?")
+    }
diff --git a/addons/website_certification/controllers/__init__.py b/addons/website_certification/controllers/__init__.py
new file mode 100644
index 00000000000..672df6ec1f9
--- /dev/null
+++ b/addons/website_certification/controllers/__init__.py
@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import main
diff --git a/addons/website_certification/controllers/main.py b/addons/website_certification/controllers/main.py
new file mode 100644
index 00000000000..75fe9174760
--- /dev/null
+++ b/addons/website_certification/controllers/main.py
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+
+
+class WebsiteCertifiedPartners(http.Controller):
+
+    @http.route(['/certifications',
+                 '/certifications/<model("certification.type"):cert_type>'], type='http', auth='public',
+                website=True, multilang=True)
+    def certified_partners(self, cert_type=None, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+        certification_obj = request.registry['certification.certification']
+        cert_type_obj = request.registry['certification.type']
+
+        domain = []
+        if cert_type:
+            domain.append(('type_id', '=', cert_type.id))
+
+        certifications_ids = certification_obj.search(cr, uid, domain, context=context)
+        certifications = certification_obj.browse(cr, uid, certifications_ids, context=context)
+        types = cert_type_obj.browse(cr, uid, cert_type_obj.search(cr, uid, [], context=context), context=context)
+        data = {
+            'certifications': certifications,
+            'types': types
+        }
+
+        # ici selectionner les partners certifies uniquement
+        return request.website.render("website_certification.certified_partners", data)
diff --git a/addons/website_certification/security/ir.model.access.csv b/addons/website_certification/security/ir.model.access.csv
new file mode 100644
index 00000000000..a297b053d26
--- /dev/null
+++ b/addons/website_certification/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_certifications_public,certification.certification public,model_certification_certification,base.group_public,1,0,0,0
+access_certifications_types_public,certification.type public,model_certification_type,base.group_public,1,0,0,0
+access_certifications_users,certification.certification users,model_certification_certification,base.group_user,1,0,0,0
+access_certifications_types_users,certification.type users,model_certification_type,base.group_user,1,0,0,0
+access_certifications_marketing,certification.certification marketing,model_certification_certification,marketing.group_marketing_user,1,1,1,1
+access_certifications_types_marketing,certification.type marketing,model_certification_type,marketing.group_marketing_user,1,1,1,1
diff --git a/addons/website_certification/views/website_certification_templates.xml b/addons/website_certification/views/website_certification_templates.xml
new file mode 100644
index 00000000000..eaacdea22ba
--- /dev/null
+++ b/addons/website_certification/views/website_certification_templates.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?>
+<openerp>
+<data>
+    <template id="certified_partners" name="Certified People">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <div class="container">
+                <div class="row">
+                    <h1>Certified People</h1>
+                    <div class="well">Filter by certification type:
+                        <a href="/certifications"><span class="badge">all</span></a>
+                        <t t-foreach="types" t-as="t">
+                            <a t-att-href="'/certifications/%s' % slug(t)"><span class="badge" t-field="t.name" /></a>
+                        </t>
+                    </div>
+                    <div class="table-responsive">
+                        <table class="table table-striped">
+                            <thead><tr>
+                                <th>Name</th>
+                                <th>Date</th>
+                                <th>Type</th>
+                                <th>Score</th>
+                            </tr></thead>
+                            <tbody>
+                                <tr t-foreach="certifications" t-as="c">
+                                    <td><span t-field="c.partner_id"/></td>
+                                    <td><span t-field="c.certification_date"/></td>
+                                    <td><span t-field="c.type_id.name"/></td>
+                                    <td><t t-if="c.certification_hidden_score == False"><span t-field="c.certification_score"/></t></td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+            <div class="oe_structure"/>
+        </div>
+    </t>
+</template>
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/website_certification/views/website_certification_views.xml b/addons/website_certification/views/website_certification_views.xml
new file mode 100644
index 00000000000..b732df1a3e1
--- /dev/null
+++ b/addons/website_certification/views/website_certification_views.xml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<openerp>
+<data>
+    <record model="ir.ui.view" id="certification_certification_tree">
+        <field name="name">view.certification.certification.tree</field>
+        <field name="model">certification.certification</field>
+        <field name="arch" type="xml">
+            <tree string="Granted Certifications">
+                <field name="partner_id" />
+                <field name="type_id" />
+                <field name="certification_date" />
+                <field name="certification_score" />
+                <field name="certification_hidden_score" />
+            </tree>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="certification_certification_form">
+        <field name="name">view.certification.certification.form</field>
+        <field name="model">certification.certification</field>
+        <field name="arch" type="xml">
+            <form string="Granted Certification" version="7.0">
+                <sheet>
+                    <group nolabel="1">
+                        <field name="partner_id" />
+                        <field name="type_id" />
+                        <field name="certification_date" />
+                        <field name="certification_score" />
+                        <field name="certification_hidden_score" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="certification_certification_search">
+        <field name="name">view.certification.certification.search</field>
+        <field name="model">certification.certification</field>
+        <field name="arch" type="xml">
+            <search string="Search Certification">
+                <field name="partner_id" />
+                <field name="type_id" />
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" name="group_by_partner"  domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter string="Type"    name="group_by_type"     domain="[]" context="{'group_by': 'type_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_certifications_list">
+        <field name="name">Certifications</field>
+        <field name="res_model">certification.certification</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="search_view_id" ref="certification_certification_search"/>
+    </record>
+    <menuitem name="Certifications" id="menu_certifications" parent="base.marketing_menu" sequence="35" />
+    <menuitem name="Certifications" id="menu_certifications_list" action="action_certifications_list" parent="menu_certifications" sequence="1"/>
+</data>
+</openerp>
\ No newline at end of file

From c24ee0e3740d5aa7762c4dd45c6d19e6d146112f Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 18 Apr 2014 14:59:57 +0200
Subject: [PATCH 46/72] [REF] Code cleaning

bzr revid: rim@openerp.com-20140418125957-5uvnbn4bl8gilufg
---
 addons/website_certification/controllers/main.py                | 1 -
 .../views/website_certification_templates.xml                   | 2 +-
 .../website_certification/views/website_certification_views.xml | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/website_certification/controllers/main.py b/addons/website_certification/controllers/main.py
index 75fe9174760..ab955bc12dd 100644
--- a/addons/website_certification/controllers/main.py
+++ b/addons/website_certification/controllers/main.py
@@ -46,5 +46,4 @@ class WebsiteCertifiedPartners(http.Controller):
             'types': types
         }
 
-        # ici selectionner les partners certifies uniquement
         return request.website.render("website_certification.certified_partners", data)
diff --git a/addons/website_certification/views/website_certification_templates.xml b/addons/website_certification/views/website_certification_templates.xml
index eaacdea22ba..13fe86a810c 100644
--- a/addons/website_certification/views/website_certification_templates.xml
+++ b/addons/website_certification/views/website_certification_templates.xml
@@ -39,4 +39,4 @@
     </t>
 </template>
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/website_certification/views/website_certification_views.xml b/addons/website_certification/views/website_certification_views.xml
index b732df1a3e1..2935c541a7b 100644
--- a/addons/website_certification/views/website_certification_views.xml
+++ b/addons/website_certification/views/website_certification_views.xml
@@ -55,4 +55,4 @@
     <menuitem name="Certifications" id="menu_certifications" parent="base.marketing_menu" sequence="35" />
     <menuitem name="Certifications" id="menu_certifications_list" action="action_certifications_list" parent="menu_certifications" sequence="1"/>
 </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 6e04c0c5eb3c609cabdc33216b45aa3640ee291b Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 18 Apr 2014 15:29:17 +0200
Subject: [PATCH 47/72] [FIX] account_analytic_analysis: prevent enable
 recurring invoices if not of type contract. Avoid cron to not continue if one
 of the contract failed to create its recurring invoices

bzr revid: dle@openerp.com-20140418132917-ztvzinwn3kt786m2
---
 .../account_analytic_analysis.py              | 44 +++++++++++++------
 .../account_analytic_analysis_cron.xml        |  2 +-
 .../account_analytic_analysis_view.xml        |  6 ++-
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index b73dad2d385..f8905d6e546 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -22,6 +22,7 @@ from dateutil.relativedelta import relativedelta
 import datetime
 import logging
 import time
+import traceback
 
 from openerp.osv import osv, fields
 from openerp.osv.orm import intersect, except_orm
@@ -714,23 +715,40 @@ class account_analytic_account(osv.osv):
         inv_obj.button_compute(cr, uid, [invoice_id], context=context)
         return invoice_id
 
-    def recurring_create_invoice(self, cr, uid, automatic=False, context=None):
+    def recurring_create_invoice(self, cr, uid, ids, context=None):
+        return self._recurring_create_invoice(cr, uid, ids, context=context)
+
+    def _cron_recurring_create_invoice(self, cr, uid, context=None):
+        return self._recurring_create_invoice(cr, uid, [], automatic=True, context=context)
+
+    def _recurring_create_invoice(self, cr, uid, ids, automatic=False, context=None):
         context = context or {}
         current_date =  time.strftime('%Y-%m-%d')
-
-        contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True)])
+        if ids:
+            contract_ids = ids
+        else:
+            contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True)])
         for contract in self.browse(cr, uid, contract_ids, context=context):
-            invoice_id = self._prepare_invoice(cr, uid, contract, context=context)
+            try:
+                invoice_id = self._prepare_invoice(cr, uid, contract, 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':
-                new_date = next_date+relativedelta(days=+interval)
-            elif contract.recurring_rule_type == 'weekly':
-                new_date = next_date+relativedelta(weeks=+interval)
-            else:
-                new_date = next_date+relativedelta(months=+interval)
-            self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, 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':
+                    new_date = next_date+relativedelta(days=+interval)
+                elif contract.recurring_rule_type == 'weekly':
+                    new_date = next_date+relativedelta(weeks=+interval)
+                else:
+                    new_date = next_date+relativedelta(months=+interval)
+                self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+                if automatic:
+                    cr.commit()
+            except Exception:
+                if automatic:
+                    cr.rollback()
+                    _logger.error(traceback.format_exc())
+                else:
+                    raise
         return True
 
 class account_analytic_account_summary_user(osv.osv):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
index 492278a87b5..0637c2ad276 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_cron.xml
@@ -93,7 +93,7 @@ OpenERP Automatic Email
            <field name="interval_type">days</field>
            <field name="numbercall">-1</field>
            <field name="model" eval="'account.analytic.account'"/>
-           <field name="function" eval="'recurring_create_invoice'"/>
+           <field name="function" eval="'_cron_recurring_create_invoice'"/>
            <field name="args" eval="'()'"/>
         </record>
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f5b89db7089..a6fe828926a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -148,8 +148,10 @@
                     </group>
                     <separator string="Recurring Invoices" attrs="{'invisible': [('recurring_invoices','!=',True)]}"/>
                     <div>
-                        <field name="recurring_invoices" on_change="onchange_recurring_invoices(recurring_invoices, date_start)" class="oe_inline"/>
-                        <label for="recurring_invoices" />
+                        <div attrs="{'invisible': [('type','!=', 'contract'), ('recurring_invoices', '=', False)]}">
+                            <field name="recurring_invoices" on_change="onchange_recurring_invoices(recurring_invoices, date_start)" class="oe_inline" />
+                            <label for="recurring_invoices" />
+                        </div>
                         <button class="oe_link" name="recurring_create_invoice" attrs="{'invisible': [('recurring_invoices','!=',True)]}" string="⇒ create invoices" type="object" groups="base.group_no_one"/>
                     </div>
                     <group attrs="{'invisible': [('recurring_invoices','!=',True)]}">

From d0cf3056180bbd1e20d8f6266a1268476021e9c4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 18 Apr 2014 15:47:40 +0200
Subject: [PATCH 48/72] [FIX] account_analytic_analysis: avoid create recurring
 invoices for contract templates

bzr revid: dle@openerp.com-20140418134740-dv39ffwcdqh4np0g
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index f8905d6e546..f3e7d6d53a3 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -727,7 +727,7 @@ class account_analytic_account(osv.osv):
         if ids:
             contract_ids = ids
         else:
-            contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True)])
+            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)

From a97dd9adaf04377298fcd090d58fb144c9bfbe5c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 16:05:08 +0200
Subject: [PATCH 49/72] [FIX] mail: correct missing comma in domain on
 mail.mail

bzr revid: mat@openerp.com-20140418140508-y0fnxsbgda0gp6t4
---
 addons/mail/mail_mail_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index e0d1f3e96b2..361959a9927 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -86,7 +86,7 @@
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
-                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <field name="email_from" filter_domain="['|', '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
                     <field name="date"/>
                     <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>

From 4c68f32fadf3de8ebe5765bc402df17c51e000fb Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 18 Apr 2014 16:15:27 +0200
Subject: [PATCH 50/72] [FIX] account_analytic_analysis: test
 recurring_create_invoice, ids is mandatory

bzr revid: dle@openerp.com-20140418141527-jxc4l7amuj7weu0a
---
 .../test/account_analytic_analysis.yml                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/test/account_analytic_analysis.yml b/addons/account_analytic_analysis/test/account_analytic_analysis.yml
index 49668a2b781..95194c97c86 100644
--- a/addons/account_analytic_analysis/test/account_analytic_analysis.yml
+++ b/addons/account_analytic_analysis/test/account_analytic_analysis.yml
@@ -32,7 +32,7 @@
   I generate all invoices from contracts having recurring invoicing
 -
   !python {model: account.analytic.account}: |
-    self.recurring_create_invoice(cr, uid)
+    self.recurring_create_invoice(cr, uid, [])
 -
   I test the generated invoice
 -

From c3cf8000e6cb22ecf71e3b25b3950e5ce9ae01bf Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 18 Apr 2014 16:15:50 +0200
Subject: [PATCH 51/72] [FIX] module loading: mark module as initialized
 *after* the data files have been loaded

When the registry is updating, the view verification only validates the views
from initialized modules. Not taking the current module allow update of views
that have also an inherited view in the same module. The verification of the base view
must not try to apply the old inherited view against it as it may not be applicable
anymore.

After module update, we re-validate all the views of this module. This is needed because
a module can declare two (or more) inherited views that are correct when applyed alone,
but not when combined with others.

bzr revid: chs@openerp.com-20140418141550-7b57b1xl4fx0rgqq
---
 openerp/addons/base/ir/ir_ui_view.py | 14 ++++++++++++++
 openerp/modules/loading.py           |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index f67f65f2c1c..198b85e86a7 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -955,4 +955,18 @@ class view(osv.osv):
         ids = map(itemgetter(0), cr.fetchall())
         return self._check_xml(cr, uid, ids)
 
+    def _validate_module_views(self, cr, uid, module):
+        """Validate architecture of all the views of a given module"""
+        assert not self.pool._init or module in self.pool._init_modules
+        cr.execute("""SELECT max(v.id)
+                        FROM ir_ui_view v
+                   LEFT JOIN ir_model_data md ON (md.model = 'ir.ui.view' AND md.res_id = v.id)
+                       WHERE md.module = %s
+                    GROUP BY coalesce(v.inherit_id, v.id)
+                   """, (module,))
+
+        for vid, in cr.fetchall():
+            if not self._check_xml(cr, uid, [vid]):
+                self.raise_view_error(cr, uid, "Can't validate view", vid)
+
 # vim:et:
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 5635e42e780..2b507acc0bb 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2013 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2014 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -153,7 +153,6 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
         loaded_modules.append(package.name)
         if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
             init_module_models(cr, package.name, models)
-        registry._init_modules.add(package.name)
         status['progress'] = float(index) / len(graph)
 
         # Can't put this line out of the loop: ir.module.module will be
@@ -182,6 +181,10 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
 
             migrations.migrate_module(package, 'post')
 
+            registry._init_modules.add(package.name)
+            # validate all the views at a whole
+            registry['ir.ui.view']._validate_module_views(cr, SUPERUSER_ID, module_name)
+
             if has_demo:
                 # launch tests only in demo mode, allowing tests to use demo data.
                 if tools.config.options['test_enable']:
@@ -207,6 +210,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
                 if hasattr(package, kind):
                     delattr(package, kind)
 
+        registry._init_modules.add(package.name)
         cr.commit()
 
     # The query won't be valid for models created later (i.e. custom model

From 0253e8ab616015eae4c0f43b673fc547809ced55 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 18 Apr 2014 16:17:55 +0200
Subject: [PATCH 52/72] [FIX] base_geolocalize: no reason to have groups no one
 for geolocation tab, any salesman should be able to set the latitude
 longitude

bzr revid: dle@openerp.com-20140418141755-x4wnhqh39v23tky2
---
 addons/base_geolocalize/views/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_geolocalize/views/res_partner_view.xml b/addons/base_geolocalize/views/res_partner_view.xml
index 24cc8d2d21d..1bd537ae3ff 100644
--- a/addons/base_geolocalize/views/res_partner_view.xml
+++ b/addons/base_geolocalize/views/res_partner_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook[last()]" position="inside">
-                    <page string="Geo Localization" name="geo_localization" groups="base.group_no_one">
+                    <page string="Geo Localization" name="geo_localization">
                         <group colspan="2" col="2">
                             <separator string="Geo Localization" colspan="2"/>
                             <button

From 93cca5eb1dda110c2191065b87b0e76c6cb15540 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 18 Apr 2014 16:45:38 +0200
Subject: [PATCH 53/72] [FIX] account_analytic_analysis: test, the recurring
 invoices are generated for analytic accounts of type contract only (no
 template...)

bzr revid: dle@openerp.com-20140418144538-paqas7j8cbjyi11t
---
 .../account_analytic_analysis/test/account_analytic_analysis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_analytic_analysis/test/account_analytic_analysis.yml b/addons/account_analytic_analysis/test/account_analytic_analysis.yml
index 95194c97c86..4f594b6bed3 100644
--- a/addons/account_analytic_analysis/test/account_analytic_analysis.yml
+++ b/addons/account_analytic_analysis/test/account_analytic_analysis.yml
@@ -20,6 +20,7 @@
   !record {model: account.analytic.account, id: contract_main}:
     partner_id: base.main_partner
     template_id: account_analytic_analysis.contract_template
+    type: contract
 -
   I check that the contract inherited from data of the template
 -

From 02a9df59b78ef83962a07a5b6e0a10c20cb72b42 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 18 Apr 2014 17:08:31 +0200
Subject: [PATCH 54/72] [FIX] website: media editor: display popup when user
 click on save button of the view

bzr revid: chm@openerp.com-20140418150831-k7fnd7y6ywrmxv6j
---
 addons/website/static/src/js/website.snippets.editor.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f59f2cf07ca..bae014029e1 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -161,6 +161,7 @@
             return this._super.apply(this, arguments);
         },
         save: function () {
+            website.snippet.clean_for_save = true;
             this.snippets.clean_for_save();
             this._super();
         },
@@ -1518,6 +1519,9 @@
             });
         },
         onFocus : function () {
+            // don't open media editor before clean for save
+            if (website.snippet.clean_for_save) return;
+
             var self = this;
             if (this.$target.parent().data("oe-field") === "image") {
                 this.$overlay.addClass("hidden");

From 1db082db9d4e58e53ccaf81016708e7479d71c2a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 18 Apr 2014 18:45:52 +0200
Subject: [PATCH 55/72] [FIX] convert: use _all_columns instead of _columns as
 it contain fields from inherited models.

bzr revid: mat@openerp.com-20140418164552-2mlprexkdlqlui2h
---
 openerp/tools/convert.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 4598e2e384a..870f9d19dd2 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -772,8 +772,8 @@ form: module.record_id""" % (xml_id,)
             f_ref = field.get("ref",'').encode('utf-8')
             f_search = field.get("search",'').encode('utf-8')
             f_model = field.get("model",'').encode('utf-8')
-            if not f_model and model._columns.get(f_name,False):
-                f_model = model._columns[f_name]._obj
+            if not f_model and model._all_columns.get(f_name,False):
+                f_model = model._all_columns[f_name].column._obj
             f_use = field.get("use",'').encode('utf-8') or 'id'
             f_val = False
 
@@ -785,9 +785,9 @@ form: module.record_id""" % (xml_id,)
                 # browse the objects searched
                 s = f_obj.browse(cr, self.uid, f_obj.search(cr, self.uid, q))
                 # column definitions of the "local" object
-                _cols = self.pool.get(rec_model)._columns
+                _cols = self.pool.get(rec_model)._all_columns
                 # if the current field is many2many
-                if (f_name in _cols) and _cols[f_name]._type=='many2many':
+                if (f_name in _cols) and _cols[f_name].column._type=='many2many':
                     f_val = [(6, 0, map(lambda x: x[f_use], s))]
                 elif len(s):
                     # otherwise (we are probably in a many2one field),
@@ -797,17 +797,17 @@ form: module.record_id""" % (xml_id,)
                 if f_ref=="null":
                     f_val = False
                 else:
-                    if f_name in model._columns \
-                              and model._columns[f_name]._type == 'reference':
+                    if f_name in model._all_columns \
+                              and model._all_columns[f_name].column._type == 'reference':
                         val = self.model_id_get(cr, f_ref)
                         f_val = val[0] + ',' + str(val[1])
                     else:
                         f_val = self.id_get(cr, f_ref)
             else:
                 f_val = _eval_xml(self,field, self.pool, cr, self.uid, self.idref)
-                if model._columns.has_key(f_name):
+                if f_name in model._all_columns:
                     import openerp.osv as osv
-                    if isinstance(model._columns[f_name], osv.fields.integer):
+                    if isinstance(model._all_columns[f_name].column, osv.fields.integer):
                         f_val = int(f_val)
             res[f_name] = f_val
 

From 2e07433d11bc8cdc9f88a9249cb5442d0e77a9df Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 20 Apr 2014 05:58:23 +0000
Subject: [PATCH 56/72] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140418072138-5fv3mmbsqnlcpk4b
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063447-v94cfwvpby4h6d0v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055823-r61ad07jgr3110pw
---
 openerp/addons/base/i18n/bg.po | 116 +++++++++++++++++----------------
 openerp/addons/base/i18n/de.po |  18 ++---
 openerp/addons/base/i18n/hi.po |  21 +++---
 3 files changed, 81 insertions(+), 74 deletions(-)

diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 90df2de035a..fcb2fa1fcea 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -8,14 +8,14 @@ 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: 2013-06-20 13:28+0000\n"
-"Last-Translator: Georgi Uzunov <georgi.uzunov@gmail.com>\n"
+"PO-Revision-Date: 2014-04-17 18:40+0000\n"
+"Last-Translator: Vihren Kanev <Unknown>\n"
 "Language-Team: Bulgarian <bg@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:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -627,7 +627,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
 msgid "Ideas"
-msgstr ""
+msgstr "Идеи"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event
@@ -700,7 +700,7 @@ msgstr "Колумбия"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
 msgid "Mister"
-msgstr ""
+msgstr "Господин"
 
 #. module: base
 #: help:res.country,code:0
@@ -757,7 +757,7 @@ msgstr "Персонализираните полета трябва да има
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "Мексико - Счетоводство"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
@@ -872,7 +872,7 @@ msgstr "Еритрея"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Името на фирмата трябва да е уникално!"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule_admin
@@ -882,7 +882,7 @@ msgstr "Автоматизирани действия"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro
 msgid "Romania - Accounting"
-msgstr ""
+msgstr "Румъния - Счетоводство"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
@@ -927,7 +927,7 @@ msgstr "шведски / svenska"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Име на файла"
 
 #. module: base
 #: model:res.country,name:base.rs
@@ -1071,7 +1071,7 @@ msgstr "Ъпгрейд на модул"
 #: view:res.partner.bank:0
 #: view:res.users:0
 msgid "ZIP"
-msgstr ""
+msgstr "Пощенски код"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1221,6 +1221,8 @@ msgstr "TGZ Архив"
 msgid ""
 "Users added to this group are automatically added in the following groups."
 msgstr ""
+"Потребителите добавени в тази група автоматично ще бъдат добавени и в "
+"следните групи."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:732
@@ -1257,7 +1259,7 @@ msgstr "Вид"
 #. module: base
 #: field:ir.mail_server,smtp_user:0
 msgid "Username"
-msgstr ""
+msgstr "Потребителско име"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_br
@@ -1396,7 +1398,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.category,visible:0
 msgid "Visible"
-msgstr ""
+msgstr "Видим"
 
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
@@ -1482,7 +1484,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests
 msgid "Tests"
-msgstr ""
+msgstr "Тестове"
 
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
@@ -1563,7 +1565,7 @@ msgstr "Отказана операция"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document
 msgid "Document Management System"
-msgstr ""
+msgstr "Система за управление на документи"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_claim
@@ -1697,7 +1699,7 @@ msgstr "Не съществува език с код \"%s\""
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Социална мрежа"
 
 #. module: base
 #: view:res.lang:0
@@ -1879,12 +1881,12 @@ msgstr ""
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Картинка с малък размер"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Управление на складове"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1929,7 +1931,7 @@ msgstr "Резултатно действие"
 #: view:ir.module.module:0
 #, python-format
 msgid "Install"
-msgstr ""
+msgstr "Инсталиране"
 
 #. module: base
 #: field:res.currency,accuracy:0
@@ -2239,7 +2241,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_administration
 #: model:res.groups,name:base.group_system
 msgid "Settings"
-msgstr ""
+msgstr "Настройки"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -2330,7 +2332,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
 msgid "Extra Tools"
-msgstr ""
+msgstr "Допълнителни инструменти"
 
 #. module: base
 #: view:ir.attachment:0
@@ -2348,6 +2350,8 @@ msgid ""
 "Appears by default on the top right corner of your printed documents (report "
 "header)."
 msgstr ""
+"По подразбиране се появява в горния десен ъгъл на принтираните документи "
+"(горния колонтитул на отчетите)"
 
 #. module: base
 #: field:base.module.update,update:0
@@ -2357,7 +2361,7 @@ msgstr "Брой обновени модули"
 #. module: base
 #: field:ir.cron,function:0
 msgid "Method"
-msgstr ""
+msgstr "Метод"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
@@ -2406,7 +2410,7 @@ msgstr ""
 #. module: base
 #: field:change.password.user,new_passwd:0
 msgid "New Password"
-msgstr ""
+msgstr "Нова парола"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -3054,7 +3058,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "да"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -3275,7 +3279,7 @@ msgstr ""
 #: view:res.users:0
 #, python-format
 msgid "Application"
-msgstr ""
+msgstr "Приложение"
 
 #. module: base
 #: model:res.groups,comment:base.group_hr_manager
@@ -3604,7 +3608,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Изнасянето завърши"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3841,7 +3845,7 @@ msgstr ""
 #: field:res.company,rml_footer:0
 #: field:res.company,rml_footer_readonly:0
 msgid "Report Footer"
-msgstr ""
+msgstr "Долен колонтитул на отчета"
 
 #. module: base
 #: selection:res.lang,direction:0
@@ -3979,7 +3983,7 @@ msgstr ""
 #: code:addons/orm.py:3902
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Отказан достъп"
 
 #. module: base
 #: field:res.company,name:0
@@ -4062,7 +4066,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.je
 msgid "Jersey"
-msgstr ""
+msgstr "Джърси (остров)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_translation
@@ -4127,7 +4131,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Словакия"
 
 #. module: base
 #: model:res.country,name:base.nr
@@ -4488,7 +4492,7 @@ msgstr "Обобщение"
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
-msgstr ""
+msgstr "Зависимост"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal
@@ -4588,7 +4592,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Система за управление на ЗНАНИЯ"
 
 #. module: base
 #: view:workflow.activity:0
@@ -4801,7 +4805,7 @@ msgstr "Изглед"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "no"
-msgstr ""
+msgstr "не"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -4883,7 +4887,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Палестинска територия, Окупирана"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
@@ -4988,7 +4992,7 @@ msgstr "Правила"
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP сървър"
 
 #. module: base
 #: code:addons/base/module/module.py:320
@@ -5368,7 +5372,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Процес на наемане"
 
 #. module: base
 #: model:res.country,name:base.br
@@ -5822,7 +5826,7 @@ msgstr "Монсерат"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_decimal_precision
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Настройки на десетична точност"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_url
@@ -5980,7 +5984,7 @@ msgstr ""
 #. module: base
 #: view:ir.translation:0
 msgid "Comments"
-msgstr ""
+msgstr "Коментари"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -5990,7 +5994,7 @@ msgstr "Етиопия"
 #. module: base
 #: model:ir.module.category,name:base.module_category_authentication
 msgid "Authentication"
-msgstr ""
+msgstr "Идентификация"
 
 #. module: base
 #: model:res.country,name:base.gd
@@ -6059,7 +6063,7 @@ msgstr "Свойство при изтриване на полета много-
 #. module: base
 #: model:ir.module.category,name:base.module_category_accounting_and_finance
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Счетоводство и финанси"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
@@ -6211,7 +6215,7 @@ msgstr "Името на група не може да започва с \"-\""
 #: view:ir.module.module:0
 #: model:ir.ui.menu,name:base.module_mi
 msgid "Apps"
-msgstr ""
+msgstr "Приложения"
 
 #. module: base
 #: view:ir.ui.view_sc:0
@@ -6264,7 +6268,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Phone:"
-msgstr ""
+msgstr "Телефон:"
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -6976,7 +6980,7 @@ msgstr ""
 #. module: base
 #: field:res.users,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base
 #: field:ir.cron,doall:0
@@ -6997,7 +7001,7 @@ msgstr "Свързване на обекти"
 #: field:ir.module.category,xml_id:0
 #: field:ir.ui.view,xml_id:0
 msgid "External ID"
-msgstr ""
+msgstr "Външен ID"
 
 #. module: base
 #: help:res.currency.rate,rate:0
@@ -7440,7 +7444,7 @@ msgstr "Върху множество документи"
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
@@ -7450,7 +7454,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Upgrade"
-msgstr ""
+msgstr "Надгради"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_action_rule
@@ -7488,7 +7492,7 @@ msgstr "Фарьорски острови"
 #. module: base
 #: field:ir.mail_server,smtp_encryption:0
 msgid "Connection Security"
-msgstr ""
+msgstr "Сигурност на връзката"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
@@ -7590,7 +7594,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Производител"
 
 #. module: base
 #: help:res.users,company_id:0
@@ -7894,7 +7898,7 @@ msgstr ""
 #. module: base
 #: view:ir.mail_server:0
 msgid "Test Connection"
-msgstr ""
+msgstr "Тестване на връзка"
 
 #. module: base
 #: model:res.country,name:base.mm
@@ -8433,7 +8437,7 @@ msgstr "ir.ui.menu"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project
 msgid "Project Management"
-msgstr ""
+msgstr "Управление на проекти"
 
 #. module: base
 #: view:ir.module.module:0
@@ -9158,7 +9162,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.title,shortcut:0
 msgid "Abbreviation"
-msgstr ""
+msgstr "Абревиатура"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@@ -9402,7 +9406,7 @@ msgstr "Справка"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_prof
 msgid "Prof."
-msgstr ""
+msgstr "Проф."
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:241
@@ -9430,7 +9434,7 @@ msgstr "Уеб-страница"
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
 msgid "None"
-msgstr ""
+msgstr "Няма"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
@@ -10492,7 +10496,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Street..."
-msgstr ""
+msgstr "Улица"
 
 #. module: base
 #: constraint:res.users:0
@@ -10517,7 +10521,7 @@ msgstr "Питкерн"
 #. module: base
 #: field:res.partner,category_id:0
 msgid "Tags"
-msgstr ""
+msgstr "Етикети"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -15599,7 +15603,7 @@ msgstr "Съдържание"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "Продажби и MRP управление"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_form
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 3aa1bd14699..91cc6e9175f 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,14 @@ 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-02-02 18:57+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\n"
+"PO-Revision-Date: 2014-04-19 16:21+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-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-20 05:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -8847,7 +8847,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.menu,needaction_enabled:0
 msgid "Target model uses the need action mechanism"
-msgstr ""
+msgstr "Ziel-Modell nutzt den need_action Mechanismus"
 
 #. module: base
 #: help:ir.model.fields,relation:0
@@ -17627,7 +17627,7 @@ msgstr "Helpdesk"
 #. module: base
 #: field:ir.rule,perm_write:0
 msgid "Apply for Write"
-msgstr ""
+msgstr "Zum Schreiben anwenden"
 
 #. module: base
 #: field:ir.ui.menu,parent_left:0
@@ -19100,7 +19100,7 @@ msgstr "Funktion"
 #. module: base
 #: field:ir.ui.menu,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Oberkonto Rechts"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
@@ -19175,7 +19175,7 @@ msgstr "Bedarfsmeldungen"
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline Edit"
-msgstr ""
+msgstr "Eingebettet Bearbeiten"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -19278,7 +19278,7 @@ msgstr "Exportbezeichnung"
 #: code:addons/base/ir/ir_sequence.py:259
 #, python-format
 msgid "Invalid prefix or suffix for sequence '%s'"
-msgstr ""
+msgstr "Ungültiges Prä- oder Suffix für die Folge '%s'"
 
 #. module: base
 #: help:res.partner,type:0
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index 10cd09c93b8..cb0c9f9b047 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -8,14 +8,14 @@ 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: 2012-12-21 23:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-04-18 14:24+0000\n"
+"Last-Translator: Harshraj Nanotiya <harshrajnanotiya@gmail.com>\n"
 "Language-Team: Hindi <hi@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-19 06:34+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,6 +25,9 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"धनादेश लेखन और मुद्रण मापांक.\n"
+"    "
 
 #. module: base
 #: view:res.partner.bank:0
@@ -39,12 +42,12 @@ msgstr "सैंट हेलेना"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "इतर समाकृति"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "DateTime"
-msgstr "वेड"
+msgstr "तारीखवक़्त"
 
 #. module: base
 #: code:addons/fields.py:652
@@ -58,17 +61,17 @@ msgstr ""
 #: field:ir.ui.view,arch:0
 #: field:ir.ui.view.custom,arch:0
 msgid "View Architecture"
-msgstr ""
+msgstr "आर्किटेक्चर"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "उद्धरण, बिक्री आदेश, वितरण और चालान नियंत्रण"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "कोई अंतर नहीं"
 
 #. module: base
 #: selection:base.language.install,lang:0

From 1ddeaa57a664d17a9579a56b37cc69ca4c8f285f Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 22 Apr 2014 09:38:26 +0200
Subject: [PATCH 57/72] [FIX] en_US typos - opw 606933

bzr revid: acl@openerp.com-20140422073826-0w9ne38ub8nh7p4v
---
 addons/stock/wizard/stock_location_product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 59d99167e6a..0c0f58f13f8 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -28,8 +28,8 @@ class stock_location_product(osv.osv_memory):
     _columns = {
         'from_date': fields.datetime('From'), 
         'to_date': fields.datetime('To'),
-        'type': fields.selection([('inventory','Analyse Current Inventory'),
-            ('period','Analyse a Period')], 'Analyse Type', required=True), 
+        'type': fields.selection([('inventory','Analyze current inventory'),
+            ('period','Analyze period')], 'Analysis Type', required=True), 
     }
 
     def action_open_window(self, cr, uid, ids, context=None):

From 69f13188d949f53cd7e497f912d1048b31e3fe3f Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 22 Apr 2014 09:40:39 +0200
Subject: [PATCH 58/72] [FIX] en_US typos - opw 606933

bzr revid: acl@openerp.com-20140422074039-oobrzrgpnf42v8au
---
 addons/stock/wizard/stock_location_product.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index ef7c9848160..c10a20397ee 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -28,8 +28,8 @@ class stock_location_product(osv.osv_memory):
     _columns = {
         'from_date': fields.datetime('From'), 
         'to_date': fields.datetime('To'),
-        'type': fields.selection([('inventory','Analyse Current Inventory'),
-            ('period','Analyse a Period')], 'Analyse Type', required=True), 
+        'type': fields.selection([('inventory','Analyze current inventory'),
+            ('period','Analyze a period')], 'Analysis Type', required=True), 
     }
 
     def action_open_window(self, cr, uid, ids, context=None):

From 89fd1bede48e5ee52c0d91f927b644a498cea8ab Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 22 Apr 2014 08:24:59 +0000
Subject: [PATCH 59/72] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
---
 addons/account/i18n/ja.po                   |  44 +--
 addons/account/i18n/nl.po                   |  22 +-
 addons/account/i18n/pl.po                   |  45 +--
 addons/account_analytic_analysis/i18n/pl.po |  14 +-
 addons/account_followup/i18n/pl.po          |  40 +--
 addons/account_payment/i18n/de.po           |  22 +-
 addons/account_payment/i18n/nl.po           |   8 +-
 addons/account_voucher/i18n/ja.po           |  12 +-
 addons/auth_signup/i18n/ja.po               | 320 ++++++++++++++++++++
 addons/hr/i18n/ja.po                        |   2 +-
 addons/hr_timesheet_sheet/i18n/pl.po        |  10 +-
 addons/mail/i18n/pl.po                      |  12 +-
 addons/membership/i18n/pl.po                |  12 +-
 addons/point_of_sale/i18n/ro.po             |  14 +-
 addons/product/i18n/pl.po                   |  22 +-
 15 files changed, 473 insertions(+), 126 deletions(-)
 create mode 100644 addons/auth_signup/i18n/ja.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 65df1d84819..7772ebb6db6 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.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-01 02:55+0000\n"
-"Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
+"PO-Revision-Date: 2014-04-21 15:10+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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-02 06:44+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -687,7 +687,7 @@ msgstr "主となる順序は現在と異なる必要があります。"
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "現在通貨が正しく設定されていません。"
 
 #. module: account
 #: field:account.journal,profit_account_id:0
@@ -739,6 +739,8 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: account
 #: view:account.period:0
@@ -1681,7 +1683,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr "請求と支払い"
+msgstr "請求と支払"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2897,7 +2899,7 @@ msgstr "分析勘定"
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr "デフォルト消費税（購入）"
+msgstr "デフォルト購買税"
 
 #. module: account
 #: view:account.account:0
@@ -2910,7 +2912,7 @@ msgstr "デフォルト消費税（購入）"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr "アカウント"
+msgstr "勘定科目"
 
 #. module: account
 #: code:addons/account/account.py:3541
@@ -2982,7 +2984,7 @@ msgstr "参照"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "購買税"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -3278,7 +3280,7 @@ msgstr "基本コードの金額"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "デフォルト消費税（売上）"
+msgstr "デフォルト販売税"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3364,7 +3366,7 @@ msgstr "会計年度の選択"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "日付範囲"
 
 #. module: account
 #: view:account.period:0
@@ -3450,7 +3452,7 @@ msgstr "合計数量"
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr "償却アカウント"
+msgstr "償却勘定"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -4026,7 +4028,7 @@ msgstr "詳細"
 #. module: account
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
-msgstr "購入税はデフォルトで新製品に割り当てられます。"
+msgstr "購買税はデフォルトで新製品に割り当てられます。"
 
 #. module: account
 #: report:account.account.balance:0
@@ -5046,7 +5048,7 @@ msgstr "会社の通貨と異なる場合はレポートに通貨欄を追加し
 #: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr "消費税（仕入） %.2f%%"
+msgstr "購買税 %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -5090,7 +5092,7 @@ msgstr "新規"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "販売税"
 
 #. module: account
 #: view:account.move:0
@@ -6381,7 +6383,7 @@ msgstr "日数"
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"."
-msgstr ""
+msgstr "勘定科目「%s」は勘定科目表「%s」に含まれないため、この仕訳を確定できません。"
 
 #. module: account
 #: view:account.financial.report:0
@@ -7671,7 +7673,7 @@ msgstr "請求年によるグループ"
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "購買税(%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7725,7 +7727,7 @@ msgstr "銀行取引明細書行"
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "デフォルト消費税（仕入）"
+msgstr "デフォルト購買税"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
@@ -9411,7 +9413,7 @@ msgstr "会計データ設定"
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr "消費税（仕入）（%）"
+msgstr "購買税(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
@@ -9797,7 +9799,7 @@ msgstr "一般的なレポート"
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr "デフォルト消費税（販売）"
+msgstr "デフォルト販売税"
 
 #. module: account
 #: report:account.overdue:0
@@ -10047,7 +10049,7 @@ msgstr "分析勘定より"
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "会計年度設定"
 
 #. module: account
 #: field:account.period,name:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 2ef093ec17e..089d94953d5 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-05 08:09+0000\n"
+"PO-Revision-Date: 2014-04-20 06: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-06 06:52+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1418,7 +1418,7 @@ msgstr "Vervangende belasting"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr "Credit centralisatie"
+msgstr "Totaal credit"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -2943,7 +2943,7 @@ msgstr "Grondslag teken (+/-)"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "Verzameld debet"
+msgstr "Totaal debet"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -3359,8 +3359,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
-"U dient een peningsbalans opgeven in een openingsdagboek met de instelling "
-"'gecentraliseerde tegenboeking'."
+"U dient een openingsbalans opgeven in een openingsdagboek met de instelling "
+"'Centrale tegenrekening'."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -6298,7 +6298,7 @@ msgstr "Vul dit formulier in als u geld in de kassa stopt."
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr "Te betalen bedrag"
+msgstr "Bedrag te betalen"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -7440,7 +7440,7 @@ msgstr "Boekingsregels"
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr "Centralisatie"
+msgstr "Balansboekingen"
 
 #. module: account
 #: view:account.account:0
@@ -9775,7 +9775,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
-msgstr "De boeking  (%s) voor voor centralisatie is bevestigd."
+msgstr "De balansboeking  (%s) is bevestigd."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -10581,7 +10581,7 @@ msgstr "Directe betaling"
 #: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
-msgstr " Centralisatie"
+msgstr " Balansboeking"
 
 #. module: account
 #: help:account.journal,type:0
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index f6783ec7741..147799acd44 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.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-12 14:24+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"PO-Revision-Date: 2014-04-18 13:02+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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-13 06:20+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -190,6 +190,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Kliknij aby utworzyć okres rozliczeniowy.\n"
+"</p><p>\n"
+"Typowo, rozliczeniowym okresem księgowym jest miesiąc lub kwartał.\n"
+"On odpowiada okresom rozliczeń podatkowych.\n"
+"</p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -745,6 +752,8 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Faktura_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: account
 #: view:account.period:0
@@ -999,7 +1008,7 @@ msgstr "Wrzesień"
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
 msgid "Latest Manual Reconciliation Processed:"
-msgstr ""
+msgstr "Ostatnio ręcznie uzgodniono:"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -1802,7 +1811,7 @@ msgstr "Powtarzanie"
 #. module: account
 #: report:account.invoice:0
 msgid "TIN :"
-msgstr ""
+msgstr "NIP:"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1844,7 +1853,7 @@ msgstr "Konto podatku dla korekt"
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2402,7 +2411,7 @@ msgstr "Dobra robota!"
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr "Środku trwałe"
+msgstr "Środki trwałe"
 
 #. module: account
 #: view:account.account:0
@@ -7636,7 +7645,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal Url"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
@@ -7671,7 +7680,7 @@ msgstr "Podatki stosowane w sprzedaży"
 #. module: account
 #: view:account.period:0
 msgid "Re-Open Period"
-msgstr ""
+msgstr "Otwórz okres ponownie"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -8423,7 +8432,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8433,7 +8442,7 @@ msgstr "Połącz z automatycznie generowanymi pozycjami zapisów"
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -8493,6 +8502,8 @@ msgid ""
 "You cannot delete an invoice which is not draft or cancelled. You should "
 "refund it instead."
 msgstr ""
+"Nie możńa usunąć faktury, która nie jest w stanie projektu lub anulownia. "
+"Możesz tylko utowrzyć jej korektę."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -8756,7 +8767,7 @@ msgstr "Brak roku podatkowego dla firmy"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -9024,7 +9035,7 @@ msgstr "Typy kont"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Faktura (Odn. ${object.number or 'n/a'})"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1210
@@ -10241,7 +10252,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:780
 #, python-format
 msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!"
-msgstr ""
+msgstr "Pozycja dziennika '%s' (id: %s), Zapis '%s' jest już uzgodniony!"
 
 #. module: account
 #: view:account.invoice:0
@@ -10255,7 +10266,7 @@ msgstr "Projekty faktur"
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing more to reconcile"
-msgstr ""
+msgstr "Nie ma nic więcej do uzgadniania"
 
 #. module: account
 #: view:cash.box.in:0
@@ -10515,7 +10526,7 @@ msgstr "Kurs waluty"
 #. module: account
 #: view:account.config.settings:0
 msgid "e.g. sales@openerp.com"
-msgstr ""
+msgstr "np. sales@openerp.com"
 
 #. module: account
 #: field:account.account,tax_ids:0
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index 2e3b31e0f46..7f07538092d 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.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-04-12 14:29+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"PO-Revision-Date: 2014-04-18 12:47+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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-13 06:20+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -244,6 +244,8 @@ msgid ""
 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
 "'normal','template'])]}"
 msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -299,6 +301,8 @@ msgid ""
 "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
 "('invoice_on_timesheets', '=', True)]}"
 msgstr ""
+"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
+"('invoice_on_timesheets', '=', True)]}"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -748,7 +752,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index 10c22770c1b..957ecfad6d5 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.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-11-17 11:10+0000\n"
-"Last-Translator: Mirosław Bojanowicz <miroslaw.bojanowicz@gmail.com>\n"
+"PO-Revision-Date: 2014-04-18 13:10+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -258,7 +258,7 @@ msgstr "Kontrahent"
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "Treść email"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -427,7 +427,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Due Days"
-msgstr ""
+msgstr "Dni zwłoki"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -443,7 +443,7 @@ msgstr "Ostatni monit o płatność"
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup
 msgid "Reconcile Invoices & Payments"
-msgstr ""
+msgstr "Uzgadnianie Faktur i Płatności"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_s
@@ -453,7 +453,7 @@ msgstr "Wykonaj manualnie monit o płatność"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Sp."
 
 #. module: account_followup
 #: field:account_followup.print,email_conf:0
@@ -528,6 +528,7 @@ msgstr "Monitowanie płatności"
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
+"Email nie został wysłany ponieważ adres email partnera nie został wypełniony"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -540,11 +541,13 @@ msgid ""
 "Optionally you can assign a user to this field, which will make him "
 "responsible for the action."
 msgstr ""
+"Opcjonalnie możesz przypisać użytkownika do tego pola, który stanie się "
+"odpowiedzialny za tę akcję."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Partners with Overdue Credits"
-msgstr ""
+msgstr "Partnerzy z przeterminowanymi płatnościami"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
@@ -562,7 +565,7 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " manual action(s) assigned:"
-msgstr ""
+msgstr " ręczna akcja przypisana do:"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -589,13 +592,13 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Account Move line"
-msgstr ""
+msgstr "Pozycja zapisu"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Listy i Email: Podsumowanie akcji"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -625,7 +628,7 @@ msgstr "Analiza monitów o płatność"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Action to be taken e.g. Give a phonecall, Check if it's paid, ..."
-msgstr ""
+msgstr "Akcja do podjęcia np. zadzwoń, sprawdź czy zapłacono, ..."
 
 #. module: account_followup
 #: help:res.partner,payment_next_action_date:0
@@ -828,7 +831,7 @@ msgstr "Kwota przeterminowana"
 #: code:addons/account_followup/account_followup.py:263
 #, python-format
 msgid "Lit."
-msgstr ""
+msgstr "Sp."
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -968,7 +971,7 @@ msgstr "Maksymalny poziom monitu"
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " had unknown email address(es)"
-msgstr ""
+msgstr " posiada nieznany adres email"
 
 #. module: account_followup
 #: help:account_followup.print,test_print:0
@@ -1003,7 +1006,7 @@ msgstr "Działanie monitowania płatności"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Załącz pozycje dziennika oznaczone jako sporne"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1051,7 +1054,7 @@ msgstr "Zapisy partnera"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "e.g. Call the customer, check if it's paid, ..."
-msgstr ""
+msgstr "np. Zadzwoń do klienta, sprawdż czy zapłacono, ..."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1250,3 +1253,6 @@ msgstr ""
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
 msgstr "Obietnica płatności klienta"
+
+#~ msgid "Responsible"
+#~ msgstr "Odpowiedzialny"
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index f0261cd72b9..03864ac637d 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/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-04-05 21:42+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\n"
+"PO-Revision-Date: 2014-04-21 16:47+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-06 06:53+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -87,13 +87,13 @@ msgstr "Rechnungswesen / Zahlungen"
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "Frei"
+msgstr "Kostenlos"
 
 #. module: account_payment
 #: view:payment.order.create:0
 #: field:payment.order.create,entries:0
 msgid "Entries"
-msgstr "Buchungen nach Journal"
+msgstr "Buchungen"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -149,7 +149,7 @@ msgstr "Gesamt (in eigener Währung)"
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr "Abgebrochen"
+msgstr "Storniert"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -295,7 +295,7 @@ msgstr "Konto Zahlungsempfänger"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr "Zahlungsaufträge suchen"
+msgstr "Zahlungsanweisungen durchsuchen"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -516,7 +516,7 @@ msgstr "Ihre Referenz"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
-msgstr "Zahlungsvorschlag"
+msgstr "Zahlungsanweisung"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -563,7 +563,7 @@ msgstr "Information"
 #: model:ir.model,name:account_payment.model_payment_order
 #: view:payment.order:0
 msgid "Payment Order"
-msgstr "Zahlungsvorschlag"
+msgstr "Zahlungsanweisung"
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -627,7 +627,7 @@ msgstr "Zahlungsverkehr"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr "Zahlungsvorschlag"
+msgstr "Zahlungsanweisung / Zahlung"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 199a14c102a..083779d3e7b 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/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: 2014-04-14 14:22+0000\n"
+"PO-Revision-Date: 2014-04-18 08:49+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-15 07:51+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -483,7 +483,7 @@ msgstr "Betaling vullen"
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr "Te betalen bedrag"
+msgstr "Bedrag te betalen"
 
 #. module: account_payment
 #: field:payment.line,amount:0
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 858cefd2703..3ae8d14aeb6 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.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-02-02 13:38+0000\n"
-"Last-Translator: hiro TAKADA <tkhiro0712@gmail.com>\n"
+"PO-Revision-Date: 2014-04-21 13:29+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese <ja@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-02-03 05:55+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -615,7 +615,7 @@ msgstr ""
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "為替差損勘定"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1203,7 +1203,7 @@ msgstr "年"
 #: field:account.config.settings,income_currency_exchange_account_id:0
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "為替差益勘定"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
diff --git a/addons/auth_signup/i18n/ja.po b/addons/auth_signup/i18n/ja.po
new file mode 100644
index 00000000000..fdf7fa20969
--- /dev/null
+++ b/addons/auth_signup/i18n/ja.po
@@ -0,0 +1,320 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+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-04-21 11:33+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
+"Language-Team: Japanese <ja@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-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"A password reset has been requested for this user. An email containing the "
+"following link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Confirm Password"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an invitation email"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Activated"
+msgstr "有効"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:266
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
+#, python-format
+msgid "Reset password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send reset password link by email"
+msgstr "パスワードリセットのリンクをEメール送信"
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"An invitation email containing the following subscription link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Never Connected"
+msgstr "接続履歴なし"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.set_password_email
+msgid ""
+"\n"
+"                \n"
+"                    <p>\n"
+"                        ${object.name},\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        You have been invited to connect to "
+"\"${object.company_id.name}\" in order to get access to your documents in "
+"OpenERP.\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        To accept the invitation, click on the following "
+"link:\n"
+"                    </p>\n"
+"                    <ul>\n"
+"                        <li><a href=\"${object.signup_url}\">Accept "
+"invitation to \"${object.company_id.name}\"</a></li>\n"
+"                    </ul>\n"
+"                    <p>\n"
+"                        Thanks,\n"
+"                    </p>\n"
+"                    <pre>\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"                    </pre>\n"
+"                \n"
+"            "
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:270
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:177
+#, python-format
+msgid "An email has been sent with credentials to reset your password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.set_password_email
+msgid "${object.company_id.name} invitation to connect on OpenERP"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
+#, python-format
+msgid "Sign Up"
+msgstr ""
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index 5781c49dd86..37d18af6be5 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.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-19 06:35+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 9af163bda08..3959ab40670 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.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-04-18 12:28+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -750,7 +750,7 @@ msgstr "Zakres kart"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr "Moja suma ibecności wg tygodni"
+msgstr "Moja suma obecności wg tygodni"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 362f48772e4..bf48cf3d199 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.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-02-22 18:50+0000\n"
-"Last-Translator: Dariusz Żbikowski <Unknown>\n"
+"PO-Revision-Date: 2014-04-18 12:38+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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-02-23 07:45+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -1510,7 +1510,7 @@ msgstr "Wiadomość Rich-text/HTML"
 #. module: mail
 #: view:mail.mail:0
 msgid "Creation Month"
-msgstr "Miesiąc tworzenia"
+msgstr "Miesiąc utworzenia"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -1661,7 +1661,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:213
 #, python-format
 msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Poczekaj, aż plik zostanie załadowany."
 
 #. module: mail
 #: view:mail.group:0
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index 536a8c38ec1..178420d3139 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.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-04-18 12:45+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -160,7 +160,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Produkt członka"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
@@ -233,7 +233,7 @@ msgstr "Od"
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "Błąd! Produkt tego członka jest przeterminowany"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 9917f819e03..5d53a0f19a3 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.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-24 20:34+0000\n"
-"Last-Translator: Dorin <dhongu@gmail.com>\n"
+"PO-Revision-Date: 2014-04-20 07:24+0000\n"
+"Last-Translator: Simonel Criste <simi@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@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-25 06:39+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -412,6 +412,8 @@ msgid ""
 "You cannot change the partner of a POS order for which an invoice has "
 "already been issued."
 msgstr ""
+"Nu se poate schimba partenerul pe un bon de POS pentru care a fost deja "
+"emisa o factură."
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -473,7 +475,7 @@ msgstr "Cant. totala"
 #: code:addons/point_of_sale/static/src/js/screens.js:874
 #, python-format
 msgid "Back"
-msgstr ""
+msgstr "Înapoi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
@@ -536,7 +538,7 @@ msgstr "Validati & Deschideti Sesiunea"
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "In Progress"
-msgstr "In curs de desfasurare"
+msgstr "În desfasurare"
 
 #. module: point_of_sale
 #: view:pos.session:0
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index a4f00056046..38d605566d2 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.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: 2013-09-25 11:56+0000\n"
-"Last-Translator: Judyta Kazmierczak <judyta.kazmierczak@openglobe.pl>\n"
+"PO-Revision-Date: 2014-04-18 12:42+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) <darek@krokus.com.pl>\n"
 "Language-Team: Polish <pl@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:27+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -25,7 +25,7 @@ msgstr "Liczba warstw"
 #. module: product
 #: view:res.partner:0
 msgid "the parent company"
-msgstr ""
+msgstr "Firma nadrzędna"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -216,7 +216,7 @@ msgstr "Kategoria nadrzędna"
 #. module: product
 #: model:product.template,description:product.product_product_33_product_template
 msgid "Headset for laptop PC with USB connector."
-msgstr ""
+msgstr "Komputerowy zestaw słuchawkowy USB"
 
 #. module: product
 #: model:product.category,name:product.product_category_all
@@ -746,7 +746,7 @@ msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi"
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13 Barcode"
-msgstr ""
+msgstr "Kod kreskowy EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -1200,7 +1200,7 @@ msgstr "Wiadomości i historia komunikacji"
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1210,7 +1210,7 @@ msgstr "Zdezaktualizowany"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: field:product.template,standard_price:0
@@ -1371,6 +1371,8 @@ msgid ""
 "This field holds the image used as image for the product, limited to "
 "1024x1024px."
 msgstr ""
+"To pole utrzymuje obraz użyty jako zdjęcie produktu, limitowany rozmiar "
+"1024x1024."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1548,7 +1550,7 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom

From e3ecf7f4d4da9aa285f529b0be931c6de333ae60 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@openerp.com>
Date: Tue, 22 Apr 2014 10:58:37 +0200
Subject: [PATCH 60/72] [FIX] en_US typos - opw 606919

bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
---
 addons/hr/static/description/index.html            | 4 ++--
 addons/mrp/static/description/index.html           | 4 ++--
 addons/note/__openerp__.py                         | 4 ++--
 addons/note/static/description/index.html          | 2 +-
 addons/point_of_sale/static/description/index.html | 6 +++---
 addons/stock/static/description/index.html         | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/hr/static/description/index.html b/addons/hr/static/description/index.html
index f97cb462fe3..55e54aa92fb 100644
--- a/addons/hr/static/description/index.html
+++ b/addons/hr/static/description/index.html
@@ -28,7 +28,7 @@ Get all your HR operations managed easily: knowledge sharing, recruitments, appr
          <h2 class="oe_slogan">Manage Your Employees</h2>
          <div class="oe_span6">
             <p class='oe_mt32'>
-Oversee all important information in your company address book. Some information are restricted to HR managers, others are public to easily find colleagues.
+Oversee all important information in your company address book. Some information are restricted to HR managers, others are public to easily look colleagues.
 			</p><p>
 Record employee contracts and get alerts when they have to be renewed.
             </p>
@@ -154,7 +154,7 @@ Inspire achievement with challenges, goals and rewards. Define clear objectives
             </p>
         </div>
         <div class="oe_span4 oe_centered">
-            <h3>Personnal Objectives</h3>
+            <h3>Personal Objectives</h3>
             <div class="oe_row_img">
                 <img class="oe_picture" src="crm_game_02.png">
             </div>
diff --git a/addons/mrp/static/description/index.html b/addons/mrp/static/description/index.html
index d44da3f37b1..d6524b6e554 100644
--- a/addons/mrp/static/description/index.html
+++ b/addons/mrp/static/description/index.html
@@ -63,7 +63,7 @@ manufacturing orders.
 
 <section class="oe_container oe_dark">
     <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Get Flexibility In All Opertions</h2>
+        <h2 class="oe_slogan">Get Flexibility In All Operations</h2>
         <div class="oe_span6">
             <p class="oe_mt32">
             Edit manually all proposed operations at any level of the progress.
@@ -110,7 +110,7 @@ meets your delivery schedule dates.
         <div class="oe_span12">
             <p>
 Organize manufacturing orders and work orders the way you like it. Process next
-orders from the list view, control inthe calendar view and edit the proposed
+orders from the list view, control in the calendar view and edit the proposed
 schedule in the Gantt view.
             </p>
         </div>
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 2653c558923..e94a5f60181 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -27,8 +27,8 @@
 This module allows users to create their own notes inside OpenERP
 =================================================================
 
-Use notes to write meeting minutes, organize ideas, organize personnal todo
-lists, etc. Each user manages his own personnal Notes. Notes are available to
+Use notes to write meeting minutes, organize ideas, organize personal todo
+lists, etc. Each user manages his own personal Notes. Notes are available to
 their authors only, but they can share notes to others users so that several
 people can work on the same note in real time. It's very efficient to share
 meeting minutes.
diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html
index dc688859334..b9a60d3735d 100644
--- a/addons/note/static/description/index.html
+++ b/addons/note/static/description/index.html
@@ -12,7 +12,7 @@
         </div>
         <div class="oe_span6">
             <p class="oe_mt32">
-Organize yourself with efficient todo lists and notes. From personnal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents.
+Organize yourself with efficient todo lists and notes. From personal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents.
             </p>
             <div class="oe_centeralign oe_websiteonly">
                 <a href="http://www.openerp.com/start?app=note" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html
index 7f1b7a5c097..cecafc69b68 100644
--- a/addons/point_of_sale/static/description/index.html
+++ b/addons/point_of_sale/static/description/index.html
@@ -117,9 +117,9 @@
         </div>
         <div class='oe_span4 '>
             <img class="oe_picture oe_screenshot" src="pos_ui_02.png">
-            <h3>Blasting fast search</h3>
+            <h3>Blazing fast search</h3>
             <p>
-            Scan products, browse through hyerarchical categories, or get quick
+            Scan products, browse through hierarchical categories, or get quick
             information about products with the blasting fast filter accross
             all your products.
             </p>
@@ -135,7 +135,7 @@
         </div>
         <div class='oe_span6'>
             <p>
-            Consolidate all your sales channel in real time: stores, ecommerce, sales teams.
+            Consolidate all your sales channels in real time: stores, ecommerce, sales teams.
             Get real time control of the inventory and accurate forecasts to manage procurements.
             </p>
             <p>
diff --git a/addons/stock/static/description/index.html b/addons/stock/static/description/index.html
index dd7fbe568f7..1ee9047db42 100644
--- a/addons/stock/static/description/index.html
+++ b/addons/stock/static/description/index.html
@@ -69,7 +69,7 @@ planning and jobs with the scheduler to reduce your process time.
           <p class='oe_mt32'>
 Get your pickings, packings, receptions and internal moves scheduled
 automatically by OpenERP using your own routing rules.  Define push and pull
-rules to organize a warehouse or to manage produts's moves between several
+rules to organize a warehouse or to manage products moves between several
 warehouses.
           </p>
         </div>

From 322eebf3f746bf22b86c43c348202529f4fab000 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 22 Apr 2014 12:50:39 +0200
Subject: [PATCH 61/72] [FIX] sale: move demo data from sale to sale_stock

A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data

bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
---
 addons/sale/sale_demo.xml             | 1 -
 addons/sale_stock/sale_stock_demo.xml | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 428b586ffa8..f5566e68365 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -329,7 +329,6 @@ Thanks!</field>
             <field name="type">service</field>
             <field name="list_price">150.0</field>
             <field name="standard_price">100.0</field>
-            <field name="supply_method">produce</field> <!-- TODO this is a procurement field, which is not a sale dependency -->
             <field name="uom_id" ref="product.product_uom_day"/>
             <field name="uom_po_id" ref="product.product_uom_day"/>
             <field name="company_id" eval="[]"/>
diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml
index 15b1e60b829..356f6a8fa38 100644
--- a/addons/sale_stock/sale_stock_demo.xml
+++ b/addons/sale_stock/sale_stock_demo.xml
@@ -38,6 +38,10 @@
              <field name="type">make_to_order</field>
         </record>
 
+        <record id="sale.advance_product_0" model="product.product">
+            <field name="supply_method">produce</field>
+        </record>
+
         <!-- Run all schedulers -->
         <function model="procurement.order" name="run_scheduler"/>
         

From 70dc4456d75baace439064973f467ec5d5dac848 Mon Sep 17 00:00:00 2001
From: "Ravi Gohil (OpenERP)" <rgo@tinyerp.com>
Date: Tue, 22 Apr 2014 16:41:15 +0530
Subject: [PATCH 62/72] [FIX] account: Advance search on 'Tax' from journal
 items leads to traceback if we do not select any journal. (Maintenance Case:
 606875)

bzr revid: rgo@tinyerp.com-20140422111115-17e6juruftp3oj2r
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index e18df8a0d31..36d0ba0947f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1964,7 +1964,7 @@ class account_tax(osv.osv):
             elif context.get('type') in ('in_invoice','in_refund'):
                 args += [('type_tax_use','in',['purchase','all'])]
 
-        if context and context.has_key('journal_id'):
+        if context and context.get('journal_id'):
             journal = journal_pool.browse(cr, uid, context.get('journal_id'))
             if journal.type in ('sale', 'purchase'):
                 args += [('type_tax_use','in',[journal.type,'all'])]

From 60cafe4da2a6467f83dece37c9b07e24079feacd Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 22 Apr 2014 14:31:53 +0200
Subject: [PATCH 63/72] [FIX] website_event_sale: hide event tickets that are
 not for sale anymore

This should ideally be based on an extra timezone
field on each event, pending fix later in trunk.

bzr revid: odo@openerp.com-20140422123153-m6za55oqkiqysalx
---
 addons/event_sale/event_sale.py                       | 11 +++++++++++
 .../website_event_sale/views/website_event_sale.xml   |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 657c9427971..b9db63e125c 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -167,12 +167,23 @@ class event_ticket(osv.osv):
                 if ticket.seats_max > 0 else None
         return res
 
+    def _is_expired(self, cr, uid, ids, field_name, args, context=None):
+        # FIXME: A ticket is considered expired when the deadline is passed. The deadline should
+        #        be considered in the timezone of the event, not the timezone of the user!
+        #        Until we add a TZ on the event we'll use the context's current date, more accurate
+        #        than using UTC all the time.
+        current_date = fields.date.context_today(self, cr, uid, context=context)
+        return {ticket.id: ticket.deadline and ticket.deadline < current_date
+                      for ticket in self.browse(cr, uid, ids, context=context)}
+        
+
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'event_id': fields.many2one('event.event', "Event", required=True, ondelete='cascade'),
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[("event_type_id", "!=", False)]),
         'registration_ids': fields.one2many('event.registration', 'event_ticket_id', 'Registrations'),
         'deadline': fields.date("Sales End"),
+        'is_expired': fields.function(_is_expired, type='boolean', string='Is Expired'),
         'price': fields.float('Price'),
         'seats_max': fields.integer('Maximum Avalaible Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )"),
         'seats_reserved': fields.function(_get_seats, string='Reserved Seats', type='integer', multi='seats_reserved'),
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index c3e08031ddb..9465d847375 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -40,7 +40,8 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr t-foreach="event.event_ticket_ids" t-as="ticket">
+                    <t t-foreach="event.event_ticket_ids" t-as="ticket">
+                      <tr t-if="not ticket.is_expired">
                         <td>
                             <div t-field="ticket.name"/>
                             <div><small t-field="ticket.product_id.description_sale"/></div>
@@ -67,7 +68,8 @@
                             </select>
                             <span t-if="not ticket.seats_available">Sold Out</span>
                         </td>
-                    </tr>
+                      </tr>
+                    </t>
                 </tbody>
             </table>
             <button type="submit" class="btn btn-primary btn-lg pull-right" t-if="event.seats_available">Order Now</button>

From df85f3baf6996af78a886a8e9a0399f51531238a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 22 Apr 2014 15:05:06 +0200
Subject: [PATCH 64/72] [FIX] note: typo in manifest

bzr revid: dle@openerp.com-20140422130506-934g9o433kdhmwnp
---
 addons/note/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 2653c558923..e94a5f60181 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -27,8 +27,8 @@
 This module allows users to create their own notes inside OpenERP
 =================================================================
 
-Use notes to write meeting minutes, organize ideas, organize personnal todo
-lists, etc. Each user manages his own personnal Notes. Notes are available to
+Use notes to write meeting minutes, organize ideas, organize personal todo
+lists, etc. Each user manages his own personal Notes. Notes are available to
 their authors only, but they can share notes to others users so that several
 people can work on the same note in real time. It's very efficient to share
 meeting minutes.

From b981f3f8efa54db76451645562057fff26baab69 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 22 Apr 2014 17:07:10 +0200
Subject: [PATCH 65/72] [FIX] *: in search views, use operator=child_of instead
 of filter_domain with a child_of domain

operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
---
 addons/account/account_invoice_view.xml     | 2 +-
 addons/account/project/project_view.xml     | 2 +-
 addons/crm/crm_lead_view.xml                | 4 ++--
 addons/crm/crm_phonecall_view.xml           | 2 +-
 addons/project_issue/project_issue_view.xml | 2 +-
 addons/purchase/purchase_view.xml           | 4 ++--
 addons/sale/sale_view.xml                   | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 94b98b78907..947aad481d1 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -457,7 +457,7 @@
                     <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
-                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="user_id" string="Salesperson"/>
                     <field name="period_id" string="Period"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 00547261ca2..600056c05f1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -31,7 +31,7 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="date"/>
-                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <field name="user_id"/>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7c087ebd5a8..e0311d1db40 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -328,7 +328,7 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="user_id"/>
-                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="create_date"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
                     <separator/>
@@ -546,7 +546,7 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="user_id"/>
-                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <separator/>
                     <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
                     <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2d456cc053a..21e18d8affc 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -186,7 +186,7 @@
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
-               <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+               <field name="partner_id" operator="child_of"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>
                <group expand="0" string="Group By...">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 74c83afd304..494f054f8e8 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -150,7 +150,7 @@
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
-                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3504d49a884..3c8afceb6e7 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -270,7 +270,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -297,7 +297,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f12cba6ac9f..16e9e2a6305 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -307,7 +307,7 @@
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
                     <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="partner_id" operator="child_of"/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <group expand="0" string="Group By...">
@@ -471,7 +471,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
+                    <field name="order_partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
@@ -497,7 +497,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
+                    <field name="order_partner_id" operator="child_of"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">

From c6189d91a0f3a313393e48e2f3dc86d34c84542e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 22 Apr 2014 17:07:36 +0200
Subject: [PATCH 66/72] [FIX] base: in partner search view, use
 operator=child_of instead of filter_domain with a child_of domain

operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name

bzr revid: dle@openerp.com-20140422150736-o2t3eank6yqttlel
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 9ff9649b8b7..fd394549f4b 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -340,7 +340,7 @@
                    <separator/>
                    <field name="category_id" string="Tag" filter_domain="[('category_id','ilike', self)]"/>
                    <field name="user_id"/>
-                   <field name="parent_id" domain="[('is_company','=',1)]" filter_domain="[('parent_id','child_of',[self])]"/>
+                   <field name="parent_id" domain="[('is_company','=',1)]" operator="child_of"/>
                    <group expand="0" string="Group By...">
                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
                        <filter string="Company" context="{'group_by': 'parent_id'}"/>

From 6083ed4b46dab046fe4e21bdb479afb7cd1d3216 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 22 Apr 2014 17:09:18 +0200
Subject: [PATCH 67/72] [FIX] web: abitility to do exact id matching with
 child_of operator for searchs on many2one fields

bzr revid: dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g
---
 addons/web/static/src/js/search.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index b82ad6504a9..1f616202c3f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1578,8 +1578,11 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
         return facetValue.get('label');
     },
     make_domain: function (name, operator, facetValue) {
-        if (operator === this.default_operator) {
+        switch(operator){
+        case this.default_operator:
             return [[name, '=', facetValue.get('value')]];
+        case 'child_of':
+            return [[name, 'child_of', facetValue.get('value')]];
         }
         return this._super(name, operator, facetValue);
     },

From 56038a3cf936e028c3a5ba47c3f9665de98e518c Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Tue, 22 Apr 2014 11:25:29 +0200
Subject: [PATCH 68/72] [IMP] views

bzr revid: rim@openerp.com-20140422092529-b2ked8791lqkumb0
---
 addons/stock/stock_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f6c611e7a41..37a4c93c219 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1557,12 +1557,12 @@
             <field name="name">stock.incoterms.form</field>
             <field name="model">stock.incoterms</field>
             <field name="arch" type="xml">
-                <form string="Incoterms" version="7.0" class="col-md-6">
-                    <group>
+                <form string="Incoterms" version="7.0">
+                    <sheet>
                         <field name="name"/>
                         <field name="code"/>
                         <field name="active"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -1690,11 +1690,11 @@
             <field name="name">Stock Journals</field>
             <field name="model">stock.journal</field>
             <field name="arch" type="xml">
-                <form string="Stock Journal" version="7.0" class="col-md-6">
-                    <group>
+                <form string="Stock Journal" version="7.0">
+                    <sheet>
                         <field name="name"/>
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'stock.group_stock_manager']}"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 43ffc66f7c0c01cd444f6f38bfbdc0fafed0fd26 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Tue, 22 Apr 2014 11:48:52 +0200
Subject: [PATCH 69/72] [FIX] purchase_requisition: views

bzr revid: rim@openerp.com-20140422094852-b9kds2wmmyjb2p3h
---
 addons/purchase_requisition/purchase_requisition_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index edb39de7637..9901fbdb1f1 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -37,14 +37,14 @@
                 <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
             </header>
             <sheet>
-                <div class="oe_edit_only pull-left">
-                    <label for="name" class="oe_inline"/>
+                <div class="pull-left">
+                    <label for="name" class="oe_edit_only oe_inline"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
                     </h1>
                 </div>
-                <div class="oe_edit_only pull-left">
-                    <label for="origin" class="oe_inline"/>
+                <div class="pull-left">
+                    <label for="origin" class="oe_edit_only oe_inline"/>
                     <h1>
                         <label string="," attrs="{'invisible':[('origin','=',False)]}"/>
                         <field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>

From 60b6ac6669cb72d5de79590094c156a683be2abb Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP)" <mka@tinyerp.com>
Date: Tue, 22 Apr 2014 15:19:26 +0530
Subject: [PATCH 70/72] [IMP] used osv.TransientModel instead of osv.osv_memory
 in account_followup and removed rml report reference

bzr revid: mka@tinyerp.com-20140422094926-gqc3s87t7ha517q2
---
 addons/account_followup/account_followup.py   | 22 ++++++++++---------
 .../account_followup_view.xml                 |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 2eadda052f2..2d1d74afc07 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -478,19 +478,21 @@ class res_partner(osv.osv):
                                                     multi="followup",
                                                     fnct_search=_payment_earliest_date_search),
         }
-class account_config_settings(osv.osv_memory):
+
+
+class account_config_settings(osv.TransientModel):
     _name = 'account.config.settings'
     _inherit = 'account.config.settings'
     
     def open_followup_level_form(self, cr, uid, ids, context=None):
-        ir_model_obj = self.pool.get('ir.model.data')
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        res_ids = self.pool.get('account_followup.followup').search(cr, uid, [('company_id','=', user.company_id.id)])
+        res_ids = self.pool.get('account_followup.followup').search(cr, uid,[])
         
-        model, action_id = ir_model_obj.get_object_reference(cr, uid, 'account_followup', 'action_account_followup_definition_form')
-        action = self.pool.get(model).read(cr, uid, action_id, context=context)
-        if res_ids:
-            action['res_id'] = res_ids[0]
-            action['views'] = [(False, u'form'), (False, u'tree')]
-        return action
+        return {
+                 'type': 'ir.actions.act_window',
+                 'name': 'Payment Follow-ups',
+                 'res_model': 'account_followup.followup',
+                 'res_id': res_ids and res_ids[0] or False,
+                 'view_mode': 'form,tree',
+         }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 24fff3a8833..94b4f6dce9a 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -138,7 +138,6 @@
 
 
         <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account_followup_main_menu" name="Follow-up Levels"/>
-        <report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Follow-up Report"/>
 
         <record id="account_move_line_partner_tree" model="ir.ui.view">
             <field name="name">account.move.line.partner.tree</field>

From 8a9ca4641ff72c2f1d06d848c92943972829700e Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Tue, 22 Apr 2014 12:03:06 +0200
Subject: [PATCH 71/72] [FIX] do not use bootstrap wildly in form views

bzr revid: rim@openerp.com-20140422100306-bj8jxlatjmko4oi5
---
 addons/product/product_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 61a88fec908..c5437ed3e33 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -584,11 +584,13 @@
             <field name="name">product.ul.form.view</field>
             <field name="model">product.ul</field>
             <field name="arch" type="xml">
-                <form string="Packaging" version="7.0" class="col-md-6">
+                <form string="Packaging" version="7.0">
+                    <sheet>
                     <group>
                         <field name="name"/>
                         <field name="type"/>
                     </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From afd6aa247234a714ec5ca5d7851c8f71cf7b089b Mon Sep 17 00:00:00 2001
From: "Mansi Kariya (OpenERP)" <mka@tinyerp.com>
Date: Tue, 22 Apr 2014 16:08:02 +0530
Subject: [PATCH 72/72] [IMP] Added context.

bzr revid: mka@tinyerp.com-20140422103802-jhcwotzhh6chcmqu
---
 addons/account_followup/account_followup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 2d1d74afc07..820a179efdb 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -485,7 +485,7 @@ class account_config_settings(osv.TransientModel):
     _inherit = 'account.config.settings'
     
     def open_followup_level_form(self, cr, uid, ids, context=None):
-        res_ids = self.pool.get('account_followup.followup').search(cr, uid,[])
+        res_ids = self.pool.get('account_followup.followup').search(cr, uid, [], context=context)
         
         return {
                  'type': 'ir.actions.act_window',