From 50d67b6461474f2a62af2071b23fbc0a573cdc92 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 23 Dec 2013 15:53:29 +0530
Subject: [PATCH 001/134] [IMP] post welcome employee message only if employee
 created from applicant.

bzr revid: tpa@tinyerp.com-20131223102329-147mo4x9o1mc59lq
---
 addons/hr/hr.py                         | 23 -----------------------
 addons/hr_recruitment/hr_recruitment.py | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 37d1bae7fea..a7c1efc9e8e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -229,29 +229,6 @@ class hr_employee(osv.osv):
         'color': 0,
     }
 
-    def create(self, cr, uid, data, context=None):
-        if context is None:
-            context = {}
-        create_ctx = dict(context, mail_create_nolog=True)
-        employee_id = super(hr_employee, self).create(cr, uid, data, context=create_ctx)
-        employee = self.browse(cr, uid, employee_id, context=context)
-        if employee.user_id:
-            res_users = self.pool['res.users']
-            # send a copy to every user of the company
-            # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
-            _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
-            user_ids = res_users.search(cr, uid, [('company_id', '=', employee.user_id.company_id.id),
-                                                  ('groups_id', 'in', group_id)])
-            partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
-        else:
-            partner_ids = []
-        self.message_post(cr, uid, [employee_id],
-            body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
-            partner_ids=partner_ids,
-            subtype='mail.mt_comment', context=context
-        )
-        return employee_id
-
     def unlink(self, cr, uid, ids, context=None):
         resource_ids = []
         for employee in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c293c689a5b..7386893b296 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -437,6 +437,7 @@ class hr_applicant(osv.Model):
         hr_employee = self.pool.get('hr.employee')
         model_data = self.pool.get('ir.model.data')
         act_window = self.pool.get('ir.actions.act_window')
+        res_users = self.pool['res.users']
         emp_id = False
         for applicant in self.browse(cr, uid, ids, context=context):
             address_id = contact_name = False
@@ -453,6 +454,21 @@ class hr_applicant(osv.Model):
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      })
+                partner_ids = []
+                create_ctx = dict(context, mail_create_nolog=True)
+                employee = hr_employee.browse(cr, uid, emp_id, context=context)
+                if employee.user_id:
+                    # send a copy to every user of the company
+                    # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
+                    _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
+                    user_ids = res_users.search(cr, uid, [('company_id', '=', employee.user_id.company_id.id),
+                                                  ('groups_id', 'in', group_id)], context=context)
+                    partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
+                hr_employee.message_post(cr, uid, [emp_id],
+                    body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
+                    partner_ids=partner_ids,
+                    subtype='mail.mt_comment', context=context
+                )
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
             else:
                 raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))

From d133efb0077dc9a598f53c99c4ac9604912077c1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 27 Dec 2013 18:32:34 +0530
Subject: [PATCH 002/134] [IMP] improved log at creation time

bzr revid: tpa@tinyerp.com-20131227130234-bmem1riolid98kk6
---
 addons/hr_recruitment/hr_recruitment.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7386893b296..3d37b29f449 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -446,6 +446,7 @@ class hr_applicant(osv.Model):
                 contact_name = self.pool.get('res.partner').name_get(cr, uid, [applicant.partner_id.id])[0][1]
             if applicant.job_id and (applicant.partner_name or contact_name):
                 applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
+                create_ctx = dict(context, mail_create_nolog=True)
                 emp_id = hr_employee.create(cr, uid, {'name': applicant.partner_name or contact_name,
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
@@ -453,9 +454,8 @@ class hr_applicant(osv.Model):
                                                      'address_id': applicant.company_id and applicant.company_id.partner_id and applicant.company_id.partner_id.id or False,
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
-                                                     })
+                                                     }, context=create_ctx)
                 partner_ids = []
-                create_ctx = dict(context, mail_create_nolog=True)
                 employee = hr_employee.browse(cr, uid, emp_id, context=context)
                 if employee.user_id:
                     # send a copy to every user of the company

From 07746868f66cd1c54fed0c16b49fc57154fc8252 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 3 Jan 2014 18:12:34 +0530
Subject: [PATCH 003/134] [FIX] improved code to serch users of company based
 on eployees company intead of using company of related user of employee

bzr revid: tpa@tinyerp.com-20140103124234-a3euvu0e6bs1n14q
---
 addons/hr_recruitment/hr_recruitment.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3d37b29f449..a9f14564aa9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -455,15 +455,13 @@ class hr_applicant(osv.Model):
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      }, context=create_ctx)
-                partner_ids = []
                 employee = hr_employee.browse(cr, uid, emp_id, context=context)
-                if employee.user_id:
-                    # send a copy to every user of the company
-                    # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
-                    _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
-                    user_ids = res_users.search(cr, uid, [('company_id', '=', employee.user_id.company_id.id),
-                                                  ('groups_id', 'in', group_id)], context=context)
-                    partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
+                # send a copy to every user of the company
+                # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
+                _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
+                user_ids = res_users.search(cr, uid, [('company_id', '=', employee.company_id.id),
+                                              ('groups_id', 'in', group_id)], context=context)
+                partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
                 hr_employee.message_post(cr, uid, [emp_id],
                     body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
                     partner_ids=partner_ids,

From 181aee3c506c5ccac3dd9cbcbe7f85c1c693855b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 5 Feb 2014 11:35:00 +0530
Subject: [PATCH 004/134] [IMP] as per TDE's suggetion dont move code of
 posting message in hr_recruitment just do it based on context key

bzr revid: tpa@tinyerp.com-20140205060500-v70n8oy9rm1dflwf
---
 addons/hr/hr.py                         | 26 +++++++++++++++++++++++++
 addons/hr_recruitment/hr_recruitment.py | 15 +-------------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 5b38676d459..e07fdbf1a5b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -227,6 +227,32 @@ class hr_employee(osv.osv):
         'color': 0,
     }
 
+    def create(self, cr, uid, data, context=None):
+        if context is None:
+            context = {}
+        if context.get("mail_broadcast"):
+            create_ctx = dict(context, mail_create_nolog=True)
+            employee_id = super(hr_employee, self).create(cr, uid, data, context=create_ctx)
+            employee = self.browse(cr, uid, employee_id, context=context)
+            if employee.user_id:
+                res_users = self.pool['res.users']
+                # send a copy to every user of the company
+                # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
+                _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
+                user_ids = res_users.search(cr, uid, [('company_id', '=', employee.user_id.company_id.id),
+                                                  ('groups_id', 'in', group_id)], context=context)
+                partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
+            else:
+                partner_ids = []
+            self.message_post(cr, uid, [employee_id],
+                body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
+                partner_ids=partner_ids,
+                subtype='mail.mt_comment', context=context
+            )
+        else:
+            employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
+        return employee_id
+
     def unlink(self, cr, uid, ids, context=None):
         resource_ids = []
         for employee in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index a6c1dd30249..57fd37bf509 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -437,7 +437,6 @@ class hr_applicant(osv.Model):
         hr_employee = self.pool.get('hr.employee')
         model_data = self.pool.get('ir.model.data')
         act_window = self.pool.get('ir.actions.act_window')
-        res_users = self.pool['res.users']
         emp_id = False
         for applicant in self.browse(cr, uid, ids, context=context):
             address_id = contact_name = False
@@ -446,7 +445,7 @@ class hr_applicant(osv.Model):
                 contact_name = self.pool.get('res.partner').name_get(cr, uid, [applicant.partner_id.id])[0][1]
             if applicant.job_id and (applicant.partner_name or contact_name):
                 applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
-                create_ctx = dict(context, mail_create_nolog=True)
+                create_ctx = dict(context, mail_broadcast=True)
                 emp_id = hr_employee.create(cr, uid, {'name': applicant.partner_name or contact_name,
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
@@ -455,18 +454,6 @@ class hr_applicant(osv.Model):
                                                      'work_email': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.email or False,
                                                      'work_phone': applicant.department_id and applicant.department_id.company_id and applicant.department_id.company_id.phone or False,
                                                      }, context=create_ctx)
-                employee = hr_employee.browse(cr, uid, emp_id, context=context)
-                # send a copy to every user of the company
-                # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
-                _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
-                user_ids = res_users.search(cr, uid, [('company_id', '=', employee.company_id.id),
-                                              ('groups_id', 'in', group_id)], context=context)
-                partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
-                hr_employee.message_post(cr, uid, [emp_id],
-                    body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
-                    partner_ids=partner_ids,
-                    subtype='mail.mt_comment', context=context
-                )
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
             else:
                 raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))

From 1f21989bbbd3e63ea1aea7d0698afa8cfb306620 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Feb 2014 17:41:13 +0100
Subject: [PATCH 005/134] [FIX] website_livechat: add res_config file for
 configuration of the channel

bzr revid: chm@openerp.com-20140210164113-41vl0ftlk9eybnlw
---
 addons/website_livechat/__openerp__.py        |  7 ++----
 addons/website_livechat/models/website.py     |  9 +++++++-
 addons/website_livechat/views/res_config.xml  | 22 +++++++++++++++++++
 .../views/website_livechat.xml                | 16 --------------
 4 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 addons/website_livechat/views/res_config.xml

diff --git a/addons/website_livechat/__openerp__.py b/addons/website_livechat/__openerp__.py
index 0ab7781b7ab..5220fc47bb6 100644
--- a/addons/website_livechat/__openerp__.py
+++ b/addons/website_livechat/__openerp__.py
@@ -12,10 +12,7 @@ OpenERP Website LiveChat
     'depends': ['website', 'im_livechat'],
     'installable': True,
     'data': [
-        'views/website_livechat.xml'
+        'views/website_livechat.xml',
+        'views/res_config.xml'
     ],
-    'demo': [ ],
-    'js': [],
-    'qweb': [],
-    'css': [],
 }
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
index 7e86042a67a..3e3df1c5bdc 100644
--- a/addons/website_livechat/models/website.py
+++ b/addons/website_livechat/models/website.py
@@ -5,4 +5,11 @@ class website(osv.osv):
 
     _columns = {
         'channel_id': fields.many2one('im_livechat.channel', string="Channel"),
-    }
\ No newline at end of file
+    }
+
+class website_config_settings(osv.osv_memory):
+    _inherit = 'website.config.settings'
+
+    _columns = {
+        'channel_id': fields.related('website_id', 'channel_id', type='many2one', relation='im_livechat.channel', string='Live Chat Channel'),
+    }
diff --git a/addons/website_livechat/views/res_config.xml b/addons/website_livechat/views/res_config.xml
new file mode 100644
index 00000000000..ac69929ca63
--- /dev/null
+++ b/addons/website_livechat/views/res_config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <record id="view_website_config_settings" model="ir.ui.view">
+        <field name="name">Website livechat settings</field>
+        <field name="model">website.config.settings</field>
+        <field name="inherit_id" ref="website.view_website_config_settings"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@string='Social Media']" position="inside">
+                <label for="channel_id"/>
+                <div name="channel_id">
+                    <div class="oe_inline">
+                        <field name="channel_id"/>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index d4da07f2bf0..374e0d5dd16 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -2,22 +2,6 @@
 <openerp>
     <data>
 
-<record id="website_settings_livechat" model="ir.ui.view">
-    <field name="name">website.form</field>
-    <field name="model">website</field>
-    <field name="inherit_id" ref="website.view_website_form"/>
-    <field name="arch" type="xml">
-        <xpath expr="//div[@name='other']" position='before'>
-            <div name="livechat">
-                <separator string="LiveChat"/>
-                <group name="livechat">
-                    <field name="channel_id" widget="many2one"/>
-                </group>
-            </div>
-        </xpath>
-    </field>
-</record>
-
 <template id="header" inherit_id="website.layout" name="LiveChat Snippet">
     <xpath expr="//body" position="inside">
         <t t-if="website.channel_id">

From 7576c80a362b88a58417531eb7cc207d4a4628a7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 11 Feb 2014 17:38:53 +0100
Subject: [PATCH 006/134] [FIX] website: Snippet: Move separator to Features
 instead of Content section

bzr revid: chm@openerp.com-20140211163853-g5a92uuifrv20e20
---
 addons/website/views/snippets.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index e0bf26ca81b..11d01176da0 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -184,15 +184,6 @@
     </div>
 
 
-    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
-            <span class="oe_snippet_thumbnail_title">Separator</span>        
-        </div>
-        <hr class="oe_snippet_body"/>
-    </div>
-
-
     <div data-snippet-id="big-picture" data-selector-children=".oe_structure, [data-oe-type=html]">
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
@@ -374,6 +365,15 @@
         </div>
     </div>
 
+
+    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
+            <span class="oe_snippet_thumbnail_title">Separator</span>        
+        </div>
+        <hr class="oe_snippet_body"/>
+    </div>
+
 </div>
 
 <div id="snippet_feature" class="tab-pane fade">

From 6a8ce774264ed52f47cc1f3601bd85ba81412bd8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 09:03:31 +0100
Subject: [PATCH 007/134] [FIX] res.partner: prevent `show_email` context
 option from polluting display_name

bzr revid: odo@openerp.com-20140212080331-diit15a9sz7do4cu
---
 openerp/addons/base/res/res_partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 9115ccae481..e9573088680 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -209,6 +209,7 @@ class res_partner(osv.osv, format_address):
         context = dict(context or {})
         context.pop('show_address', None)
         context.pop('show_address_only', None)
+        context.pop('show_email', None)
         return dict(self.name_get(cr, uid, ids, context=context))
 
     # indirections to avoid passing a copy of the overridable method when declaring the function field

From ac03ba3095fe6154e8bf369ede63be3cfc6d8c9f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 11:28:05 +0100
Subject: [PATCH 008/134] [FIX] website: pager don't keep searches

bzr revid: chm@openerp.com-20140212102805-5khiv3cgslci9che
---
 addons/website/views/website_templates.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d43d8c45443..383c27514c1 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -383,13 +383,13 @@
 <template id="pager" name="Pager">
     <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
         <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
+            <a t-att-href="'%s?%s' % (pager['page_previous']['url'],keep_query('*')) if pager['page']['num'] != 1 else ''">Prev</a>
         </li>
         <t t-foreach="pager['pages']" t-as="page">
-            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
+            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="'%s?%s' % (page['url'],keep_query('*'))" t-raw="page['num']"></a></li>
         </t>
         <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-            <a t-att-href=" pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
+            <a t-att-href="'%s?%s' % (pager['page_next']['url'],keep_query('*')) if pager['page']['num'] != pager['page_count'] else ''">Next</a>
         </li>
     </ul>
 </template>

From 49351f6edb6af9d07449a2315f9df012a739c354 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 12 Feb 2014 16:42:38 +0530
Subject: [PATCH 009/134] [IMP] create new method to broadcast message to
 employess in hr.

bzr revid: tpa@tinyerp.com-20140212111238-3b3ddlwl3062fjef
---
 addons/hr/hr.py | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 3c629378084..45a6a82e411 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -248,30 +248,34 @@ class hr_employee(osv.osv):
         'color': 0,
     }
 
+    def mail_broadcast(self, cr, uid, employee_id, context=None):
+        employee = self.browse(cr, uid, employee_id, context=context)
+        partner_ids = []
+        if employee.user_id:
+            res_users = self.pool['res.users']
+            # send a copy to every user of the company
+            # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
+            _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
+            user_ids = res_users.search(cr, uid, [('company_id', '=', employee.user_id.company_id.id),
+                                              ('groups_id', 'in', group_id)], context=context)
+            partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
+        self.message_post(cr, uid, [employee_id],
+            body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
+            partner_ids=partner_ids,
+            subtype='mail.mt_comment', context=context
+        )
+        return True
+
     def create(self, cr, uid, data, context=None):
         if context is None:
             context = {}
         if context.get("mail_broadcast"):
-            create_ctx = dict(context, mail_create_nolog=True)
-            employee_id = super(hr_employee, self).create(cr, uid, data, context=create_ctx)
-            employee = self.browse(cr, uid, employee_id, context=context)
-            if employee.user_id:
-                res_users = self.pool['res.users']
-                # send a copy to every user of the company
-                # TODO: post to the `Whole Company` mail.group when we'll be able to link to the employee record  
-                _model, group_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')
-                user_ids = res_users.search(cr, uid, [('company_id', '=', employee.user_id.company_id.id),
-                                                  ('groups_id', 'in', group_id)], context=context)
-                partner_ids = list(set(u.partner_id.id for u in res_users.browse(cr, uid, user_ids, context=context)))
-            else:
-                partner_ids = []
-            self.message_post(cr, uid, [employee_id],
-                body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
-                partner_ids=partner_ids,
-                subtype='mail.mt_comment', context=context
-            )
-        else:
-            employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
+            context.update({'mail_create_nolog': True})
+
+        employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
+
+        if context.get("mail_broadcast"):
+            self.mail_broadcast(cr, uid, employee_id, context=context)
         return employee_id
 
     def unlink(self, cr, uid, ids, context=None):

From ed785f07838fbda6a2eacc2e8e249da9dfcc7518 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 12:55:16 +0100
Subject: [PATCH 010/134] [FIX] website_sale: pager and breadcrum keep search
 and filter. Filter keep search and category. Links for category

bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
---
 addons/website/models/website.py           |  2 +-
 addons/website/views/website_templates.xml |  6 +--
 addons/website_sale/controllers/main.py    | 48 ++++++++++++---------
 addons/website_sale/views/website_sale.xml | 49 +++++++++++-----------
 4 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index e43efa6f0a3..ea095c04fe3 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -248,7 +248,7 @@ class website(osv.osv):
             pmin = pmax - scope if pmax - scope > 0 else 1
 
         def get_url(page):
-            _url = "%spage/%s/" % (url, page)
+            _url = "%spage/%s/" % (url, page) if page > 1 else url
             if url_args:
                 _url = "%s?%s" % (_url, werkzeug.url_encode(url_args))
             return _url
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 383c27514c1..846ff17fd1e 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -383,13 +383,13 @@
 <template id="pager" name="Pager">
     <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
         <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-            <a t-att-href="'%s?%s' % (pager['page_previous']['url'],keep_query('*')) if pager['page']['num'] != 1 else ''">Prev</a>
+            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else ''">Prev</a>
         </li>
         <t t-foreach="pager['pages']" t-as="page">
-            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="'%s?%s' % (page['url'],keep_query('*'))" t-raw="page['num']"></a></li>
+            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
         </t>
         <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-            <a t-att-href="'%s?%s' % (pager['page_next']['url'],keep_query('*')) if pager['page']['num'] != pager['page_count'] else ''">Next</a>
+            <a t-att-href="pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else ''">Next</a>
         </li>
     </ul>
 </template>
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 5e02def1494..b3a93b63148 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -7,6 +7,7 @@ from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.tools.translate import _
+from openerp.addons.website.models.website import slug
 
 PPG = 20                        # Products Per Page
 PPR = 4                         # Products Per Row
@@ -143,8 +144,8 @@ class Ecommerce(http.Controller):
                 return key_val
         return False
 
-    @http.route(['/shop/filters/'], type='http', auth="public", website=True, multilang=True)
-    def filters(self, **post):
+    @http.route(['/shop/filters/'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    def filters(self, category=None, **post):
         index = []
         filters = []
         for key, val in post.items():
@@ -169,11 +170,16 @@ class Ecommerce(http.Controller):
                     filters[index.index(cat_id)].append( cat[2] )
             post.pop(key)
 
-        return request.redirect("/shop/?filters=%s%s%s" % (
-                simplejson.dumps(filters),
-                post.get("search") and ("&search=%s" % post.get("search")) or "",
-                post.get("category") and ("&category=%s" % post.get("category")) or ""
-            ))
+        url = "/shop/"
+        if category:
+            category_obj = request.registry.get('product.public.category')
+            url = "%scategory/%s/" % (url, slug(category_obj.browse(request.cr, request.uid, int(category), context=request.context)))
+        if filters:
+            url = "%s?filters=%s" % (url, simplejson.dumps(filters))
+        if post.get("search"):
+            url = "%s%ssearch=%s" % (url, filters and "&" or "?", post.get("search"))
+
+        return request.redirect(url)
 
     def attributes_to_ids(self, attributes):
         obj = request.registry.get('product.attribute.line')
@@ -209,15 +215,24 @@ class Ecommerce(http.Controller):
                 ('name', 'ilike', search),
                 ('description', 'ilike', search)]
         if category:
-            domain.append(('product_variant_ids.public_categ_id', 'child_of', category.id))
+            domain.append(('product_variant_ids.public_categ_id', 'child_of', int(category)))
+            if isinstance(category, (int,str,unicode)):
+                category = request.registry.get('product.public.category').browse(cr, uid, int(category), context=context)
         if filters:
             filters = simplejson.loads(filters)
             if filters:
                 ids = self.attributes_to_ids(filters)
                 domain.append(('id', 'in', ids or [0]))
 
+        url = "/shop/"
         product_count = product_obj.search_count(cr, uid, domain, context=context)
-        pager = request.website.pager(url="/shop/", total=product_count, page=page, step=PPG, scope=7, url_args=post)
+        if search:
+            post["search"] = search
+        if filters:
+            post["filters"] = filters
+        if category:
+            url = "/shop/category/%s/" % slug(category)
+        pager = request.website.pager(url=url, total=product_count, page=page, step=PPG, scope=7, url_args=post)
 
         request.context['pricelist'] = self.get_pricelist()
 
@@ -244,11 +259,12 @@ class Ecommerce(http.Controller):
             'range': range,
             'search': {
                 'search': search,
-                'category': category and category.id,
+                'category': category,
                 'filters': filters,
             },
             'pager': pager,
             'styles': styles,
+            'category': category,
             'categories': categs,
             'Ecommerce': self,   # TODO fp: Should be removed
             'style_in_product': lambda style, product: style.id in [s.id for s in product.website_style_ids],
@@ -257,26 +273,20 @@ class Ecommerce(http.Controller):
 
     @http.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", website=True, multilang=True)
     def product(self, product, search='', category='', filters='', **kwargs):
-        category_obj = request.registry.get('product.public.category')
-
-        category_ids = category_obj.search(request.cr, request.uid, [], context=request.context)
-        category_list = category_obj.name_get(request.cr, request.uid, category_ids, context=request.context)
-        category_list = sorted(category_list, key=lambda category: category[1])
-
         if category:
+            category_obj = request.registry.get('product.public.category')
             category = category_obj.browse(request.cr, request.uid, int(category), context=request.context)
 
         request.context['pricelist'] = self.get_pricelist()
 
         values = {
             'Ecommerce': self,
-            'category': category,
-            'category_list': category_list,
             'main_object': product,
             'product': product,
+            'category': category,
             'search': {
                 'search': search,
-                'category': category and str(category.id),
+                'category': category,
                 'filters': filters,
             }
         }
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index bd51d35cc14..1c616a3d1f7 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -32,10 +32,10 @@
 <!-- List of categories -->
 
 <template id="categories_recursive" name="Category list">
-  <li t-att-class="category.id == search.get('category') and 'active' or ''">
-      <a t-attf-href="/shop/category/#{ slug(category) }/" t-field="category.name"></a>
-      <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
-          <t t-foreach="category.child_id" t-as="category">
+  <li t-att-class="int(categ) == int(category or 0) and 'active' or ''">
+      <a t-attf-href="/shop/category/#{ slug(categ) }/" t-field="categ.name"></a>
+      <ul t-if="categ.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
+          <t t-foreach="categ.child_id" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
@@ -45,14 +45,15 @@
 <!-- Product list -->
 
 <template id="search" name="Search hidden fields">
-  <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
-  <input type="hidden" name="filters" t-att-value="search.get('filters') or ''"/>
-  <div class="input-group">
-    <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
-    <span class="input-group-btn">
-      <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
-    </span>
-  </div>
+  <form t-attf-action="/shop/{{'category/%s/' % slug(category) if category else ''}}" method="get" t-att-class="search_class">
+    <input t-if="search.get('filters')" type="hidden" name="filters" t-att-value="search.get('filters')"/>
+    <div class="input-group">
+      <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
+      <span class="input-group-btn">
+        <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
+      </span>
+    </div>
+  </form>
 </template>
 
 <template id="products_cart" name="Shopping cart">
@@ -60,12 +61,12 @@
     <div class="ribbon btn btn-danger">Sale</div>
   </div>
   <div class="oe_product_image">
-      <a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('category', 'search', 'filters') }}">
+      <a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}">
           <span t-field="product.image" t-field-options='{"widget": "image"}'/>
       </a>
   </div>
   <section>
-      <h5><strong><a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('category', 'search', 'filters') }}" t-field="product.name"/></strong></h5>
+      <h5><strong><a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}" t-field="product.name"/></strong></h5>
       <div class="product_price" t-if="product.product_variant_ids">
           <b>
               <t t-if="abs(product.product_variant_ids[0].lst_price - product.product_variant_ids[0].price) &gt; 0.2">
@@ -99,9 +100,8 @@
         <div class="container oe_website_sale">
           <div class="products_pager">
             <div class="row">
-              <form action="/shop/" method="get" class="pagination form-inline col-md-3">
-                  <t t-call="website_sale.search" />
-              </form>
+              <t t-set="search_class">pagination form-inline col-md-3</t>
+              <t t-call="website_sale.search"/>
               <t t-call="website.pager"/>
             </div>
           </div>
@@ -278,15 +278,14 @@
           <div class="row">
             <div class="col-sm-4">
                 <ol class="breadcrumb">
-                    <li><a t-attf-href="/shop?{{ keep_query('search', 'filters') }}" onclick="history.go(-1); return false;">Products</a></li>
-                    <li t-if="search.get('category')"><a t-attf-href="/shop/?{{ keep_query('search', 'filters', 'category') }}" t-field="category.name"/></li>
+                    <li><a t-attf-href="/shop?{{ keep_query('search', 'filters', 'page') if not category else keep_query('search', 'filters') }}">Products</a></li>
+                    <li t-if="category"><a t-attf-href="/shop/category/{{ slug(category) }}/?{{ keep_query('search', 'filters', 'page') }}" t-field="category.name"/></li>
                     <li class="active"><span t-field="product.name"/></li>
                 </ol>
             </div>
             <div class="col-sm-3">
-              <form action="/shop/" method="get" class="pull-right">
-                  <t t-call="website_sale.search" />
-              </form>
+              <t t-set="search_class">pull-right</t>
+              <t t-call="website_sale.search"/>
             </div>
             <div class="col-sm-4" groups="base.group_sale_manager">
                 <t t-call="website.publish_management">
@@ -569,8 +568,8 @@
 <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
       <ul class="nav nav-pills nav-stacked mt16">
-          <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
-          <t t-foreach="categories" t-as="category">
+          <li t-att-class=" '' if category else 'active' "><a href="/shop/">All Products</a></li>
+          <t t-foreach="categories" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
@@ -585,7 +584,7 @@
 
 <template id="products_attributes" inherit_id="website_sale.products" inherit_option_id="website_sale.products" name="Product attribute's Filters" groups="product.group_product_attributes">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
-      <form t-attf-action="/shop/filters/?{{ keep_query('category', 'search') }}" class="attributes" method="post">
+      <form t-attf-action="/shop/filters/?{{ keep_query('search', category=(category and int(category))) }}" class="attributes" method="post">
           <ul class="nav nav-pills nav-stacked mt16">
               <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
               <t t-foreach="attribute_ids" t-as="attribute_id">

From 2223ba5600875eb1d92ec1c70feacd60ebe6a96b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 15:13:46 +0100
Subject: [PATCH 011/134] [FIX] search view: slightly more readable error when
 search filters fail to evaluate

Prints the error details instead of:
  Uncaught TypeError: Cannot read property 'length' of undefined' addons/web/static/src/js/views.js

bzr revid: odo@openerp.com-20140212141346-hpw05sv3ctr243db
---
 addons/web/static/src/js/views.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 82a2095bace..eed98f9fc31 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -815,6 +815,11 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             contexts: [action_context].concat(contexts || []),
             group_by_seq: groupbys || []
         }).done(function (results) {
+            if (results.error) {
+                throw new Error(
+                        _.str.sprintf(_t("Failed to evaluate search criterions")+": \n%s",
+                                      JSON.stringify(results.error)));
+            }
             self.dataset._model = new instance.web.Model(
                 self.dataset.model, results.context, results.domain);
             var groupby = results.group_by.length

From 5a134745e804d43dd6eb3cf43a3f019251068564 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 15:17:13 +0100
Subject: [PATCH 012/134] [FIX] website_sale: search category with int for saas
 updating without -u

bzr revid: chm@openerp.com-20140212141713-j9cagak2z2j4s20x
---
 addons/website_sale/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b3a93b63148..3531853227c 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -259,7 +259,7 @@ class Ecommerce(http.Controller):
             'range': range,
             'search': {
                 'search': search,
-                'category': category,
+                'category': category and int(category),
                 'filters': filters,
             },
             'pager': pager,
@@ -286,7 +286,7 @@ class Ecommerce(http.Controller):
             'category': category,
             'search': {
                 'search': search,
-                'category': category,
+                'category': category and int(category),
                 'filters': filters,
             }
         }

From 6a29b0ae0fcfc23136fcbbd0e8097116ee60d779 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 15:19:59 +0100
Subject: [PATCH 013/134] [FIX] Layout was broken in the debugging `View Logs`
 (perm_read) popup, fixed + boostrapified

bzr revid: odo@openerp.com-20140212141959-w2s4f960jwbknzx4
---
 addons/web/static/src/css/base.css  | 14 ----------
 addons/web/static/src/css/base.sass | 12 --------
 addons/web/static/src/xml/base.xml  | 43 +++++++++++++++++------------
 3 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index bf9362a1e09..35b6fcc582d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3021,20 +3021,6 @@
   font-size: 95%;
   line-height: 1.2em;
 }
-.openerp .oe_debug_view_log label {
-  display: block;
-  width: 49%;
-  text-align: right;
-  float: left;
-  font-weight: bold;
-  color: #000099;
-}
-.openerp .oe_debug_view_log span {
-  display: block;
-  width: 49%;
-  float: right;
-  color: #333333;
-}
 .openerp .navbar {
   min-height: 32px;
   margin-bottom: 0px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c79deecddb5..5021644a062 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2419,18 +2419,6 @@ $sheet-padding: 16px
     .oe_debug_view_log
         font-size: 95%
         line-height: 1.2em
-    .oe_debug_view_log label
-        display: block
-        width: 49%
-        text-align: right
-        float: left
-        font-weight: bold
-        color: #009
-    .oe_debug_view_log span
-        display: block
-        width: 49%
-        float: right
-        color: #333
     // }}}
     // Bootstrap HACKS {{{
     .navbar
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fc9c2154d01..80b82c1f40b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -536,23 +536,32 @@
 </t>
 <t t-name="ViewManagerDebugViewLog">
     <div class="oe_debug_view_log">
-        <label>ID:</label>
-        <span><t t-esc="perm.id"/></span>
-
-        <label>XML ID:</label>
-        <span><t t-esc="perm.xmlid"/></span>
-
-        <label>Creation User:</label>
-        <span><t t-esc="format(perm.create_uid, { 'type' : 'many2one' }, '/')"/></span>
-
-        <label>Creation Date:</label>
-        <span><t t-esc="format(perm.create_date, { 'type' : 'datetime' }, '/')"/></span>
-
-        <label>Latest Modification by:</label>
-        <span><t t-esc="format(perm.write_uid, { 'type' : 'many2one' }, '/')"/></span>
-
-        <label>Latest Modification Date:</label>
-        <span><t t-esc="format(perm.write_date, { 'type' : 'datetime' }, '/')"/></span>
+        <table class="table table-condensed table-striped">
+            <tr>
+                <th>ID:</th>
+                <td><t t-esc="perm.id"/></td>
+            </tr>
+            <tr>
+                <th>XML ID:</th>
+                <td><t t-esc="perm.xmlid or '/'"/></td>
+            </tr>
+            <tr>
+                <th>Creation User:</th>
+                <td><t t-esc="format(perm.create_uid, { 'type' : 'many2one' }, '/')"/></td>
+            </tr>
+            <tr>
+                <th>Creation Date:</th>
+                <td><t t-esc="format(perm.create_date, { 'type' : 'datetime' }, '/')"/></td>
+            </tr>
+            <tr>
+                <th>Latest Modification by:</th>
+                <td><t t-esc="format(perm.write_uid, { 'type' : 'many2one' }, '/')"/></td>
+            </tr>
+            <tr>
+                <th>Latest Modification Date:</th>
+                <td><t t-esc="format(perm.write_date, { 'type' : 'datetime' }, '/')"/></td>
+            </tr>
+        </table>
     </div>
 </t>
 <t t-name="ViewPager">

From e1b37a897d65cff40dc4b3106019304179d6e7ee Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 15:39:16 +0100
Subject: [PATCH 014/134] [FIX] website: remove alert snippets_modal

bzr revid: chm@openerp.com-20140212143916-tqf8d8n1hhod5l4v
---
 .../static/src/js/website.snippets.editor.js  |  8 +---
 .../static/src/xml/website.snippets.xml       | 37 -------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index e45bee9685b..f6e958341ae 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -139,9 +139,6 @@
 
             this.$el.addClass("hidden");
 
-            this.$modal = $(openerp.qweb.render('website.snippets_modal'));
-            this.$modal.appendTo("body");
-
             $(document).on('click', '.dropdown-submenu a[tabindex]', function (e) {
                 e.preventDefault();
             });
@@ -375,7 +372,7 @@
                     });
                 },
                 stop: function(ev, ui){
-                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 50) {
+                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 3) {
                         var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
                         if (el.length) {
                             el.after($toInsert);
@@ -439,9 +436,6 @@
                         },0);
                     } else {
                         $toInsert.remove();
-                        if (self.$modal.find('input:not(:checked)').length) {
-                            self.$modal.modal('toggle');
-                        }
                     }
                 },
             });
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index cf3996bdba4..d73e0c3934a 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -15,43 +15,6 @@
             </div>
         </li>
     </t>
-    <t t-name="website.snippets_modal">
-        <div class="modal" id="oe_droperror" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
-                        <h4 class="modal-title">
-                            Building Block Not Inserted
-                        </h4>
-                    </div>
-                    <div class="modal-body">
-                        <p>
-                            Please drop building blocks in a valid zone, like
-                            this one:
-                        </p>
-                        <div class="row">
-                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
-                                <span class="mt16">drop in this zone</span>
-                            </div>
-                        </div>
-                        <div class="text-muted">
-                            <b>Tip:</b> when your cursor is in a valid zone,
-                            OpenERP shows you a preview of the building block
-                            in the page.  You must release the block when the
-                            preview is visible.
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                        <div class="pull-left">
-                            <input type="checkbox" value="1"/> Never show this tip again
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
 
     <t t-name="website.snippets">
         <div id='oe_snippets'></div>

From a7e5025f29951805bfb0d9609d311afa3cad985c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 16:28:42 +0100
Subject: [PATCH 015/134] [FIX]website_sale: crappy fix for view product:
 branding error => can't edit guarantee part when the product_attributes
 inherit is apply

bzr revid: chm@openerp.com-20140212152842-6ymg8kund5l2v7yk
---
 addons/website_sale/views/website_sale.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 1c616a3d1f7..9dd1ed75cdc 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -338,7 +338,7 @@
                     </div>
                     <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
                     <hr t-if="product.description_sale"/>
-                    <p t-field="product.description_sale" class="text-muted"/>
+                    <div><p t-field="product.description_sale" class="text-muted"/></div>
                     <hr/>
                     <p class="text-muted">
                         30-day money-back guarantee<br/>

From 652c574866b619bc31cd8fd09568e9fa9492c254 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 18:52:24 +0100
Subject: [PATCH 016/134] [FIX] product.pricelist: leftover undefined variable
 from pricelist refactoring at
 revid:fp@tinyerp.com-20131206221809-x1muf0wonl4ated0

bzr revid: odo@openerp.com-20140212175224-wd9etr8xyrg6l0oz
---
 addons/product/pricelist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 6f47d6d39d7..65c4311f34a 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -279,7 +279,6 @@ class product_pricelist(osv.osv):
 
             if price:
                 if 'uom' in context and not uom_price_already_computed:
-                    product = products_dict[product.id]
                     uom = product.uos_id or product.uom_id
                     price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
 

From 47312a5f375a2887da71db65c80844d63672d11f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 19:02:16 +0100
Subject: [PATCH 017/134] [MERGE] Forward-port of latest saas-2 bugfixes, up to
 rev. 5011 rev-id: odo@openerp.com-20140212175952-ehkgu7uyvbymj9od

bzr revid: odo@openerp.com-20140212180216-vhynt924xgsixzfq
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 9c84d4326f4..ba603c7a0f0 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -231,7 +231,7 @@
             <field name="model">res.users</field>
             <field name="arch" type="xml">
                 <search string="Users">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email,'ilike',self)]" string="User"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email','ilike',self)]" string="User"/>
                     <field name="company_ids" string="Company" groups="base.group_multi_company"/>
                 </search>
             </field>

From 1c871da2269494e97a6ebcf96f83441ceabc4e1a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:08:45 +0100
Subject: [PATCH 018/134] [FIX] crm: enable needaction filters

bzr revid: chs@openerp.com-20140212180845-wme2uqa0iyl8wps9
---
 addons/crm/crm_lead_view.xml      | 2 ++
 addons/crm/crm_phonecall_view.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c728404d9ce..e76a7a9124d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -343,6 +343,7 @@
                             help="Leads that are assigned to any sales teams I am member of"/>
                     <filter string="Dead" name="dead"
                             domain="[('probability', '=', '0'), ('stage_id.fold', '=', True)]"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -562,6 +563,7 @@
                     <filter string="My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to any sales teams I am member of"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <group expand="0" string="Group By..." colspan="16">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a027a910520..9675913a0b5 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -171,6 +171,7 @@
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+               <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                <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"/>

From 9d670cd45fe2f1e2d06bb27df8d249fec1ef83b0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:09:32 +0100
Subject: [PATCH 019/134] [FIX] web: navbar must have a z-index at 0 to be
 hidden when passing pad in fullscreen

bzr revid: chs@openerp.com-20140212180932-z1vtcfrif0rzsozu
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 35b6fcc582d..c5c9af94479 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -3025,7 +3025,7 @@
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
-  z-index: 1;
+  z-index: 0;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5021644a062..95c30e5dc93 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2425,7 +2425,7 @@ $sheet-padding: 16px
         min-height: 32px
         margin-bottom: 0px
         border: none
-        z-index: 1
+        z-index: 0
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default

From e90a59aef626d65e30eaa10f861c5bfe83b9201e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:10:14 +0100
Subject: [PATCH 020/134] [FIX] pad: font-awesomeize icon

bzr revid: chs@openerp.com-20140212181014-rk1qh1pcovtmjhqu
---
 addons/pad/static/src/css/etherpad.css | 5 ++---
 addons/pad/static/src/js/pad.js        | 1 +
 addons/pad/static/src/xml/pad.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index facf15b28de..d8281ef4d48 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -13,13 +13,12 @@
     border: solid 1px #ccc;
     border-radius:3px;
     text-align: center;
-    line-height: 22px;
+    line-height: 28px;
     overflow: hidden;
     -webkit-box-sizing: border-box;
     color: #666666;
-    padding-top:-3px;
-    padding-left:-1px;
     cursor: pointer;
+    font-size: 14px;
 }
 
 .oe_pad_switch:hover{
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index ba5ee3a3037..b685eb1e8fb 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -13,6 +13,7 @@ openerp.pad = function(instance) {
             this.switch_configured();
             this.$('.oe_pad_switch').click(function() {
                 self.$el.toggleClass('oe_pad_fullscreen');
+                self.$el.find('.oe_pad_switch').toggleClass('fa-expand fa-compress');
             });
             this.render_value();
         },
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index f915e867b35..5d2ab779ead 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -15,7 +15,7 @@
             </t>
             <t t-if="! widget.get('effective_readonly')">
                 <div class="oe_pad_switch_positioner oe_configured">
-                    <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                    <span class="fa fa-expand oe_pad_switch"></span>
                 </div>
                 <div class="oe_pad_content oe_editing oe_configured">
                 </div>

From 441bbb23d764001f9933be840761a846a7a840c3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Feb 2014 11:49:47 +0100
Subject: [PATCH 021/134] [IMP] website tour: auto hide popover when the target
 element is display or hidden

bzr revid: chm@openerp.com-20140213104947-ezd53nzwyxe4xtos
---
 addons/website/static/src/js/website.tour.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 8b1284f0a07..6b0efe7ddb2 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -281,6 +281,14 @@ website.Tour = openerp.Class.extend({
                     self.nextStep(step.stepId, callback, overlaps);
                 }, self.defaultDelay);
             } else if (!overlaps || new Date().getTime() - time < overlaps) {
+                if (self.current.element) {
+                    var $popover = $(".popover.tour");
+                    if(!$(self.current.element).is(":visible")) {
+                        $popover.data("hide", true).fadeOut(300);
+                    } else if($popover.data("hide")) {
+                        $popover.data("hide", false).fadeIn(150);
+                    }
+                }
                 self.timer = setTimeout(checkNext, self.defaultDelay);
             } else {
                 self.reset();

From b8950c14c8cd52fe64f11d97fe981303e6980a0d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 12:09:37 +0100
Subject: [PATCH 022/134] [FIX] ir.values: be tolerant to actions pointing to
 non existing actions (aka old wizards)

bzr revid: chs@openerp.com-20140213110937-hc3u6fwfclhf5mmn
---
 openerp/addons/base/ir/ir_values.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index a21b034d1b0..6af09b7ecbb 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -394,17 +394,16 @@ class ir_values(osv.osv):
         for action in cr.dictfetchall():
             if not action['value']:
                 continue    # skip if undefined
-            action_model,id = action['value'].split(',')
-            fields = [
-                    field
-                    for field in self.pool[action_model]._all_columns
-                    if field not in EXCLUDED_FIELDS]
+            action_model_name, action_id = action['value'].split(',')
+            action_model = self.pool.get(action_model_name)
+            if not action_model:
+                continue    # unknow model? skip it
+            fields = [field for field in action_model._all_columns if field not in EXCLUDED_FIELDS]
             # FIXME: needs cleanup
             try:
-                action_def = self.pool[action_model].read(cr, uid, int(id), fields, context)
+                action_def = action_model.read(cr, uid, int(action_id), fields, context)
                 if action_def:
-                    if action_model in ('ir.actions.report.xml','ir.actions.act_window',
-                                        'ir.actions.wizard'):
+                    if action_model_name in ('ir.actions.report.xml', 'ir.actions.act_window'):
                         groups = action_def.get('groups_id')
                         if groups:
                             cr.execute('SELECT 1 FROM res_groups_users_rel WHERE gid IN %s AND uid=%s',

From a193f3fef89cf2ab3568b02cacabcfa1fece21bb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Feb 2014 14:21:56 +0100
Subject: [PATCH 023/134] [FIX] website: login for test js

bzr revid: chm@openerp.com-20140213132156-plxe5hqohmkxf40g
---
 addons/website/tests/ui_suite/ui_test_runner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 745adc15f0c..a8a9671c92f 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -27,7 +27,7 @@ function run (test, onload, inject) {
     var scheme = options.scheme ? options.scheme+'://' : 'http://';
     var host = options.host ? options.host : 'localhost';
     var port = options.port ? ':'+options.port : '';
-    var path = options.path ? options.path : '/web/login';
+    var path = options.path ? options.path : '/login';
 
     var queryParams = [];
     if (options.db) queryParams.push('db='+options.db);

From c86156bbecca2303e00fe90fdd844d3510b60edb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Feb 2014 14:25:50 +0100
Subject: [PATCH 024/134] [FIX] website: comment test login_test.js. Error
 QWeb2 (test dependence) is not injected in the login page to insert login and
 password

bzr revid: chm@openerp.com-20140213132550-9i28l7v8vcibz36t
---
 addons/website/tests/test_ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index eafe791c204..19ba393cb4d 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -150,7 +150,7 @@ def full_path(pyfile, filename):
 
 def load_tests(loader, base, _):
     base.addTest(WebsiteUiSuite(full_path(__file__, 'dummy_test.js'), {}, 5.0))
-    base.addTest(WebsiteUiSuite(full_path(__file__, 'login_test.js'), {'path': '/', 'user': None}, 60.0))
+    #base.addTest(WebsiteUiSuite(full_path(__file__, 'login_test.js'), {'path': '/', 'user': None}, 60.0))
     base.addTest(WebsiteUiSuite(full_path(__file__, 'simple_dom_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     base.addTest(WebsiteUiSuite(full_path(__file__, 'homepage_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     return base

From 9e6c1114090c6bcb4efe48cc2e86c6588315af33 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 15:26:43 +0100
Subject: [PATCH 025/134] [FIX] web: correct navbar position

bzr revid: chs@openerp.com-20140213142643-y0wtmbv3fzh8f0wt
---
 addons/web/static/src/css/base.css  | 3 ++-
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c5c9af94479..899ea2df34b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3025,7 +3025,8 @@
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
-  z-index: 0;
+  z-index: 1;
+  position: static;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 95c30e5dc93..e0e1df0c1fc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2425,7 +2425,8 @@ $sheet-padding: 16px
         min-height: 32px
         margin-bottom: 0px
         border: none
-        z-index: 0
+        z-index: 1
+        position: static
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default

From 487dee485132b9d1b6bc010815d7244719b5d2e4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 15:28:42 +0100
Subject: [PATCH 026/134] [IMP] web: generic sass/css Makefile

bzr revid: chs@openerp.com-20140213142842-u7r5axxewqjfsd1c
---
 addons/web/static/src/css/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index f4f1f6d1bb5..ba88946baac 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,2 +1,5 @@
-sass:
-	sass -t expanded --compass --unix-newlines --watch base.sass:base.css&
\ No newline at end of file
+all: *.css
+%.css: %.sass
+	sass -t expanded --compass --unix-newlines $< $@
+watch:
+	sass -t expanded --compass --unix-newlines --watch .:.

From 68128c971bb898604480ffc6b7706053010d8780 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 13 Feb 2014 16:06:13 +0100
Subject: [PATCH 027/134] [ADD] gamification: i18n translation files

bzr revid: mat@openerp.com-20140213150613-hgblsyl893bc6ov7
---
 addons/gamification/i18n/gamification.pot | 1733 +++++++++++++++++++++
 1 file changed, 1733 insertions(+)
 create mode 100644 addons/gamification/i18n/gamification.pot

diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
new file mode 100644
index 00000000000..03fcc645bec
--- /dev/null
+++ b/addons/gamification/i18n/gamification.pot
@@ -0,0 +1,1733 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* gamification
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.saas~3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 15:03+0000\n"
+"PO-Revision-Date: 2014-02-13 15:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Search Goals"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_company_data
+msgid "Set your Company Data"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Never"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,computation_mode:0
+msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+#: field:gamification.goal.wizard,goal_id:0
+msgid "Goal"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+msgid "Non recurring"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,next_report_date:0
+msgid "Next Report Date"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,monetary:0
+msgid "Monetary Value"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "My Goals"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,condition:0
+msgid "The lower the better"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.goal.wizard:0
+msgid "Grant Badge To"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_count_distinct:0
+msgid "The number of time this badge has been received by unique users."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,unique_owner_ids:0
+msgid "The list of unique users having received this badge."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+#: view:gamification.goal.definition:0
+msgid "Group By..."
+msgstr ""
+
+#. module: gamification
+#: model:gamification.challenge,name:gamification.challenge_base_configure
+msgid "Setup your Company"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "/∞"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/wizard/grant_badge.py:44
+#, python-format
+msgid "You can not grant a badge to yourself"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,completeness:0
+msgid "Completeness"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,field_date_id:0
+msgid "Date Field"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my_this_month:0
+msgid "The number of time the current user has received this badge this month."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge.line,condition:0
+msgid ">="
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.challenge_wizard
+msgid "Challenge Description"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge_user_wizard
+msgid "gamification.badge.user.wizard"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reward"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_ids:0
+#: help:gamification.challenge,message_ids:0
+#: help:gamification.goal,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,category:0
+msgid "Define the visibility of the challenge through menus"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Refresh Challenge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_challenge_line
+msgid "Gamification generic goal for challenge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_monetary:0
+msgid "Monetary"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "In progress (to update)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal_definition
+msgid "Gamification goal definition"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,remaining_sending:0
+msgid "If a maxium is set"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,invited_user_ids:0
+msgid "Suggest to users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.goal_list_action
+#: model:ir.ui.menu,name:gamification.gamification_goal_menu
+msgid "Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Badge Description"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "than the target."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Badges are granted when a challenge is finished. This is either at the end of a running period (eg: end of the month for a monthly challenge), at the end date of a challenge (if no periodicity is set) or when the challenge is manually closed."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,manager_id:0
+msgid "The user responsible for the challenge."
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:385
+#, python-format
+msgid "Update %s"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,description:0
+msgid "Goal Description"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "this month"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,owner_ids:0
+msgid "Owners"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,sender_id:0
+msgid "Sender"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my_this_month:0
+msgid "My Monthly Total"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,remind_update_delay:0
+msgid "Never reminded if no value or zero is specified."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: field:gamification.challenge.line,challenge_id:0
+#: field:gamification.goal,challenge_id:0
+msgid "Challenge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,condition:0
+msgid "Goal Performance"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_ids:0
+#: field:gamification.challenge,message_ids:0
+#: field:gamification.goal,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "badges this month"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:517
+#: code:addons/gamification/models/goal.py:351
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user:0
+msgid "Granted by"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_count_distinct:0
+msgid "Number of users"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_unread:0
+#: help:gamification.challenge,message_unread:0
+#: help:gamification.goal,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
+msgid "Create User"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "People having some badges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "granted,"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_full_suffix:0
+#: field:gamification.goal,definition_suffix:0
+#: field:gamification.goal.definition,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reference"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,autojoin_group_id:0
+msgid "Auto-subscription Group"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "refresh"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Even if the challenge is failed, best challengers will be rewarded"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_id:0
+msgid "For Every Succeding User"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,target_goal:0
+msgid "Target Value to Reach"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,start_date:0
+msgid "The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Notification Messages"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,manager_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:108
+#, python-format
+msgid "more details..."
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.badge_list_action
+#: model:ir.ui.menu,name:gamification.gamification_badge_menu
+msgid "Badges"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth_badge_ids:0
+msgid "Only the people having these badges can give this badge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Recorded manually"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Statistics"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "From"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Granting"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Grant"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "e.g. days"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_id:0
+#: view:gamification.goal:0
+#: field:gamification.goal,definition_id:0
+#: field:gamification.goal.definition,name:0
+msgid "Goal Definition"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Failed"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: field:gamification.challenge,state:0
+#: view:gamification.goal:0
+#: field:gamification.goal,state:0
+msgid "State"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_follower_ids:0
+#: field:gamification.challenge,message_follower_ids:0
+#: field:gamification.goal,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_first_id:0
+msgid "For 1st user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Can not grant"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_unread:0
+#: field:gamification.challenge,message_unread:0
+#: field:gamification.goal,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,display_mode:0
+msgid "Displayed as"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+#: field:gamification.badge,name:0
+#: field:gamification.badge.user,badge_id:0
+#: field:gamification.badge.user.wizard,badge_id:0
+msgid "Badge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,suffix:0
+msgid "The unit of the target and current values"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
+msgid "Related Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Subscriptions"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: model:ir.actions.act_window,name:gamification.action_grant_wizard
+msgid "Grant Badge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:683
+#, python-format
+msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_summary:0
+#: help:gamification.challenge,message_summary:0
+#: help:gamification.goal,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_message_group_id:0
+msgid "Send a copy to"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.challenge_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a challenge. \n"
+"                </p>\n"
+"                <p>\n"
+"                    Assign a list of goals to chosen users to evaluate them.\n"
+"                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                    The goals are created for the specified users or member of the group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:695
+#, python-format
+msgid "Nobody reached the required conditions to receive special badges."
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:35
+#: code:addons/gamification/static/src/xml/gamification.xml:57
+#, python-format
+msgid "Target: <="
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reminders for Manual Goals"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:265
+#, python-format
+msgid "Invalid return content from the evaluation of %s"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: field:gamification.goal.definition,computation_mode:0
+msgid "Computation Mode"
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.simple_report_template
+msgid "<header><strong>${object.name}</strong>\n"
+"</header><p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
+"\n"
+"% if object.visibility_mode == 'personal':\n"
+"    <table width=\"100%\" border=\"1\"><tr><th>Goal</th>\n"
+"        <th>Target</th>\n"
+"        <th>Current</th>\n"
+"        <th>Completeness</th>\n"
+"    </tr>\n"
+"    % for line in ctx[\"challenge_lines\"]:\n"
+"        <tr if line>= 100:\n"
+"                style=\"font-weight:bold;\"\n"
+"            % endif\n"
+"            &gt;\n"
+"            <td>${line['name']}</td>\n"
+"            <td>${line['target']}\n"
+"            % if line['suffix']:\n"
+"                ${line['suffix']}\n"
+"            % endif\n"
+"            </td>\n"
+"            <td>${line['current']}\n"
+"            % if line['suffix']:\n"
+"                ${line['suffix']}\n"
+"            % endif\n"
+"            </td>\n"
+"            <td>${line['completeness']} %</td>\n"
+"        </tr>\n"
+"    % endfor\n"
+"    </table>\n"
+"% else:\n"
+"    % for line in ctx[\"challenge_lines\"]:\n"
+"        <table width=\"100%\" border=\"1\"><tr><th colspan=\"4\">${line['name']}</th>\n"
+"            </tr><tr><th>#</th>\n"
+"                <th>Person</th>\n"
+"                <th>Completeness</th>\n"
+"                <th>Current</th>\n"
+"            </tr>\n"
+"            % for goal in line['goals']:\n"
+"                <tr if goal.completeness>= 100:\n"
+"                        style=\"font-weight:bold;\"\n"
+"                    % endif\n"
+"                    &gt;\n"
+"                    <td>${goal['rank']}</td>\n"
+"                    <td>${goal['name']}</td>\n"
+"                    <td>${goal['completeness']}%</td>\n"
+"                    <td>${goal['current']}/${line['target']}\n"
+"                    % if line['suffix']:\n"
+"                        ${line['suffix']}\n"
+"                    % endif\n"
+"                    </td>\n"
+"                </tr>\n"
+"            % endfor\n"
+"        </table><br><br>\n"
+"\n"
+"    % endfor\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,condition:0
+msgid "A goal is considered as completed when the current value is compared to the value to reach"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,remind_update_delay:0
+msgid "Non-updated manual goals will be reminded after"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,full_suffix:0
+msgid "The currency and suffix field"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,display_mode:0
+msgid "Exclusive (done or not-done)"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/wizard/grant_badge.py:44
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,last_update:0
+msgid "Last Update"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_message_frequency:0
+msgid "Report Frequency"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,field_id:0
+msgid "The field containing the value to evaluate"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,end_date:0
+msgid "The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_idea
+msgid "Brilliant"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,visibility_mode:0
+msgid "Individual Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Invited"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "On change"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal.definition:0
+msgid "Goal definitions"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Participating"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth:0
+msgid "Who can grant this badge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,last_report_date:0
+msgid "Last Report Date"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: execute a specific Python code"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal_wizard
+msgid "gamification.goal.wizard"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge_user
+msgid "Gamification user badge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Describe the challenge: what is does, who it targets, why it matters..."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal List"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,comment:0
+#: field:gamification.badge.user.wizard,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "In progress"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Search Challenges"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "No one, assigned through challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my:0
+msgid "My Total"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "reply later"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,image:0
+msgid "Image"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Running Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,category:0
+msgid "Appears in"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Passed"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Clickable Goals"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,badge_name:0
+msgid "Badge Name"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_suffix:0
+msgid "Unit"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:229
+#, python-format
+msgid "You have already sent this badge too many time this month."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my_monthly_sending:0
+msgid "My Monthly Sending Total"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Check Badge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Assign Challenge To"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.challenge:0
+#: view:gamification.goal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge.line,sequence:0
+msgid "Sequence number for ordering"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Category"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,current:0
+msgid "Current Value"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,field_date_id:0
+msgid "The date to use for the time period evaluated"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
+msgid "<p>\n"
+"                There is no goals associated to this challenge matching your search.\n"
+"                Make sure that your challenge is active and assigned to at least one user.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.badge_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a badge. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A badge is a symbolic token granted to a user as a sign of reward.\n"
+"                    It can be deserved automatically when some conditions are met or manually by users.\n"
+"                    Some badges are harder than others to get with specific conditions.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth_badge_ids:0
+msgid "Required Badges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Line List"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_max:0
+msgid "Monthly Limited Sending"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:517
+#, python-format
+msgid "Retrieving progress for personal challenge without user information"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_timezone
+msgid "Set your Timezone"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,goal_definition_ids:0
+msgid "The users that have succeeded theses goals will receive automatically the badge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,image:0
+msgid "This field holds the image used for the badge, limited to 256x256"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.wizard:0
+msgid "Update"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,line_id:0
+msgid "Goal Line"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_max_number:0
+msgid "Limitation Number"
+msgstr ""
+
+#. module: gamification
+#: model:ir.module.category,name:gamification.module_goal_category
+msgid "Gamification"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+#: view:gamification.goal:0
+#: selection:gamification.goal,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reject"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,model_id:0
+msgid "The model object for the field to evaluate"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goal_definition_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a goal definition. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A goal definition is a technical model of goal defining a condition to reach.\n"
+"                    The dates, values to reach or users are defined in goal instance.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge.user,sender_id:0
+msgid "The user who has send the badge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_count:0
+msgid "The number of time this badge has been received."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: field:gamification.goal.definition,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_challenge
+msgid "Gamification challenge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_max:0
+msgid "Check to set a monthly limit per person of sending this badge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge
+msgid "Gamification badge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.action_new_simplified_res_users
+msgid "Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Security rules to define who is allowed to manually grant badges. Not enforced for administrator."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,display_mode:0
+msgid "Progressive (using numerical values)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal
+msgid "Gamification goal instance"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:685
+#, python-format
+msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_is_follower:0
+#: field:gamification.challenge,message_is_follower:0
+#: field:gamification.goal,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,full_suffix:0
+msgid "Full Suffix"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,start_date:0
+#: field:gamification.goal,start_date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_second_id:0
+msgid "For 2nd user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Data"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,user_id:0
+#: field:gamification.badge.user.wizard,user_id:0
+#: view:gamification.goal:0
+#: field:gamification.goal,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,domain:0
+msgid "Filter Domain"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Schedule"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: number of records"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_max_number:0
+msgid "The maximum number of time this badge can be sent per month per person."
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Formating Options"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,compute_code:0
+msgid "Python code to be executed for each user. 'result' should contains the new current value. Evaluated user can be access through object.user_id."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,user_ids:0
+#: model:ir.model,name:gamification.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "A selected list of users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.challenge.line:0
+msgid "Challenge Lines"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth_user_ids:0
+msgid "Only these people can give this badge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,active:0
+msgid "Active"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,action_id:0
+msgid "The action that will be called to update the goal value."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "You can still grant"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,computation_mode:0
+msgid "Computation mode"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_invite
+msgid "Invite new Users"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,definition_description:0
+msgid "Definition Description"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_problem_solver
+msgid "Problem Solver"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Target: less than"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_this_month:0
+msgid "The number of time this badge has been received this month."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,last_update:0
+msgid "In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in challenge). Ignored in case of non-manual goal or goal not linked to a challenge."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Depending on the Display mode, reports will be individual or shared."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Start goal"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,period:0
+msgid "Periodicity"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:692
+#, python-format
+msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,compute_code:0
+msgid "Python Code"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Rewards for challenges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Send Report"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Period"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,name:0
+msgid "Challenge Name"
+msgstr ""
+
+#. module: gamification
+#: model:ir.ui.menu,name:gamification.gamification_menu
+msgid "Gamification Tools"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,goal_definition_ids:0
+msgid "Rewarded by"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,remaining_sending:0
+msgid "Remaining Sending Allowed"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+msgid "Done"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,visibility_mode:0
+#: field:gamification.goal,definition_display:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.goal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "There is no reward upon completion of this challenge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,monetary:0
+msgid "The target and current value are defined in the company currency."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,condition:0
+msgid "The higher the better"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_company_logo
+msgid "Set your Company Logo"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal Reached"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my:0
+msgid "The number of time the current user has received this badge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,report_message_group_id:0
+msgid "Group that will receive a copy of the report in addition to the user"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,target_goal:0
+msgid "To Reach"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,res_id_field:0
+msgid "The field name on the user profile (res.users) containing the value for res_id for action."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,remind_update_delay:0
+msgid "The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+msgid "Who would you like to reward?"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge.line,condition:0
+msgid "<="
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Configure Challenge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,user_ids:0
+msgid "List of users participating to the challenge"
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.email_template_goal_reminder
+msgid "<header><strong>Reminder ${object.name}</strong>\n"
+"    </header><p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"\n"
+"    <p>If you have not changed your score yet, you can use the button \"The current value is up to date\" to indicate so.</p>"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+#: field:gamification.goal.wizard,current:0
+msgid "Current"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "To"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:225
+#, python-format
+msgid "You are not in the user allowed list."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "í"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,challenge_ids:0
+msgid "Reward of Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,definition_condition:0
+msgid "Definition Condition"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,autojoin_group_id:0
+msgid "Group of users whose members will be automatically added to user_ids once the challenge is started"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: model:ir.actions.act_window,name:gamification.goal_definition_list_action
+#: model:ir.ui.menu,name:gamification.gamification_definition_menu
+msgid "Goal Definitions"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_hidden
+msgid "Hidden"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+msgid "days"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_template_id:0
+msgid "Report Template"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth:0
+msgid "Allowance to Grant"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: sum on a field"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.challenge,name:gamification.challenge_base_discover
+msgid "Complete your Profile"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,description:0
+#: field:gamification.challenge,description:0
+msgid "Description"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:223
+#, python-format
+msgid "This badge can not be sent by users."
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.email_template_badge_received
+msgid "<p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
+"            % if object.sender_id\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
+"            % endif\n"
+"        </p>\n"
+"\n"
+"        % if object.comment\n"
+"            <p><em>${object.comment}</em></p>\n"
+"        % endif\n"
+"        "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_this_month:0
+msgid "Monthly total"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_third_id:0
+msgid "For 3rd user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+msgid "Describe what they did and why it matters (will be public)"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:227
+#, python-format
+msgid "You do not have the required badges."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "e.g. Monthly Sales Objectives"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,line_ids:0
+msgid "List of goals that will be set"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Badge List"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,visibility_mode:0
+msgid "Leader Board (Group Ranking)"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reached when current value is"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:351
+#, python-format
+msgid "Can not modify the configuration of a started goal"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,unique_owner_ids:0
+msgid "Unique Owners"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:665
+#, python-format
+msgid "The challenge %s is finished."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,end_date:0
+#: view:gamification.goal:0
+#: field:gamification.goal,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,owner_ids:0
+msgid "The list of instances of this badge granted to users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal Failed"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,res_id_field:0
+msgid "ID Field of user"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:105
+#, python-format
+msgid "Invited Challenges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reset Completion"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,domain:0
+msgid "Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)]."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my_monthly_sending:0
+msgid "The number of time the current user has sent this badge this month."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,challenge_id:0
+msgid "Challenge that generated the goal, assign challenge to users to generate goals with a value in this field."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth_user_ids:0
+msgid "Authorized Users"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goal_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a goal. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A goal is defined by a user and a goal definition.\n"
+"                    Goals can be created automatically by using challenges.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_failure:0
+msgid "Reward Bests if not Succeeded?"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,field_id:0
+msgid "Field to Sum"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_summary:0
+#: field:gamification.challenge,message_summary:0
+#: field:gamification.goal,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_good_job
+msgid "Good Job"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:32
+#: code:addons/gamification/static/src/xml/gamification.xml:54
+#, python-format
+msgid "Target:"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.wizard:0
+msgid "Set the current value you have reached for this goal"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "Everyone"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "How to compute the goal?"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Search Goal Definitions"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_nbr_following
+msgid "Mail Group Following"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Accept"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Grant this Badge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.challenge_list_action
+#: model:ir.ui.menu,name:gamification.gamification_challenge_menu
+msgid "Challenges"
+msgstr ""
+
+#. module: gamification
+#: model:res.groups,name:gamification.group_goal_manager
+msgid "Manager"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "HR Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,remind_update_delay:0
+msgid "Remind delay"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "No monthly sending limit"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Reached"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user:0
+msgid "the"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_count:0
+msgid "Total"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,period:0
+msgid "Period of automatic goal assigment. If none is selected, should be launched manually."
+msgstr ""
+

From d4244bec3e6df28614eb93eb5d6f936f8fbac4f4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Feb 2014 16:27:28 +0100
Subject: [PATCH 028/134] [IMP] website: add a checkbox on new page dialog to
 add page in menu. Fix: The new page is confusing: one user created a new page
 and then she don't figure out how to find it

bzr revid: chm@openerp.com-20140213152728-jj6j1hxae8ia5w4k
---
 addons/website/controllers/main.py            |  9 +++++++-
 .../static/src/js/website.editor.newpage.js   | 23 ++++++++++++++++---
 addons/website/static/src/js/website.js       |  3 ++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index a6d8f2982f9..94a2e6fd01c 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -95,8 +95,15 @@ class Website(openerp.addons.web.controllers.main.Home):
     # Edit
     #------------------------------------------------------
     @http.route('/website/add/<path:path>', type='http', auth="user", website=True)
-    def pagenew(self, path, noredirect=False):
+    def pagenew(self, path, noredirect=False, add_menu=None):
         xml_id = request.registry['website'].new_page(request.cr, request.uid, path, context=request.context)
+        if add_menu:
+            model, id  = request.registry["ir.model.data"].get_object_reference(request.cr, request.uid, 'website', 'main_menu')
+            request.registry['website.menu'].create(request.cr, request.uid, {
+                    'name': path,
+                    'url': path,
+                    'parent_id': id,
+                }, context=request.context)
         url = "/page/" + xml_id
         if noredirect:
             return werkzeug.wrappers.Response(url, mimetype='text/plain')
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index 8d3b3e9b6b5..dc990b316fc 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -19,10 +19,27 @@
                 website.prompt({
                     id: "editor_new_page",
                     window_title: _t("New Page"),
-                    input: "Page Title",
-                }).then(function (val) {
+                    input: _t("Page Title"),
+                    init: function () {
+                        var $group = this.$dialog.find("div.form-group");
+                        $group.find("label").removeClass("col-sm-3").addClass("col-sm-4");
+                        $group.find("div").removeClass("col-sm-9").addClass("col-sm-8");
+                        $group.removeClass("mb0");
+
+                        var $add = $(
+                            '<div class="form-group mb0">'+
+                                '<label for="page-name" class="col-sm-4 control-label"></label>'+
+                                '<div class="col-sm-8 text-left">'+
+                                '    <input type="checkbox" class="form-control" style="width: 24px" checked="checked" required="required"/>'+
+                                '</div>'+
+                            '</div>');
+                        $add.find('label').text(_t("Add page in menu"));
+                        $group.after($add);
+                    }
+                }).then(function (val, field, $dialog) {
                     if (val) {
-                        document.location = '/website/add/' + encodeURI(val);
+                        console.log('/website/add/' + encodeURI(val) + "?add_menu=" + $dialog.find('input[type="checkbox"]').is(':checked'));
+                        document.location = '/website/add/' + encodeURI(val) + "?add_menu=" + $dialog.find('input[type="checkbox"]').is(':checked');
                     }
                 });
             }
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 6fde9495d36..b249fb7136f 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -206,6 +206,7 @@
 
         var def = $.Deferred();
         var dialog = $(openerp.qweb.render('website.prompt', options)).appendTo("body");
+        options.$dialog = dialog;
         var field = dialog.find(options.field_type).first();
         field.val(options.default);
         field.fillWith = function (data) {
@@ -226,7 +227,7 @@
             dialog.modal('show');
             field.focus();
             dialog.on('click', '.btn-primary', function () {
-                def.resolve(field.val(), field);
+                def.resolve(field.val(), field, dialog);
                 dialog.remove();
             });
         });

From 325ad57a006e5378f96871543e19ae93176838fb Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Feb 2014 17:45:46 +0100
Subject: [PATCH 029/134] [FIX] branding distribution to generate correct xpath
 even after injection of inherited view contents

bzr revid: xmo@openerp.com-20140213164546-xor2k3tat8d216wq
---
 openerp/addons/base/ir/ir_ui_view.py    |  4 ++
 openerp/addons/base/tests/test_views.py | 55 +++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index fe62d9e80cc..aafce29b7eb 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -755,6 +755,10 @@ class view(osv.osv):
                 # running index by tag type, for XPath query generation
                 indexes = collections.defaultdict(lambda: 0)
                 for child in e.iterchildren(tag=etree.Element):
+                    if child.get('data-oe-xpath'):
+                        # injected by view inheritance, skip otherwise
+                        # generated xpath is incorrect
+                        continue
                     indexes[child.tag] += 1
                     self.distribute_branding(child, distributed_branding,
                                              parent_xpath=node_path,
diff --git a/openerp/addons/base/tests/test_views.py b/openerp/addons/base/tests/test_views.py
index d93734f48cb..6780996ed6e 100644
--- a/openerp/addons/base/tests/test_views.py
+++ b/openerp/addons/base/tests/test_views.py
@@ -417,6 +417,61 @@ class TestNoModel(common.TransactionCase):
             ET.tostring(sarch, encoding='utf-8'),
             ET.tostring(self.arch, encoding='utf-8'))
 
+class TestTemplating(common.TransactionCase):
+    def setUp(self):
+        import openerp.modules
+        super(TestTemplating, self).setUp()
+        self._pool = openerp.modules.registry.RegistryManager.get(common.DB)
+        self._init = self._pool._init
+        # fuck off
+        self._pool._init = False
+
+    def tearDown(self):
+        self._pool._init = self._init
+        super(TestTemplating, self).tearDown()
+
+    def test_branding_inherit(self):
+        Views = self.registry('ir.ui.view')
+        id = Views.create(self.cr, self.uid, {
+            'name': "Base view",
+            'type': 'qweb',
+            'arch': """<root>
+                <item order="1"/>
+            </root>
+            """
+        })
+        id2 = Views.create(self.cr, self.uid, {
+            'name': "Extension",
+            'type': 'qweb',
+            'inherit_id': id,
+            'arch': """<xpath expr="//item" position="before">
+                <item order="2"/>
+            </xpath>
+            """
+        })
+
+        arch_string = Views.read_combined(
+            self.cr, self.uid, id, fields=['arch'],
+            context={'inherit_branding': True})['arch']
+
+        arch = ET.fromstring(arch_string)
+        Views.distribute_branding(arch)
+
+        [initial] = arch.xpath('//item[@order=1]')
+        self.assertEqual(
+            str(id),
+            initial.get('data-oe-id'),
+            "initial should come from the root view")
+        self.assertEqual(
+            '/root[1]/item[1]',
+            initial.get('data-oe-xpath'),
+            "initial's xpath should be within the root view only")
+
+        [second] = arch.xpath('//item[@order=2]')
+        self.assertEqual(
+            str(id2),
+            second.get('data-oe-id'),
+            "second should come from the extension view")
 
 class test_views(common.TransactionCase):
 

From c64a762d06de76ee47356922479eea70694712d9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 20:08:45 +0100
Subject: [PATCH 030/134] [FIX] auth_signup: correct authentification after
 successfull signup

bzr revid: chs@openerp.com-20140213190845-azch00bppzp1pk0d
---
 addons/auth_signup/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index ba044530468..16baa97d018 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -96,8 +96,9 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
 
     def _signup_with_values(self, token, values):
         db, login, password = request.registry['res.users'].signup(request.cr, openerp.SUPERUSER_ID, values, token)
+        request.cr.commit()     # as authenticate will use its own cursor we need to commit the current transaction
         uid = request.session.authenticate(db, login, password)
-        if uid is not False:
+        if not uid:
             raise SignupError(_('Authentification Failed.'))
 
 

From 03ff1c53c6b60117e4df90c0613a1b422eabb309 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 14 Feb 2014 11:02:42 +0100
Subject: [PATCH 031/134] [FIX] website: typo event tour

bzr revid: chm@openerp.com-20140214100242-rzt6mboq0j0gpp6i
---
 addons/website_event/static/src/js/website.tour.event.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index 73510b455dd..a9e40a5f65b 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -21,7 +21,7 @@
                 {
                     title:     _t("Create an Event"),
                     content:   _t("Let's go through the first steps to publish a new event."),
-                    popover:   { next: _("Start Tutorial"), end: _("Skip It") },
+                    popover:   { next: _t("Start Tutorial"), end: _t("Skip It") },
                 },
                 {
                     element:   '#content-menu-button',

From 386b2fe70f76ec01ef428b8efbb9d1c613253c25 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 14 Feb 2014 11:37:44 +0100
Subject: [PATCH 032/134] [IMP] website: add page: change default sequence and
 layout

bzr revid: chm@openerp.com-20140214103744-dptrytkfbcwti6t8
---
 addons/website/controllers/main.py                    |  2 +-
 addons/website/models/website.py                      |  7 ++++++-
 .../website/static/src/js/website.editor.newpage.js   | 11 ++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 94a2e6fd01c..605315050c6 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -101,7 +101,7 @@ class Website(openerp.addons.web.controllers.main.Home):
             model, id  = request.registry["ir.model.data"].get_object_reference(request.cr, request.uid, 'website', 'main_menu')
             request.registry['website.menu'].create(request.cr, request.uid, {
                     'name': path,
-                    'url': path,
+                    'url': "/page/" + xml_id,
                     'parent_id': id,
                 }, context=request.context)
         url = "/page/" + xml_id
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ea095c04fe3..3dcb028fed2 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -494,9 +494,14 @@ class website_menu(osv.osv):
         'parent_left': fields.integer('Parent Left', select=True),
         'parent_right': fields.integer('Parent Right', select=True),
     }
+
+    def __defaults_sequence(self, cr, uid, context):
+        menu = self.search_read(cr, uid, [(1,"=",1)], ["sequence"], limit=1, order="sequence DESC", context=context)
+        return menu and menu[0]["sequence"] or 0
+
     _defaults = {
         'url': '',
-        'sequence': 0,
+        'sequence': __defaults_sequence,
         'new_window': False,
     }
     _parent_store = True
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index dc990b316fc..19cf8060897 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -22,18 +22,15 @@
                     input: _t("Page Title"),
                     init: function () {
                         var $group = this.$dialog.find("div.form-group");
-                        $group.find("label").removeClass("col-sm-3").addClass("col-sm-4");
-                        $group.find("div").removeClass("col-sm-9").addClass("col-sm-8");
                         $group.removeClass("mb0");
 
                         var $add = $(
                             '<div class="form-group mb0">'+
-                                '<label for="page-name" class="col-sm-4 control-label"></label>'+
-                                '<div class="col-sm-8 text-left">'+
-                                '    <input type="checkbox" class="form-control" style="width: 24px" checked="checked" required="required"/>'+
-                                '</div>'+
+                                '<label class="col-sm-offset-3 col-sm-9 text-left">'+
+                                '    <input type="checkbox" checked="checked" required="required"/> '+
+                                '</label>'+
                             '</div>');
-                        $add.find('label').text(_t("Add page in menu"));
+                        $add.find('label').append(_t("Add page in menu"));
                         $group.after($add);
                     }
                 }).then(function (val, field, $dialog) {

From 56b11dd7f4c834f571b76298b31c9f66b6224b43 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Fri, 14 Feb 2014 16:25:12 +0100
Subject: [PATCH 033/134] [FIX] Fix bug with filter when no attendee_people

bzr revid: jke@openerp.com-20140214152512-6i2zrmjdq4hp57k4
---
 .../static/src/js/web_calendar.js             | 244 +++++++++---------
 1 file changed, 123 insertions(+), 121 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index ef84f8a2784..a52f5ce546e 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -5,9 +5,9 @@
 _.str.toBoolElse = function(str, elseValues, trueValues, falseValues) {
       var ret = _.str.toBool(str, trueValues, falseValues);
       if (_.isUndefined(ret)) {
-        return elseValues
+        return elseValues;
       }
-      return ret
+      return ret;
 };
 
 openerp.web_calendar = function(instance) {
@@ -37,7 +37,7 @@ openerp.web_calendar = function(instance) {
     }
 
     function isNullOrUndef(value) {
-        return _.isUndefined(value) || _.isNull(value)
+        return _.isUndefined(value) || _.isNull(value);
     }
     
     instance.web.views.add('calendar', 'instance.web_calendar.CalendarView');
@@ -60,7 +60,6 @@ openerp.web_calendar = function(instance) {
             this.range_start = null;
             this.range_stop = null;
             this.selected_filters = [];
-                        
         },
 
         set_default_options: function(options) {
@@ -72,7 +71,9 @@ openerp.web_calendar = function(instance) {
 
         destroy: function() {
             this.$calendar.fullCalendar('destroy');
-            this.$small_calendar.datepicker('destroy');
+            if (this.$small_calendar){
+                this.$small_calendar.datepicker('destroy');
+            }
             this._super.apply(this, arguments);
         },
 
@@ -112,21 +113,21 @@ openerp.web_calendar = function(instance) {
             this.date_start = attrs.date_start;     // Field name of starting date field
             this.date_delay = attrs.date_delay;     // duration
             this.date_stop = attrs.date_stop;
-            this.all_day = attrs.all_day; 
-            this.attendee_people = attrs.attendee;  
+            this.all_day = attrs.all_day;
+            this.attendee_people = attrs.attendee;
             this.how_display_event = '';
            
             if (!isNullOrUndef(attrs.quick_create_instance)) {
-                self.quick_create_instance = 'instance.' + attrs.quick_create_instance;                
+                self.quick_create_instance = 'instance.' + attrs.quick_create_instance;
             }
                 
             //if quick_add = False, we don't allow quick_add
             //if quick_add = not specified in view, we use the default quick_create_instance
             //if quick_add = is NOT False and IS specified in view, we this one for quick_create_instance'   
             
-            this.quick_add_pop = (isNullOrUndef(attrs.quick_add) || _.str.toBoolElse(attrs.quick_add,true) );            
+            this.quick_add_pop = (isNullOrUndef(attrs.quick_add) || _.str.toBoolElse(attrs.quick_add,true) );
             if (this.quick_add_pop && !isNullOrUndef(attrs.quick_add)) {
-                self.quick_create_instance = 'instance.' + attrs.quick_add;                
+                self.quick_create_instance = 'instance.' + attrs.quick_add;
             }
             // The display format which will be used to display the event where fields are between "[" and "]"
             if (!isNullOrUndef(attrs.display)) {
@@ -135,18 +136,18 @@ openerp.web_calendar = function(instance) {
             
             // If this field is set ot true, we don't open the event in form view, but in a popup with the view_id passed by this parameter
             if (isNullOrUndef(attrs.event_open_popup) || !_.str.toBoolElse(attrs.event_open_popup,true)) {
-                this.open_popup_action = false; 
+                this.open_popup_action = false;
             }
             else {
                 this.open_popup_action = attrs.event_open_popup;
             }
             
-            // If this field is set to true, we will use de calendar_friends model as filter and not the color field.
-            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && _.str.toBool(attrs.use_contacts)); 
+            // If this field is set to true, we will use the calendar_friends model as filter and not the color field.
+            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && _.str.toBool(attrs.use_contacts));
 
             // If this field is set ot true, we don't add itself as an attendee when we use attendee_people to add each attendee icon on an event
             // The color is the color of the attendee, so don't need to show again that it will be present
-            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || !_.str.toBoolElse(attrs.color_is_attendee,true))); 
+            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || !_.str.toBoolElse(attrs.color_is_attendee, true)));
                 
 /*
             Will be more logic to do it in futur, but see below to stay Retro-compatible
@@ -164,14 +165,14 @@ openerp.web_calendar = function(instance) {
             }            
 */
             if (isNullOrUndef(attrs.avatar_model)) {
-                this.avatar_model = null; 
+                this.avatar_model = null;
             }
             else {
                 this.avatar_model = attrs.avatar_model;
             }
            
             if (isNullOrUndef(attrs.avatar_title)) {
-                this.avatar_title = this.avatar_model; 
+                this.avatar_title = this.avatar_model;
             }
             else {
                 this.avatar_title = attrs.avatar_title;
@@ -195,7 +196,7 @@ openerp.web_calendar = function(instance) {
                 .call("check_access_rights", ["create", false])
                 .then(function (create_right) {
                     self.create_right = create_right;
-                    self.init_calendar().then(function() {    
+                    self.init_calendar().then(function() {
                         self.trigger('calendar_view_loaded', fv);
                         self.ready.resolve();
                     });
@@ -231,15 +232,15 @@ openerp.web_calendar = function(instance) {
                     self.proxy('update_record')(event._id, data);
                 },
                 eventRender: function (event, element, view) {
-                    element.find('.fc-event-title').html(event.title);                    
+                    element.find('.fc-event-title').html(event.title);
                 },
-                eventAfterRender: function (event, element, view) {                    
+                eventAfterRender: function (event, element, view) {
                     if ((view.name !== 'month') && (((event.end-event.start)/60000)<=30)) {
                         //if duration is too small, we see the html code of img
                         var current_title = $(element.find('.fc-event-time')).text();
-                        var new_title = current_title.substr(0,current_title.indexOf("<img")>0?current_title.indexOf("<img"):current_title.length)
+                        var new_title = current_title.substr(0,current_title.indexOf("<img")>0?current_title.indexOf("<img"):current_title.length);
                         element.find('.fc-event-time').html(new_title);
-                    }                    
+                    }
                 },
                 eventClick: function (event) { self.open_event(event._id,event.title); },
                 select: function (start_date, end_date, all_day, _js_event, _view) {
@@ -294,11 +295,11 @@ openerp.web_calendar = function(instance) {
                         context.$calendar.fullCalendar('changeView','agendaDay');
                     }
                 }
-                else if (curView.name != "agendaDay" || (curView.name == "agendaDay" && curDate.compareTo(curView.start)==0)) {
+                else if (curView.name != "agendaDay" || (curView.name == "agendaDay" && curDate.compareTo(curView.start)===0)) {
                         context.$calendar.fullCalendar('changeView','agendaWeek');
                 }
                 context.$calendar.fullCalendar('gotoDate', obj.currentYear , obj.currentMonth, obj.currentDay);
-            }
+            };
         },
 
         init_calendar: function() {
@@ -312,9 +313,10 @@ openerp.web_calendar = function(instance) {
                 this.$small_calendar.datepicker({ onSelect: self.calendarMiniChanged(self) });
             
                 if (this.useContacts) {
+                    //Get my Partner ID
                     new instance.web.Model("res.users").query(["partner_id"]).filter([["id", "=",this.dataset.context.uid]]).first()
                         .done(
-                            function(result) { 
+                            function(result) {
                                 var sidebar_items = {};
                                 var filter_value = result.partner_id[0];
                                 var filter_item = {
@@ -326,12 +328,12 @@ openerp.web_calendar = function(instance) {
                                 sidebar_items[filter_value] = filter_item ;
                                 filter_item = {
                                         value: -1,
-                                        label: _lt("All calendars"),
+                                        label: _lt("Everybody's calendars"),
                                         color: self.get_color(-1),
                                         avatar_model: self.avatar_model
                                     };
                                 sidebar_items[-1] = filter_item ;
-
+                                //Get my coworkers/contacts
                                 new instance.web.Model("calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
                                     _.each(result, function(item) {
                                         filter_value = item.partner_id[0];
@@ -347,12 +349,12 @@ openerp.web_calendar = function(instance) {
                                     self.allFilters = sidebar_items;
                                     self.sidebar.filter.events_loaded(sidebar_items);
                                     self.sidebar.filter.addUpdateButton();
-                                }).done(function () { 
-                                    self.$calendar.fullCalendar('refetchEvents');            
+                                }).done(function () {
+                                    self.$calendar.fullCalendar('refetchEvents');
                                 });
                             }
-                         );               
-                };
+                         );
+                }
                 this.extraSideBar();
                 
             }
@@ -492,7 +494,7 @@ openerp.web_calendar = function(instance) {
                 all_day = this.all_day ? evt[this.all_day] : false,
                 res_computed_text = '',
                 the_title = '',
-                attendees = [];          
+                attendees = [];
 
             if (this.info_fields) {
                 var temp_ret = {};
@@ -526,7 +528,7 @@ openerp.web_calendar = function(instance) {
                         temp_ret[fieldname] = value;
                     }
                     res_computed_text = res_computed_text.replace("["+fieldname+"]",temp_ret[fieldname]);
-                });                
+                });
 
                 
                 if (res_computed_text.length) {
@@ -534,8 +536,8 @@ openerp.web_calendar = function(instance) {
                 }
                 else {
                     var res_text= [];
-                    _.each(temp_ret, function(val,key) { res_text.push(val)} );
-                    the_title = res_text.join(', ');                    
+                    _.each(temp_ret, function(val,key) { res_text.push(val); });
+                    the_title = res_text.join(', ');
                 }
                 the_title = _.escape(the_title);
                 
@@ -547,34 +549,33 @@ openerp.web_calendar = function(instance) {
                     var attendee_showed = 0;
                     var attendee_other = '';
 
-                    _.each(temp_ret[this.attendee_people], 
-                        function (the_attendee_people) { 
+                    _.each(temp_ret[this.attendee_people],
+                        function (the_attendee_people) {
                             attendees.push(the_attendee_people);
                             attendee_showed += 1;
-                            if (attendee_showed<= MAX_ATTENDEES) {                            
-                                if (self.avatar_model != null) {
-                                       the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" src="/web/binary/image?model=' + self.avatar_model + '&field=image_small&id=' + the_attendee_people + '"></img>';                                
+                            if (attendee_showed<= MAX_ATTENDEES) {
+                                if (self.avatar_model !== null) {
+                                       the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" src="/web/binary/image?model=' + self.avatar_model + '&field=image_small&id=' + the_attendee_people + '"></img>';
                                 }
                                 else {
                                     if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) {
                                             tempColor = (self.all_filters[the_attendee_people] != undefined) 
                                                                 ? self.all_filters[the_attendee_people].color
-                                                                : self.all_filters[-1].color;
-                                            
-                                        the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>' 
+                                                                : self.all_filters[-1].color;                                            
+                                        the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>';
                                     }//else don't add myself
                                 }
                             }
                             else {
                                 attendee_other += self.all_attendees[the_attendee_people] +", ";
-                            }                                    
+                            }
                         }
                     );
                     if (attendee_other.length>2) {
-                        the_title_avatar += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';                    
+                        the_title_avatar += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';
                     }
                     the_title = the_title_avatar + the_title;
-                }                
+                }
             }
             
             if (!date_stop && date_delay) {
@@ -593,20 +594,19 @@ openerp.web_calendar = function(instance) {
             };
             
 
-            if (!self.useContacts || self.all_filters[evt[this.color_field]] != undefined) {
+            if (!self.useContacts || self.all_filters[evt[this.color_field]] !== undefined) {
                 if (this.color_field && evt[this.color_field]) {
                     var color_key = evt[this.color_field];
                     if (typeof color_key === "object") {
                         color_key = color_key[0];
                     }
-                    r.className = 'cal_opacity calendar_color_'+ this.get_color(color_key);                                
+                    r.className = 'cal_opacity calendar_color_'+ this.get_color(color_key);
                 }
             }
             else  { // if form all, get color -1
 
                   r.className = 'cal_opacity calendar_color_'+ self.all_filters[-1].color;
             }
-            
             return r;
         },
         
@@ -623,7 +623,7 @@ openerp.web_calendar = function(instance) {
             
             var event_end = event.end;
             //Bug when we move an all_day event from week or day view, we don't have a dateend or duration...            
-            if (event_end == null) {
+            if (event_end === null) {
                 event_end = new Date(event.start).addHours(2);
             }
 
@@ -633,14 +633,14 @@ openerp.web_calendar = function(instance) {
                     event_end = new Date(event.start);
                 }
                 if (this.all_day) {
-                    event_end = (new Date(event_end.getTime())).addDays(1); 
-                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()))
-                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()))            
+                    event_end = (new Date(event_end.getTime())).addDays(1);
+                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()));
+                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()));
                 }
                 else {
-                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7))
-                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19))            
-                }                                
+                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7));
+                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19));
+                }
                 data[this.date_start] = instance.web.parse_value(date_start_day, this.fields[this.date_start]);
                 if (this.date_stop) {
                     data[this.date_stop] = instance.web.parse_value(date_stop_day, this.fields[this.date_stop]);
@@ -652,13 +652,12 @@ openerp.web_calendar = function(instance) {
                 data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]);
                 if (this.date_stop) {
                     data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]);
-                }            
-
+                }
             }
 
 
             if (this.all_day) {
-                data[this.all_day] = event.allDay;                
+                data[this.all_day] = event.allDay;
             }
 
             if (this.date_delay) {
@@ -667,8 +666,14 @@ openerp.web_calendar = function(instance) {
             }
             return data;
         },
+
         do_search: function(domain, context, _group_by) {
             var self = this;
+
+            if (self.sidebar) {
+                self.sidebar.filter.is_loaded = false;
+            }
+
             if (! _.isUndefined(this.event_source)) {
                 this.$calendar.fullCalendar('removeEventSource', this.event_source);
             }
@@ -680,33 +685,32 @@ openerp.web_calendar = function(instance) {
                         domain: self.get_range_domain(domain, start, end),
                         context: context,
                     }).done(function(events) {
+
                         if (self.event_source !== current_event_source) {
                             console.log("Consecutive ``do_search`` called. Cancelling.");
                             return;
                         }
-                        // We should make sure that *2many used in title of event have their extended form [ID, NAME]...
                         
-                        events = $.map(events, function (e) {
-                            
-                            if (self.attendee_people != undefined) { //If we filter on contacts...
-                                if (_.intersection(self.selected_filters,e[self.attendee_people]).length || (self.selected_filters.indexOf(-1) > -1)) {
-                                    return e;
-                                }
-                                else {
-                                    return null;
-                                }   
+                       if (self.attendee_people !== undefined) {
+                            //If we filter on 'Everybody's Calendar, we don't filter events 
+                            if (self.selected_filters.indexOf(-1) == -1) {
+
+                                //If we filter on contacts... we keep only events from coworkers                                 
+                                events = $.map(events, function (e) {
+                                        if (_.intersection(self.selected_filters,e[self.attendee_people]).length ) {
+                                            return e;
+                                        }
+                                        return null;
+                                });
                             }
-                            else { //We adds all events 
-                                return e;
-                            }                            
-                            return null;                            
-                        });
+                        }
                         
-                        if (!self.useContacts) {  // If we use all peoples as filter in sidebars
+                        if (!self.useContacts) {  // If we use all peoples displayed in the current month as filter in sidebars
                             var now_filters = {};
                             var filter_value;
                             var filter_item;
                             
+                            
                             _.each(events, function (e) {
                                 filter_value = e[self.color_field][0];
                                 filter_item = {
@@ -720,31 +724,44 @@ openerp.web_calendar = function(instance) {
                                 }
                             });
                             
-                            self.allFilters = now_filters;
-                            self.sidebar.filter.events_loaded(now_filters);                            
                             
+                            self.allFilters = now_filters;
+
+                            if (self.sidebar) {
+                                if (!self.sidebar.filter.is_loaded) {
+                                    self.sidebar.filter.events_loaded(now_filters);
+                                }
+                                else {
+                                    events = $.map(events, function (e) {
+                                        if (_.contains(self.selected_filters,e[self.color_field][0]) ) {
+                                            return e;
+                                        }
+                                        return null;
+                                    });
+                                }
+                            }
                             return self.perform_necessary_name_gets(events).then(callback);
                         }
                         else {
                             var all_attendees = [];
                             
                             _.each(events, function (e) {
-                                all_attendees.push(e[self.attendee_people]);                                
+                                all_attendees.push(e[self.attendee_people]);
                             });
                             
-                            self.all_attendees = {}
+                            self.all_attendees = {};
                             
                             all_attendees = _.chain(all_attendees).flatten().uniq().value();
                             
-                            if (self.avatar_title != null) {
+                            if (self.avatar_title !== null) {
                                 new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in",all_attendees]]).all().then(function(result) {
                                     _.each(result, function(item) {
                                         self.all_attendees[item.id] = item.name;
                                     });
-                                }).done(function() { 
+                                }).done(function() {
                                     return self.perform_necessary_name_gets(events).then(callback);
                                 });
-                            }                                                        
+                            }
                             else {
                                 _.each(all_attendees,function(item){
                                         self.all_attendees[item] = '';
@@ -752,10 +769,7 @@ openerp.web_calendar = function(instance) {
                                 return self.perform_necessary_name_gets(events).then(callback);
                                 
                             }
-                            
                         }
-                        
-
                     });
                 },
                 eventDataTransform: function (event) {
@@ -776,7 +790,6 @@ openerp.web_calendar = function(instance) {
                  [this.date_start, '<=', format(end.clone())]]);
         },
 
-
         /**
          * Updates record identified by ``id`` with values in object ``data``
          */
@@ -799,26 +812,22 @@ openerp.web_calendar = function(instance) {
             }
             return false;
         },
-        open_event: function(id,title) {
+        open_event: function(id, title) {
             var self = this;
-            if (! this.open_popup_action) { 
+            if (! this.open_popup_action) {
                 var index = this.dataset.get_id_index(id);
                 this.dataset.index = index;
                 this.do_switch_view('form', null, { mode: "edit" });
-            }            
+            }
             else {
-
-                var self = this;
-
                 var pop = new instance.web.form.FormOpenPopup(this);
-                console.log(this.open_popup_action, +this.open_popup_action);
                 pop.show_element(this.dataset.model, id, this.dataset.get_context(), {
                     title: _.str.sprintf(_t("View: %s"),title),
                     view_id: +this.open_popup_action,
                     res_id: id,
                     target: 'new',
                     readonly:true
-                });              
+                });
 
                var form_controller = pop.view_form;
                form_controller.on("load_record", self, function(){
@@ -826,33 +835,25 @@ openerp.web_calendar = function(instance) {
                     button_edit = _.str.sprintf("<button class='oe_button oe_bold editme oe_highlight'><span> %s </span></button>",_t("Edit Event"));
                     
                     
-                    pop.$el.closest(".ui-dialog").find(".ui-dialog-buttonpane").prepend(button_delete)
-                    pop.$el.closest(".ui-dialog").find(".ui-dialog-buttonpane").prepend(button_edit)
+                    pop.$el.closest(".ui-dialog").find(".ui-dialog-buttonpane").prepend(button_delete);
+                    pop.$el.closest(".ui-dialog").find(".ui-dialog-buttonpane").prepend(button_edit);
                     
                     $('.delme').click(
-                        function() { 
-                            $('.oe_form_button_cancel').trigger('click'); 
-                            self.remove_event(id); 
+                        function() {
+                            $('.oe_form_button_cancel').trigger('click');
+                            self.remove_event(id);
                         }
                     );
                     $('.editme').click(
-                        function() { 
-                            $('.oe_form_button_cancel').trigger('click'); 
-
-                            var index = self.dataset.get_id_index(id);
-                            self.dataset.index = index;
+                        function() {
+                            $('.oe_form_button_cancel').trigger('click');
+                            self.dataset.index = self.dataset.get_id_index(id);
                             self.do_switch_view('form', null, { mode: "edit" });
-
                         }
                     );
-                    
-                    
                });
-                 
-            }   
-            
-            return false;         
-            
+            }
+            return false;
         },
 
         do_show: function() {
@@ -993,7 +994,6 @@ openerp.web_calendar = function(instance) {
             });
             
             self.$el.on('dialogclose', self, function() {
-                console.log("dialogclose");
                 self.trigger('close');
             });
 
@@ -1312,7 +1312,6 @@ openerp.web_calendar = function(instance) {
         },
 
         render_value: function() {
-            console.log("In render value");
             var self = this;
             this.dataset.set_ids(this.get("value"));
             this.is_loaded = this.is_loaded.then(function() {
@@ -1373,6 +1372,7 @@ openerp.web_calendar = function(instance) {
         }
     });
     instance.web_calendar.SidebarFilter = instance.web.Widget.extend({
+        is_loaded:false,
         events: {
             'change input:checkbox': 'filter_click'
         },
@@ -1380,12 +1380,18 @@ openerp.web_calendar = function(instance) {
             this._super(parent);
             this.view = view;            
         },
+
+   
+
         events_loaded: function(filters) {
             var self = this;
+            self.is_loaded=true;          
+            
             self.selected_filters = [];
             self.view.all_filters = filters;
             this.$el.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters }));
-            this.filter_click(null);                        
+            this.filter_click(null);
+
         },
         filter_click: function(e) {
             var self = this,
@@ -1397,15 +1403,11 @@ openerp.web_calendar = function(instance) {
                 if (e==null && parseInt($(this).val())<0) {
                     $(this).prop('checked',false);
                     return;
-                }                    
+                }         
+
                 self.view.selected_filters.push(parseInt($(this).val()));
             });
-            
-            if (e !== null) { //First intialize 
-                self.view.$calendar.fullCalendar('refetchEvents');  
-            }
-
-            
+            self.view.$calendar.fullCalendar('refetchEvents');  
         },
         addUpdateButton: function() {
             var self=this;

From 0c86591d95f07734aee5cc13ac13974a9243c5cc Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Fri, 14 Feb 2014 16:28:12 +0100
Subject: [PATCH 034/134] [IMP] Remove default filter on "My meetings" in
 calendar

bzr revid: jke@openerp.com-20140214152812-a7lws77lgycf5cuq
---
 addons/calendar/calendar_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 01c4b596592..20ede6752d2 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -267,8 +267,7 @@
         <field name="res_model">calendar.event</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="view_calendar_event_calendar"/>
-        <field name="search_view_id" ref="view_calendar_event_search"/>       
-        <field name="context">{"search_default_mymeetings": 1}</field>
+        <field name="search_view_id" ref="view_calendar_event_search"/>               
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to schedule a new meeting.

From 632182589c3676fa7561f21c496d005418a3aaea Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Feb 2014 10:33:11 +0100
Subject: [PATCH 035/134] [IMP] website: extra safe check for qcontext's  flag

bzr revid: odo@openerp.com-20140217093311-wmv6sxtv9aizusvr
---
 addons/website/models/ir_ui_view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index a789657dad3..27af03310a9 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -148,7 +148,7 @@ class view(osv.osv):
                 qcontext.update(values)
 
             # in edit mode ir.ui.view will tag nodes
-            context['inherit_branding'] = qcontext['editable']
+            context['inherit_branding'] = qcontext.get('editable', False)
 
             view_obj = request.website.get_template(id_or_xml_id)
             if 'main_object' not in qcontext:

From 0227d6a05610e8aeb091dd9e6112a95fff347207 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Feb 2014 10:51:43 +0100
Subject: [PATCH 036/134] [FIX] mail: adapt `assertRaises` test after
 corresponding code change in last forward-port

bzr revid: odo@openerp.com-20140217095143-ibhqyzflle2hbimy
---
 addons/mail/tests/test_mail_gateway.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 7941c1e5e9f..cb735ec098e 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -394,7 +394,7 @@ class TestMailgateway(TestMail):
                          'message_process: after reply, group should have 2 followers')
 
         # Do: incoming email with ref holding model / res_id but that does not match any message in the thread: must raise since OpenERP saas-3
-        self.assertRaises(AssertionError,
+        self.assertRaises(ValueError,
                           format_and_process,
                           MAIL_TEMPLATE, email_from='other5@gmail.com',
                           to='noone@example.com', subject='spam',

From 7d6dd7070da164683bf77cd67d4e7bbfd16401cf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 17 Feb 2014 11:04:18 +0100
Subject: [PATCH 037/134] [FIX] website: snippet resizing; Users don't
 understand when they can drag arrows to resize col-md-XX. They try, it does
 not work, so they think the feature does not work. So, horizontal arrow on
 col-md-XX snippets should use an icon according to what you can do

bzr revid: chm@openerp.com-20140217100418-iwdrv36a4u2inasn
---
 addons/website/static/src/css/snippets.css    | 26 ++++++++-
 addons/website/static/src/css/snippets.sass   | 27 ++++++++-
 .../static/src/js/website.snippets.editor.js  | 55 ++++++++++++-------
 3 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 00235b3f028..4d6d61c7db1 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -278,7 +278,8 @@
   cursor: w-resize;
 }
 .oe_overlay .oe_handle.e:before {
-  content: "\F061";
+  content: "\f0d9-\f0da";
+  line-height: 16px;
 }
 .oe_overlay .oe_handle.s {
   top: auto;
@@ -327,7 +328,8 @@
   cursor: e-resize;
 }
 .oe_overlay .oe_handle.w:before {
-  content: "\F060";
+  content: "\f0d9-\f0da";
+  line-height: 16px;
 }
 .oe_overlay .oe_handle.n {
   left: 2px;
@@ -336,7 +338,7 @@
   cursor: s-resize;
 }
 .oe_overlay .oe_handle.n:before {
-  content: "\F062";
+  content: "\f062";
 }
 .oe_overlay .icon.btn {
   display: inline-block;
@@ -362,6 +364,24 @@
 .oe_overlay .oe_overlay_options .dropdown-menu select, .oe_overlay .oe_overlay_options .dropdown-menu input {
   display: block;
 }
+.oe_overlay.block-w-left .w:before {
+  content: "\F061" !important;
+}
+.oe_overlay.block-w-right .w:before {
+  content: "\F060" !important;
+}
+.oe_overlay.block-w-left.block-w-right .w {
+  display: none !important;
+}
+.oe_overlay.block-e-left .e:before {
+  content: "\F061" !important;
+}
+.oe_overlay.block-e-right .e:before {
+  content: "\F060" !important;
+}
+.oe_overlay.block-e-left.block-e-right .e {
+  display: none !important;
+}
 
 .s-resize-important, .s-resize-important * {
   cursor: s-resize !important;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index ed9c38731db..82a983a30e4 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -147,6 +147,7 @@
 
 .resize_editor_busy
     background-color: rgba(0,0,0,0.3)
+
 .oe_overlay
     display: none
     position: absolute
@@ -201,7 +202,8 @@
             right: -6px
             cursor: w-resize
             &:before
-                content: "\F061"
+                content: "\f0d9-\f0da"
+                line-height: 16px
         &.s
             top: auto
             left: 2px
@@ -240,14 +242,15 @@
             left: -6px
             cursor: e-resize
             &:before
-                content: "\F060"
+                content: "\f0d9-\f0da"
+                line-height: 16px
         &.n
             left: 2px
             width: 100%
             top: -6px
             cursor: s-resize
             &:before
-                content: "\F062"
+                content: "\f062"
 
     .icon.btn
         display: inline-block
@@ -269,6 +272,24 @@
         .dropdown-menu select,.dropdown-menu input
             display: block
 
+    &.block-w-left
+        .w:before
+            content: "\F061" !important
+    &.block-w-right
+        .w:before
+            content: "\F060" !important
+    &.block-w-left.block-w-right .w
+        display: none !important
+    &.block-e-left
+        .e:before
+            content: "\F061" !important
+    &.block-e-right
+        .e:before
+            content: "\F060" !important
+    &.block-e-left.block-e-right .e
+        display: none !important
+
+
 .s-resize-important, .s-resize-important *
     cursor: s-resize !important
 .n-resize-important, .n-resize-important *
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f6e958341ae..fe5b7460030 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1176,9 +1176,26 @@
             this.$overlay.find('.oe_snippet_remove').toggleClass("hidden",
                 !this.$target.siblings().length && this.$target.parents("[data-snippet-id]:first").find("[data-snippet-id='colmd']").length > 1);
         },
+        change_cursor: function () {
+            var _class = this.$target.attr("class");
+
+            var col = _class.match(/col-md-([0-9-]+)/i);
+            col = col ? +col[1] : 0;
+
+            var offset = _class.match(/col-md-offset-([0-9-]+)/i);
+            offset = offset ? +offset[1] : 0;
+
+            var overlay_class = this.$overlay.attr("class").replace(/(^|\s+)block-[^\s]*/gi, '');
+            if (col+offset >= 12) overlay_class+= " block-e-right";
+            if (col === 1) overlay_class+= " block-w-right block-e-left";
+            if (offset === 0) overlay_class+= " block-w-left";
+
+            this.$overlay.attr("class", overlay_class);
+        },
         onFocus : function () {
             this._super();
             this.hide_remove_button();
+            this.change_cursor();
         },
         on_clone: function () {
             var $clone = this.$target.clone(false);
@@ -1206,27 +1223,27 @@
             return false;
         },
         on_resize: function (compass, beginClass, current) {
-            if (compass !== 'w')
-                return;
+            if (compass === 'w') {
+                // don't change the right border position when we change the offset (replace col size)
+                var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0);
+                var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0);
+                var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0);
+                if (offset < 0) {
+                    offset = 0;
+                }
+                var colSize = beginCol - (offset - beginOffset);
+                if (colSize <= 0) {
+                    colSize = 1;
+                    offset = beginOffset + beginCol - 1;
+                }
+                this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, ''));
 
-            // don't change the right border position when we change the offset (replace col size)
-            var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0);
-            var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0);
-            var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0);
-            if (offset < 0) {
-                offset = 0;
-            }
-            var colSize = beginCol - (offset - beginOffset);
-            if (colSize <= 0) {
-                colSize = 1;
-                offset = beginOffset + beginCol - 1;
-            }
-            this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, ''));
-
-            this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize));
-            if (offset > 0) {
-                this.$target.addClass('col-md-offset-' + offset);
+                this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize));
+                if (offset > 0) {
+                    this.$target.addClass('col-md-offset-' + offset);
+                }
             }
+            this.change_cursor();
         },
     });
 

From f9838a6032292e6600f7ac84b7e594e0d03af46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 17 Feb 2014 13:04:53 +0100
Subject: [PATCH 038/134] [FIX] view manager: effectively take into account the
 > selected view.

bzr revid: tde@openerp.com-20140217120453-oen4xfbkngemnrab
---
 .../static/src/js/view_editor.js              | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index a7906689cce..69e9a3080b7 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -15,7 +15,7 @@ instance.web.ViewManagerAction.include({
                 }
                 evt.currentTarget.selectedIndex = 0;
         }else{
-            return this._super.apply(this,arguments); 
+            return this._super.apply(this,arguments);
         }
     }
 });
@@ -73,12 +73,10 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         $.when(this.action_manager.do_action(action)).done(function() {
             var viewmanager = self.action_manager.inner_widget;
             var controller = viewmanager.views[viewmanager.active_view].controller;
-            controller.on('view_loaded', self, function(){
-                $(controller.groups).bind({
-                    'selected': function(e, ids, records) {
+            $(controller.groups).bind({
+                'selected': function (e, ids, records, deselected) {
                         self.main_view_id = ids[0];
-                    }
-                });
+                }
             });
         });
     },
@@ -232,10 +230,11 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         return main_object;
     },
     parse_xml: function(arch, view_id) {
+        //First element of att_list must be element tagname.
         main_object = {
             'level': 0,
             'id': this.xml_element_id +=1,
-            'att_list': [],
+            'att_list': ["view"],
             'name': _.str.sprintf("<view view_id = %s>", view_id),
             'child_id': []
         };
@@ -535,15 +534,22 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
         parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0];
         _.each([tr, parent_tr],function(element) {
-            var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false; 
+            var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
             property_to_check.push(value);
         });
         field_dataset.call( 'fields_get', []).done(function(result) {
             var fields = _.keys(result);
             fields.push(" "),fields.sort();
-            self.on_add_node(property_to_check, fields);
+            self.on_add_node(property_to_check, fields, self.inject_position(parent_tr,tr));
         });
     },
+    inject_position : function(parent_tag,current_tag){
+        if(parent_tag == "view")
+            return ['Inside'];
+        if(current_tag == "field")
+            return ['After','Before'];
+        return ['After','Before','Inside'];
+    },
     do_node_edit: function(side) {
         var self = this;
         var result = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], []);
@@ -637,12 +643,12 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
             var children = _.filter(xml_arch.childNodes[0].childNodes, function (child) {
                 return child.nodeType == 1;
             });
-            arch.arch = _.detect(children, function(xml_child) {
+            var inherited_view = _.detect(children, function(xml_child) {
                 var temp_obj = self.create_View_Node(xml_child),
                     insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
                 if (insert.length == _.uniq(check_list).length ) {return xml_child;}
             });
-            xml_arch = QWeb.load_xml(arch.arch);
+            xml_arch = QWeb.load_xml(instance.web.xml_to_str(inherited_view));
         }
         return self.do_save_xml(xml_arch.documentElement, obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
     },
@@ -941,11 +947,11 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
             });
         return def.promise();
     },
-    on_add_node: function(properties, fields){
+    on_add_node: function(properties, fields, position){
         var self = this;
         var  render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'},
                             {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
-                            {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}];
+                            {'name': 'position','selection': position, 'value': false, 'string': 'Position','type': 'selection'}];
         this.add_widget = [];
         this.add_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
@@ -1186,7 +1192,7 @@ var _CHILDREN = {
 //e.g.:xyz 'td' : ['field']
 };
 // Generic html_tag list and can be added html tag in future. It's support above _CHILDREN dict's *html_tag* by default.
-// For specific child node one has to define tag above and specify children tag in list. Like above xyz example. 
+// For specific child node one has to define tag above and specify children tag in list. Like above xyz example.
 var html_tag = ['div','h1','h2','h3','h4','h5','h6','td','tr'];
 
 var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',

From 5c63d1a23296ae44bb6aa8ba2d9b700bdf28959a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 17 Feb 2014 14:48:19 +0100
Subject: [PATCH 039/134] [FIX] fonts: move domain on field instead of view and
 use capitalised version of mode (would not found any otherwise)

bzr revid: mat@openerp.com-20140217134819-d6bwviupxtpwdl4x
---
 addons/base_setup/res_config.py       | 4 +++-
 addons/base_setup/res_config_view.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 763d0784603..955591e8824 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -41,7 +41,9 @@ class base_config_settings(osv.osv_memory):
                                               help="""This installs the module google_docs."""),
         'module_google_calendar': fields.boolean('Allow the users to synchronize their calendar  with Google Calendar',
                                               help="""This installs the module google_calendar."""),
-        'font': fields.many2one('res.font', string="Report Font", help="Set the font into the report header, it will be used as default font in the RML reports of the user company"),
+        'font': fields.many2one('res.font', string="Report Font", domain=[('mode', 'in', ('Normal', 'Regular', 'all', 'Book'))],
+            help="Set the font into the report header, it will be used as default font in the RML reports of the user company"),
+
     }
     
     _defaults= {
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 73fc9f83830..66fdcf91633 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -99,7 +99,7 @@
                         <label for="font" />
                         <div>
                             <div>
-                                <field name="font" class="oe_inline"  domain="[('mode', 'in', ('normal', 'regular', 'all', 'book'))]" />
+                                <field name="font" class="oe_inline" />
                                 <button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
                             </div>
                         </div>

From 5e9e447eb06032dd3a9451e3d1217cfba95fbf6f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 17 Feb 2014 14:48:23 +0100
Subject: [PATCH 040/134] [FIX] fonts: move domain on field instead of view and
 use capitalised version of mode (would not found any otherwise)

bzr revid: mat@openerp.com-20140217134823-p0i7nj6ljqslgwr1
---
 openerp/addons/base/res/res_company.py       | 3 ++-
 openerp/addons/base/res/res_company_view.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 558afbeaae0..91a77997598 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -124,7 +124,8 @@ class res_company(osv.osv):
         'rml_footer': fields.text('Report Footer', help="Footer text displayed at the bottom of all reports."),
         'rml_footer_readonly': fields.related('rml_footer', type='text', string='Report Footer', readonly=True),
         'custom_footer': fields.boolean('Custom Footer', help="Check this to define the report footer manually.  Otherwise it will be filled in automatically."),
-        'font': fields.many2one('res.font', string="Font",help="Set the font into the report header, it will be used as default font in the RML reports of the user company"),
+        'font': fields.many2one('res.font', string="Font", domain=[('mode', 'in', ('Normal', 'Regular', 'all', 'Book'))],
+            help="Set the font into the report header, it will be used as default font in the RML reports of the user company"),
         'logo': fields.related('partner_id', 'image', string="Logo", type="binary"),
         'logo_web': fields.function(_get_logo_web, string="Logo Web", type="binary", store={
             'res.company': (lambda s, c, u, i, x: i, ['partner_id'], 10),
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index c037b0e76ac..0f404bd83ba 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -85,7 +85,7 @@
                                 <label for="font" />
                                 <div>
                                     <div>
-                                        <field name="font" class="oe_inline" colspan="2" on_change="onchange_font_name(font, rml_header, rml_header2, rml_header3)" domain="[('mode', 'in', ('normal', 'regular', 'all', 'book'))]" />
+                                        <field name="font" class="oe_inline" colspan="2" on_change="onchange_font_name(font, rml_header, rml_header2, rml_header3)" />
                                         <button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link" colspan="1"/>
                                     </div>
                                 </div>

From ea5d11116630ad4462270f71f01a8c08b569463f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Feb 2014 15:20:06 +0100
Subject: [PATCH 041/134] [IMP] website_mail: avoid marking old messages as
 published

There is semantically no reason to publish old
messages, and doing so can be expensive for large
databases. Defaulting new messages to published
makes sense depending on the model on which they
are attached, so it might be better to improve
this as an opt-in handled in create() or
message_post() or via default_* context keys.

bzr revid: odo@openerp.com-20140217142006-ik18uqy9ewhhhb42
---
 addons/website_mail/models/mail_message.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index 308cf9da4b8..c708d9c3e33 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -28,13 +28,21 @@ class MailMessage(osv.Model):
 
     _columns = {
         'website_published': fields.boolean(
-            'Publish', help="Publish on the website as a blog"
+            'Published', help="Visible on the website as a comment"
         ),
     }
 
-    _defaults = {
-        'website_published': True,
-    }
+    def default_get(self, cr, uid, fields_list, context=None):
+        defaults = super(MailMessage, self).default_get(cr, uid, fields_list, context=context)
+
+        # Note: explicitly implemented in default_get() instead of _defaults,
+        # to avoid setting to True for all existing messages during upgrades.
+        # TODO: this default should probably be dynamic according to the model
+        # on which the messages are attached, thus moved to create().
+        if 'website_published' in fields_list:
+            defaults.setdefault('website_published', True)
+
+        return defaults
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
                 context=None, count=False, access_rights_uid=None):

From 7086c39a25521cc3731cc5b607496943456f7105 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Mon, 17 Feb 2014 07:24:43 -0900
Subject: [PATCH 042/134] [FIX] Fix bug with filter which don't update filter
 when we add a new event with somebody who are not already in the filter

bzr revid: jke@openerp.com-20140217162443-k94bfac61srkjlfz
---
 .../static/src/js/web_calendar.js             | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index a52f5ce546e..bc0f96d60a9 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -114,9 +114,9 @@ openerp.web_calendar = function(instance) {
             this.date_delay = attrs.date_delay;     // duration
             this.date_stop = attrs.date_stop;
             this.all_day = attrs.all_day;
+            this.how_display_event = '';           
             this.attendee_people = attrs.attendee;
-            this.how_display_event = '';
-           
+
             if (!isNullOrUndef(attrs.quick_create_instance)) {
                 self.quick_create_instance = 'instance.' + attrs.quick_create_instance;
             }
@@ -142,12 +142,23 @@ openerp.web_calendar = function(instance) {
                 this.open_popup_action = attrs.event_open_popup;
             }
             
+
             // If this field is set to true, we will use the calendar_friends model as filter and not the color field.
-            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && _.str.toBool(attrs.use_contacts));
+            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && _.str.toBool(attrs.use_contacts)) && (!isNullOrUndef(self.options.$sidebar));
 
             // If this field is set ot true, we don't add itself as an attendee when we use attendee_people to add each attendee icon on an event
             // The color is the color of the attendee, so don't need to show again that it will be present
-            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || !_.str.toBoolElse(attrs.color_is_attendee, true)));
+            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || !_.str.toBoolElse(attrs.color_is_attendee, true))) && (!isNullOrUndef(self.options.$sidebar));
+
+
+
+            // if we have not sidebar, (eg: Dashboard), we don't use the filter "coworkers"
+            if (isNullOrUndef(self.options.$sidebar)) {
+                this.useContacts = false;
+                this.colorIsAttendee = false;
+                this.attendee_people = undefined;
+            }
+
                 
 /*
             Will be more logic to do it in futur, but see below to stay Retro-compatible
@@ -488,14 +499,21 @@ openerp.web_calendar = function(instance) {
         event_data_transform: function(evt) {
             var self = this;
 
-            var date_start = instance.web.auto_str_to_date(evt[this.date_start]),
-                date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop]) : null,
-                date_delay = evt[this.date_delay] || 1.0,
+            var date_delay = evt[this.date_delay] || 1.0,
                 all_day = this.all_day ? evt[this.all_day] : false,
                 res_computed_text = '',
                 the_title = '',
                 attendees = [];
 
+            if (!all_day) {
+                date_start = instance.web.auto_str_to_date(evt[this.date_start]);
+                date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop]) : null;
+            }
+            else {
+                date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'date');
+                date_stop = this.date_stop  ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'date').addMinutes(-1) : null;   
+            }
+
             if (this.info_fields) {
                 var temp_ret = {};
                 res_computed_text = this.how_display_event;
@@ -582,7 +600,7 @@ openerp.web_calendar = function(instance) {
                 date_stop = date_start.clone().addHours(date_delay);
             }
             if (this.fields[this.date_start].type != "date" && all_day) {
-                date_stop.addDays(-1);
+                //date_stop.addDays(-1);
             }
             var r = {
                 'start': date_start.toString('yyyy-MM-dd HH:mm:ss'),
@@ -897,6 +915,10 @@ openerp.web_calendar = function(instance) {
         slow_created: function () {
             // refresh all view, because maybe some recurrents item
             var self = this;
+            if (self.sidebar) {
+                // force filter refresh
+                self.sidebar.filter.is_loaded = false;
+            }
             self.$calendar.fullCalendar('refetchEvents');
         },
 
@@ -1052,6 +1074,7 @@ openerp.web_calendar = function(instance) {
             var self = this;
             var def = $.Deferred();
             var defaults = {};
+
             _.each($.extend({}, this.data_template, data), function(val, field_name) {
                 defaults['default_' + field_name] = val;
             });

From a5b51c2be7f94b7d818fc4b52f95c5573fcf6507 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 17 Feb 2014 17:42:39 +0100
Subject: [PATCH 043/134] [IMP] orm._auto_init: avoid copying VARCHAR column
 when increasing size, alter in-place instead + better temporary names

Historically, we used a copy+rename technique during
table upgrades to alter varchar columns sizes.
This was only necessary to permit downsizing
columns, which we do not want to do anymore (it is
too dangerous, so has to be done explicitly when
required).

Switching to a pure ALTER COLUMN TYPE is simpler
and also much faster for large tables.

Also fixed the inappropriate name used for
temporary columns during column type casting
(which *does* require the copy+rename technique).

bzr revid: odo@openerp.com-20140217164239-0iou3dsiea3foabb
---
 openerp/osv/orm.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 6ac65125620..62ff24a2a3c 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2716,10 +2716,7 @@ class BaseModel(object):
                                 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                             ]
                             if f_pg_type == 'varchar' and f._type == 'char' and ((f.size is None and f_pg_size) or f_pg_size < f.size):
-                                cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
-                                cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, pg_varchar(f.size)))
-                                cr.execute('UPDATE "%s" SET "%s"=temp_change_size::%s' % (self._table, k, pg_varchar(f.size)))
-                                cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
+                                cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" TYPE %s' % (self._table, k, pg_varchar(f.size)))
                                 cr.commit()
                                 _schema.debug("Table '%s': column '%s' (type varchar) changed size from %s to %s",
                                     self._table, k, f_pg_size or 'unlimited', f.size or 'unlimited')
@@ -2727,10 +2724,10 @@ class BaseModel(object):
                                 if (f_pg_type==c[0]) and (f._type==c[1]):
                                     if f_pg_type != f_obj_type:
                                         ok = True
-                                        cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
+                                        cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO __temp_type_cast' % (self._table, k))
                                         cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, c[2]))
-                                        cr.execute(('UPDATE "%s" SET "%s"=temp_change_size'+c[3]) % (self._table, k))
-                                        cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
+                                        cr.execute(('UPDATE "%s" SET "%s"= __temp_type_cast'+c[3]) % (self._table, k))
+                                        cr.execute('ALTER TABLE "%s" DROP COLUMN  __temp_type_cast CASCADE' % (self._table,))
                                         cr.commit()
                                         _schema.debug("Table '%s': column '%s' changed type from %s to %s",
                                             self._table, k, c[0], c[1])

From b6656e26f1e4d59156601ceb0728dab1dee86aa5 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Mon, 17 Feb 2014 08:05:55 -0900
Subject: [PATCH 044/134] [IMP] Remove second demo user

bzr revid: jke@openerp.com-20140217170555-etlc139o3c2x028b
---
 addons/calendar/calendar_demo.xml | 32 ++++---------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/addons/calendar/calendar_demo.xml b/addons/calendar/calendar_demo.xml
index 6880754cc56..9e0b44c89cb 100644
--- a/addons/calendar/calendar_demo.xml
+++ b/addons/calendar/calendar_demo.xml
@@ -6,20 +6,7 @@
     -->
 
     <!--For Meetings -->
-        <record id="res_partner_another" model="res.partner">
-            <field name="name">Arshaw</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="customer" eval="False"/>
-            <field name="email">fullcalendar@example.com</field>
-        </record>
-        <record id="res_user_another" model="res.users">
-            <field name="name" >Second Demo User</field>
-            <field name="login" >Second Demo User</field>
-            <field name="partner_id" ref="res_partner_another"/>
-            <field name="company_id" ref="base.main_company" />
-        </record>    
-
-        <record id="cal_contact_1" model="calendar.contacts">
+         <record id="cal_contact_1" model="calendar.contacts">
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>            
@@ -105,8 +92,8 @@
 
         <record id="calendar_event_7" model="calendar.event">
             <field eval="1" name="active"/>
-            <field name="user_id" ref="res_user_another"/>            
-            <field name="partner_ids" eval="[(6,0,[ref('res_partner_another'),ref('base.res_partner_8')])]"/>
+            <field name="user_id" ref="base.user_demo"/>            
+            <field name="partner_ids" eval="[(6,0,[ref('base.res_partner_7')])]"/>
             <field name="name">Presentation of the new Calendar</field>
             <field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
             <field eval="time.strftime('%Y-%m-16 6:00:00')" name="date"/>
@@ -114,18 +101,7 @@
             <field eval="8.5" name="duration"/>
             <field name="state">draft</field>
         </record>
-        
-        <record id="calendar_event_8" model="calendar.event">
-            <field eval="1" name="active"/>
-            <field name="user_id" ref="res_user_another"/>            
-            <field name="partner_ids" eval="[(6,0,[ref('res_partner_another'),ref('base.partner_root')])]"/>
-            <field name="name">Discuss about the module : Calendar </field>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
-            <field eval="time.strftime('%Y-%m-16 6:00:00')" name="date"/>
-            <field eval="time.strftime('%Y-%m-16 18:30:00')" name="date_deadline"/>
-            <field eval="8.5" name="duration"/>
-            <field name="state">draft</field>
-        </record>
+
 
     </data>
 </openerp>

From d60cf404ca5f7b3cf776fa04a14f362bcebf89a9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 17 Feb 2014 19:20:45 +0100
Subject: [PATCH 045/134] [FIX] orm._auto_init: fallback to copy method when
 altering in-place varchar columns failed.

When a varchar column has a dependence on a view, we cannot change the size in-place,
we need to manually re-create the column with the correct type.

bzr revid: chs@openerp.com-20140217182045-qor70r3gb0fch2ki
---
 openerp/osv/orm.py | 11 ++++++++++-
 openerp/sql_db.py  | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 62ff24a2a3c..133ac5e6653 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2716,7 +2716,16 @@ class BaseModel(object):
                                 ('float8', 'float', get_pg_type(f)[1], '::'+get_pg_type(f)[1]),
                             ]
                             if f_pg_type == 'varchar' and f._type == 'char' and ((f.size is None and f_pg_size) or f_pg_size < f.size):
-                                cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" TYPE %s' % (self._table, k, pg_varchar(f.size)))
+                                try:
+                                    with cr.savepoint():
+                                        cr.execute('ALTER TABLE "%s" ALTER COLUMN "%s" TYPE %s' % (self._table, k, pg_varchar(f.size)))
+                                except psycopg2.NotSupportedError:
+                                    # In place alter table cannot be done because a view is depending of this field.
+                                    # Do a manual copy. This will drop the view (that will be recreated later)
+                                    cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k))
+                                    cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" %s' % (self._table, k, pg_varchar(f.size)))
+                                    cr.execute('UPDATE "%s" SET "%s"=temp_change_size::%s' % (self._table, k, pg_varchar(f.size)))
+                                    cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,))
                                 cr.commit()
                                 _schema.debug("Table '%s': column '%s' (type varchar) changed size from %s to %s",
                                     self._table, k, f_pg_size or 'unlimited', f.size or 'unlimited')
diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index de9d21dcd82..fb214fa068b 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.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
@@ -27,8 +27,10 @@ the database, *not* a database abstraction toolkit. Database abstraction is what
 the ORM does, in fact.
 """
 
+from contextlib import contextmanager
 from functools import wraps
 import logging
+import time
 import psycopg2.extensions
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_REPEATABLE_READ
 from psycopg2.pool import PoolError
@@ -344,6 +346,19 @@ class Cursor(object):
         """
         return self._cnx.rollback()
 
+    @contextmanager
+    @check
+    def savepoint(self):
+        """context manager entering in a new savepoint"""
+        name = hex(int(time.time() * 1000))[1:]
+        self.execute("SAVEPOINT %s" % (name,))
+        try:
+            yield
+            self.execute('RELEASE SAVEPOINT %s' % (name,))
+        except Exception:
+            self.execute('ROLLBACK TO SAVEPOINT %s' % (name,))
+            raise
+
     @check
     def __getattr__(self, name):
         return getattr(self._obj, name)

From bbf433c13dac4f53d49052abf7f9477900f17398 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 00:03:22 -0900
Subject: [PATCH 046/134] [FIX] Use $el.find() to find the current calendar,
 else we got undesired effect in dashboard where when we do a quick_create,
 all dashboards of type calendar was impacted by the selector $()

bzr revid: jke@openerp.com-20140218090322-fp3ybgfwmjcteadp
---
 .../static/src/js/web_calendar.js             | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index bc0f96d60a9..5c5bb7d3035 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -114,7 +114,7 @@ openerp.web_calendar = function(instance) {
             this.date_delay = attrs.date_delay;     // duration
             this.date_stop = attrs.date_stop;
             this.all_day = attrs.all_day;
-            this.how_display_event = '';           
+            this.how_display_event = '';
             this.attendee_people = attrs.attendee;
 
             if (!isNullOrUndef(attrs.quick_create_instance)) {
@@ -393,7 +393,7 @@ openerp.web_calendar = function(instance) {
                         delete this.quick;
                         this.$calendar.fullCalendar('unselect');
                     });
-            this.quick.replace($(".oe_calendar_qc_placeholder"));
+            this.quick.replace(this.$el.find('.oe_calendar_qc_placeholder'));
             this.quick.focus();
             
         },
@@ -511,7 +511,7 @@ openerp.web_calendar = function(instance) {
             }
             else {
                 date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'date');
-                date_stop = this.date_stop  ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'date').addMinutes(-1) : null;   
+                date_stop = this.date_stop  ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'date').addMinutes(-1) : null;
             }
 
             if (this.info_fields) {
@@ -573,7 +573,8 @@ openerp.web_calendar = function(instance) {
                             attendee_showed += 1;
                             if (attendee_showed<= MAX_ATTENDEES) {
                                 if (self.avatar_model !== null) {
-                                       the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" src="/web/binary/image?model=' + self.avatar_model + '&field=image_small&id=' + the_attendee_people + '"></img>';
+                                       the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head"  \
+                                                            src="/web/binary/image?model=' + self.avatar_model + '&field=image_small&id=' + the_attendee_people + '"></img>';
                                 }
                                 else {
                                     if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) {
@@ -1378,7 +1379,7 @@ openerp.web_calendar = function(instance) {
                 },
 
                 alternative_form_view: this.field.views ? this.field.views.form : undefined,
-                parent_view: this.view, //XXXvlab: to check ! this.view is likely undefined
+                parent_view: this.view, 
                 child_name: this.name,
                 readonly: this.get("effective_readonly")
             });
@@ -1401,14 +1402,14 @@ openerp.web_calendar = function(instance) {
         },
         init: function(parent, view) {
             this._super(parent);
-            this.view = view;            
+            this.view = view;
         },
 
    
 
         events_loaded: function(filters) {
             var self = this;
-            self.is_loaded=true;          
+            self.is_loaded=true;
             
             self.selected_filters = [];
             self.view.all_filters = filters;
@@ -1426,18 +1427,18 @@ openerp.web_calendar = function(instance) {
                 if (e==null && parseInt($(this).val())<0) {
                     $(this).prop('checked',false);
                     return;
-                }         
+                }
 
                 self.view.selected_filters.push(parseInt($(this).val()));
             });
-            self.view.$calendar.fullCalendar('refetchEvents');  
+            self.view.$calendar.fullCalendar('refetchEvents');
         },
         addUpdateButton: function() {
             var self=this;
             this.$('div.oe_calendar_all_responsibles').append(QWeb.render('CalendarView.sidebar.button_add_contact'));
-            this.$(".add_contacts_link_btn").on('click', function() {  
-                self.rpc("/web/action/load", { 
-                    action_id: "calendar.action_calendar_contacts" 
+            this.$(".add_contacts_link_btn").on('click', function() {
+                self.rpc("/web/action/load", {
+                    action_id: "calendar.action_calendar_contacts"
                 }).then( function(result) { return self.do_action(result); });
             });
             

From c11e6f624956d1c7355e1bd5db0609dc57a55ae3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 11:10:17 +0100
Subject: [PATCH 047/134] [FIX] website: snippet resizing: display top and
 bottom arrow in function of margin size

bzr revid: chm@openerp.com-20140218101017-f827kued494rfu9g
---
 addons/website/static/src/css/snippets.css    | 57 +++++++++-------
 addons/website/static/src/css/snippets.sass   | 68 ++++++++++---------
 .../static/src/js/website.snippets.editor.js  | 53 +++++++++------
 3 files changed, 102 insertions(+), 76 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 4d6d61c7db1..18f3852db2c 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -270,6 +270,10 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.e:before, .oe_overlay .oe_handle.w:before {
+  content: "\f0d9-\f0da";
+  line-height: 16px;
+}
 .oe_overlay .oe_handle.e {
   left: auto;
   top: 2px;
@@ -277,9 +281,17 @@
   right: -6px;
   cursor: w-resize;
 }
-.oe_overlay .oe_handle.e:before {
-  content: "\f0d9-\f0da";
-  line-height: 16px;
+.oe_overlay .oe_handle.w {
+  top: 2px;
+  height: 100%;
+  left: -6px;
+  cursor: e-resize;
+}
+.oe_overlay .oe_handle.s:before, .oe_overlay .oe_handle.n:before {
+  z-index: 0;
+  content: "\f07d";
+  text-align: center;
+  padding: 1px;
 }
 .oe_overlay .oe_handle.s {
   top: auto;
@@ -288,9 +300,11 @@
   bottom: -6px;
   cursor: n-resize;
 }
-.oe_overlay .oe_handle.s:before {
-  z-index: 0;
-  content: "\F063";
+.oe_overlay .oe_handle.n {
+  left: 2px;
+  width: 100%;
+  top: -6px;
+  cursor: s-resize;
 }
 .oe_overlay .oe_handle.size {
   top: auto;
@@ -321,25 +335,6 @@
   position: relative;
   top: 8px;
 }
-.oe_overlay .oe_handle.w {
-  top: 2px;
-  height: 100%;
-  left: -6px;
-  cursor: e-resize;
-}
-.oe_overlay .oe_handle.w:before {
-  content: "\f0d9-\f0da";
-  line-height: 16px;
-}
-.oe_overlay .oe_handle.n {
-  left: 2px;
-  width: 100%;
-  top: -6px;
-  cursor: s-resize;
-}
-.oe_overlay .oe_handle.n:before {
-  content: "\f062";
-}
 .oe_overlay .icon.btn {
   display: inline-block;
 }
@@ -382,6 +377,18 @@
 .oe_overlay.block-e-left.block-e-right .e {
   display: none !important;
 }
+.oe_overlay.block-s-top .s:before {
+  content: "\F063" !important;
+}
+.oe_overlay.block-s-bottom .s:before {
+  content: "\f062" !important;
+}
+.oe_overlay.block-n-top .n:before {
+  content: "\F063" !important;
+}
+.oe_overlay.block-n-bottom .n:before {
+  content: "\f062" !important;
+}
 
 .s-resize-important, .s-resize-important * {
   cursor: s-resize !important;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 82a983a30e4..d185ddd2932 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -195,24 +195,38 @@
                 background: rgba(0, 0, 0, .5)
                 color: #fff
                 +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+        &.e, &.w
+            &:before
+                content: "\f0d9-\f0da"
+                line-height: 16px
         &.e
             left: auto
             top: 2px
             height: 100%
             right: -6px
             cursor: w-resize
+        &.w
+            top: 2px
+            height: 100%
+            left: -6px
+            cursor: e-resize
+        &.s, &.n
             &:before
-                content: "\f0d9-\f0da"
-                line-height: 16px
+                z-index: 0
+                content: "\f07d"
+                text-align: center
+                padding: 1px
         &.s
             top: auto
             left: 2px
             width: 100%
             bottom: -6px
             cursor: n-resize
-            &:before
-                z-index: 0
-                content: "\F063"
+        &.n
+            left: 2px
+            width: 100%
+            top: -6px
+            cursor: s-resize
         &.size
             top: auto
             left: 2px
@@ -236,21 +250,6 @@
                 border-color: rgba(0, 0, 0, 0.5)
                 position: relative
                 top: 8px
-        &.w
-            top: 2px
-            height: 100%
-            left: -6px
-            cursor: e-resize
-            &:before
-                content: "\f0d9-\f0da"
-                line-height: 16px
-        &.n
-            left: 2px
-            width: 100%
-            top: -6px
-            cursor: s-resize
-            &:before
-                content: "\f062"
 
     .icon.btn
         display: inline-block
@@ -272,23 +271,28 @@
         .dropdown-menu select,.dropdown-menu input
             display: block
 
-    &.block-w-left
-        .w:before
-            content: "\F061" !important
-    &.block-w-right
-        .w:before
-            content: "\F060" !important
+    &.block-w-left .w:before
+        content: "\F061" !important
+    &.block-w-right .w:before
+        content: "\F060" !important
     &.block-w-left.block-w-right .w
         display: none !important
-    &.block-e-left
-        .e:before
-            content: "\F061" !important
-    &.block-e-right
-        .e:before
-            content: "\F060" !important
+    &.block-e-left .e:before
+        content: "\F061" !important
+    &.block-e-right .e:before
+        content: "\F060" !important
     &.block-e-left.block-e-right .e
         display: none !important
 
+    &.block-s-top .s:before
+        content: "\F063" !important
+    &.block-s-bottom .s:before
+        content: "\f062" !important
+    &.block-n-top .n:before
+        content: "\F063" !important
+    &.block-n-bottom .n:before
+        content: "\f062" !important
+
 
 .s-resize-important, .s-resize-important *
     cursor: s-resize !important
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index fe5b7460030..c7ffc4ffa35 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1120,6 +1120,38 @@
             return this.grid;
         },
 
+        onFocus : function () {
+            this._super();
+            this.change_cursor();
+        },
+
+        change_cursor : function () {
+            var _class = this.$target.attr("class");
+
+            var col = _class.match(/col-md-([0-9-]+)/i);
+            col = col ? +col[1] : 0;
+
+            var offset = _class.match(/col-md-offset-([0-9-]+)/i);
+            offset = offset ? +offset[1] : 0;
+
+            var overlay_class = this.$overlay.attr("class").replace(/(^|\s+)block-[^\s]*/gi, '');
+            if (col+offset >= 12) overlay_class+= " block-e-right";
+            if (col === 1) overlay_class+= " block-w-right block-e-left";
+            if (offset === 0) overlay_class+= " block-w-left";
+
+            var mb = _class.match(/mb([0-9-]+)/i);
+            mb = mb ? +mb[1] : 0;
+            if (mb >= 128) overlay_class+= " block-s-bottom";
+            else if (!mb) overlay_class+= " block-s-top";
+
+            var mt = _class.match(/mt([0-9-]+)/i);
+            mt = mt ? +mt[1] : 0;
+            if (mt >= 128) overlay_class+= " block-n-top";
+            else if (!mt) overlay_class+= " block-n-bottom";
+
+            this.$overlay.attr("class", overlay_class);
+        },
+        
         /* on_resize
         *  called when the box is resizing and the class change, before the cover_target
         *  @compass: resize direction : 'n', 's', 'e', 'w'
@@ -1127,7 +1159,7 @@
         *  @current: curent increment in this.grid
         */
         on_resize: function (compass, beginClass, current) {
-
+            this.change_cursor();
         }
     });
 
@@ -1176,26 +1208,9 @@
             this.$overlay.find('.oe_snippet_remove').toggleClass("hidden",
                 !this.$target.siblings().length && this.$target.parents("[data-snippet-id]:first").find("[data-snippet-id='colmd']").length > 1);
         },
-        change_cursor: function () {
-            var _class = this.$target.attr("class");
-
-            var col = _class.match(/col-md-([0-9-]+)/i);
-            col = col ? +col[1] : 0;
-
-            var offset = _class.match(/col-md-offset-([0-9-]+)/i);
-            offset = offset ? +offset[1] : 0;
-
-            var overlay_class = this.$overlay.attr("class").replace(/(^|\s+)block-[^\s]*/gi, '');
-            if (col+offset >= 12) overlay_class+= " block-e-right";
-            if (col === 1) overlay_class+= " block-w-right block-e-left";
-            if (offset === 0) overlay_class+= " block-w-left";
-
-            this.$overlay.attr("class", overlay_class);
-        },
         onFocus : function () {
             this._super();
             this.hide_remove_button();
-            this.change_cursor();
         },
         on_clone: function () {
             var $clone = this.$target.clone(false);
@@ -1243,7 +1258,7 @@
                     this.$target.addClass('col-md-offset-' + offset);
                 }
             }
-            this.change_cursor();
+            this._super(compass, beginClass, current);
         },
     });
 

From 934f57c0c731b232fa7add05a7c3452595d133ae Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 11:17:37 +0100
Subject: [PATCH 048/134] [FIX]website snippet: banner content editable

bzr revid: chm@openerp.com-20140218101737-o19ht6n6f2o26pfe
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index c7ffc4ffa35..453be324d56 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1427,7 +1427,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-image, .content').attr('contentEditable', 'true');
+            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
             this.$target.find('.carousel-image').attr('attributeEditable', 'true');
             this._super();
         },

From 8830cb581c5356d7e38d1ce0cf02079871bb74cd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 12:02:50 +0100
Subject: [PATCH 049/134] [FIX] website: In the footer, users record their
 phone number inbetween the fa-phone and the t-field. As a result, they change
 the footer template, not the phone number of the company. This zone should be
 t-ignore to avoid this mistake.

bzr revid: chm@openerp.com-20140218110250-lvvem8ibkg3g8e8d
---
 addons/website/views/website_templates.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 846ff17fd1e..dc7f7cda12c 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -140,8 +140,8 @@
                                     <li><a href="/page/website.contactus">Contact us</a></li>
                                 </ul>
                                 <ul class="list-unstyled">
-                                    <li><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
-                                    <li><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
+                                    <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
+                                    <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
                                 </ul>
                                 <h2>
                                     <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>

From 28958a4088216fc9c50e2c00464d7933e40a09db Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 12:10:08 +0100
Subject: [PATCH 050/134] [FIX] website tour: At the end of the "Insert a
 banner" tour the help is "Close Mobile Preview" Change into "Check Mobile
 Preview" -> i would close with a "Continue" bouton to keep running the help
 on content -> really needed. With the tour they stay in editable mode and
 search for adding a new menu

bzr revid: chm@openerp.com-20140218111008-rp1kg7r8pv53wfoh
---
 addons/website/static/src/js/website.tour.banner.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index e23ea01d0d6..c66eea1b314 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -100,8 +100,9 @@
                 {
                     element:   '.modal:has(#mobile-viewport) button[data-dismiss=modal]',
                     placement: 'right',
-                    title:     _t("Close Mobile Preview"),
+                    title:     _t("Check Mobile Preview"),
                     content:   _t("Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     waitNot:   '.modal',

From 7079fc3afda279176b78b6b9d27c81a16dcfe221 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 18 Feb 2014 12:08:24 +0100
Subject: [PATCH 051/134] [FIX] hw_escpos: do not start queue processor if
 ESC/POS not available

bzr revid: odo@openerp.com-20140218110824-pdy54bdmm0appntu
---
 addons/hw_escpos/controllers/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index c2e777fcd3a..58c02ebf59f 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -95,6 +95,9 @@ class EscposDriver(Thread):
             _logger.warning('ESC/POS Device Disconnected: '+message)
 
     def run(self):
+        if not escpos:
+            _logger.error('ESC/POS cannot initialize, please verify system dependencies.')
+            return
         self.queue = Queue()
         while True:
             try:

From da1063da2872f988f6f29576a810d1039fd1bf97 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 12:10:50 +0100
Subject: [PATCH 052/134] [FIX] Fix bug with timezone for All day event

bzr revid: jke@openerp.com-20140218111050-bhvl8i4t7efrll16
---
 .../static/src/js/web_calendar.js             | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 5c5bb7d3035..4c4102f4748 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -260,7 +260,6 @@ openerp.web_calendar = function(instance) {
                         end: end_date,
                         allDay: all_day,
                     });
-
                     self.open_quick_create(data_template);
 
                 },
@@ -289,7 +288,7 @@ openerp.web_calendar = function(instance) {
                             agenda: 'h:mm{ - h:mm}', // 5:00 - 6:30
 
                             // for all other views
-                            '': 'h(:mm)tt'            // 7pm
+                            '': 'h(:mm)tt'  // 7pm
                         },
                 weekMode : 'liquid',
                 aspectRatio: 1.8,
@@ -580,7 +579,7 @@ openerp.web_calendar = function(instance) {
                                     if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) {
                                             tempColor = (self.all_filters[the_attendee_people] != undefined) 
                                                                 ? self.all_filters[the_attendee_people].color
-                                                                : self.all_filters[-1].color;                                            
+                                                                : self.all_filters[-1].color;
                                         the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>';
                                     }//else don't add myself
                                 }
@@ -653,8 +652,8 @@ openerp.web_calendar = function(instance) {
                 }
                 if (this.all_day) {
                     event_end = (new Date(event_end.getTime())).addDays(1);
-                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()));
-                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()));
+                    date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate());
+                    date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate());
                 }
                 else {
                     date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7));
@@ -711,7 +710,7 @@ openerp.web_calendar = function(instance) {
                         }
                         
                        if (self.attendee_people !== undefined) {
-                            //If we filter on 'Everybody's Calendar, we don't filter events 
+                            //Else we filter on 'Everybody's Calendar, we don't filter events 
                             if (self.selected_filters.indexOf(-1) == -1) {
 
                                 //If we filter on contacts... we keep only events from coworkers                                 
@@ -953,7 +952,7 @@ openerp.web_calendar = function(instance) {
         template: 'CalendarView.quick_create',
         
         init: function(parent, dataset, buttons, options, data_template) {
-            this._super(parent);            
+            this._super(parent);
             this.dataset = dataset;
             this._buttons = buttons || false;
             this.options = options;
@@ -964,7 +963,7 @@ openerp.web_calendar = function(instance) {
         get_title: function () {
             var parent = this.getParent();
             if (_.isUndefined(parent)) {
-                return _t("Create")
+                return _t("Create");
             }
             var title = (_.isUndefined(parent.field_widget)) ?
                     (parent.string || parent.name) :
@@ -985,7 +984,7 @@ openerp.web_calendar = function(instance) {
                 if(event.keyCode == 13){
                     self.$input.off('keyup', enterHandler);
                     if (!self.quick_add()){
-                        self.$input.on('keyup', enterHandler);                    
+                        self.$input.on('keyup', enterHandler);
                     }
                 }
             });
@@ -994,14 +993,13 @@ openerp.web_calendar = function(instance) {
             submit.click(function clickHandler() {
                 submit.off('click', clickHandler);
                 if (!self.quick_add()){
-                   submit.on('click', clickHandler);                    
-                }
+                   submit.on('click', clickHandler);                }
                 self.focus();
             });
             this.$el.find(".oe_calendar_quick_create_edit").click(function () {
                 self.slow_add();
                 self.focus();
-            });            
+            });
             this.$el.find(".oe_calendar_quick_create_close").click(function (ev) {
                 ev.preventDefault();
                 self.trigger('close');
@@ -1030,10 +1028,10 @@ openerp.web_calendar = function(instance) {
          */
         quick_add: function() {
             var val = this.$input.val();
-            if (/^\s*$/.test(val)) { 
-                return false; 
+            if (/^\s*$/.test(val)) {
+                return false;
             }
-            return this.quick_create({'name': val}).always(function() { return true });
+            return this.quick_create({'name': val}).always(function() { return true; });
         },
         
         slow_add: function() {
@@ -1079,15 +1077,10 @@ openerp.web_calendar = function(instance) {
             _.each($.extend({}, this.data_template, data), function(val, field_name) {
                 defaults['default_' + field_name] = val;
             });
-            
-            if (defaults['default_allday'] && (defaults['default_date_deadline'] || defaults['default_duration'])) {
-                delete defaults['default_date_deadline'];
-                delete defaults['default_duration'];
-            }
-
+                        
             var pop_infos = self.get_form_popup_infos();
             var pop = new instance.web.form.FormOpenPopup(this);
-            var context = new instance.web.CompoundContext(this.dataset.context, defaults)
+            var context = new instance.web.CompoundContext(this.dataset.context, defaults);
             pop.show_element(this.dataset.model, null, this.dataset.get_context(defaults), {
                 title: this.get_title(),
                 disable_multiple_selection: true,
@@ -1379,7 +1372,7 @@ openerp.web_calendar = function(instance) {
                 },
 
                 alternative_form_view: this.field.views ? this.field.views.form : undefined,
-                parent_view: this.view, 
+                parent_view: this.view,
                 child_name: this.name,
                 readonly: this.get("effective_readonly")
             });
@@ -1424,7 +1417,7 @@ openerp.web_calendar = function(instance) {
             this.$('div.oe_calendar_responsible input:checked').each(function() {
                 responsibles.push($(this).val());
                 
-                if (e==null && parseInt($(this).val())<0) {
+                if (e==null && parseInt($(this).val())<0){
                     $(this).prop('checked',false);
                     return;
                 }

From d1ac6987a9c217e3b9ce327130664f02d739a9e1 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 12:11:38 +0100
Subject: [PATCH 053/134] [FIX] Fix bug with timezone for allday event

bzr revid: jke@openerp.com-20140218111138-cci4jdam0se883pp
---
 addons/calendar/calendar.py       | 14 +++++++-------
 addons/calendar/calendar_view.xml |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index a8efc343420..f5bb558e7fd 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-import hashlib
 import pytz
 import re
 import time
 import openerp
 import openerp.service.report
 import uuid
+from werkzeug.exceptions import BadRequest
 from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil import rrule
@@ -34,7 +34,6 @@ from openerp import tools, SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.translate import _
-from openerp import http
 from openerp.http import request
 from operator import itemgetter
 
@@ -870,6 +869,7 @@ class calendar_event(osv.Model):
     ]
 
     def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, allday=False, context=None):
+
         """Returns duration and/or end date based on values passed
         @param ids: List of calendar event's IDs.
         @param start_date: Starting date
@@ -888,14 +888,14 @@ class calendar_event(osv.Model):
             value['duration'] = duration
 
         if allday:  # For all day event
-            start = datetime.strptime(start_date.split(' ')[0].split('T')[0], "%Y-%m-%d")
-            duration = 24.0
-            value['duration'] = duration
+            start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
             user = self.pool['res.users'].browse(cr, uid, uid)
             tz = pytz.timezone(user.tz) if user.tz else pytz.utc
-            start = pytz.utc.localize(start).astimezone(tz)     # convert start in user's timezone
+            start = pytz.utc.localize(datetime.strptime(start)).astimezone(tz)     # convert start in user's timezone
             start = start.astimezone(pytz.utc)                  # convert start back to utc
-            value['date'] = start.strftime("%Y-%m-%d") + ' 00:00:00'
+
+            value['duration'] = 24.0
+            value['date'] = datetime.strftime(start, "%Y-%m-%d %H:%M:%S")
         else:
             start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
 
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 20ede6752d2..b9db3b279cb 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -57,15 +57,15 @@
                                     <label for="duration"/>
                                     <div>
                                         <field name="duration" widget="float_time"
-                                            on_change="onchange_dates(date,duration,False,allday)"
+                                            on_change="onchange_dates(date, duration, False, allday)"
                                             class="oe_inline" attrs="{'invisible': [('allday','=',True)]}"/>
                                         <label string="hours" attrs="{'invisible': [('allday','=',True)]}"/>
-                                        (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                                        (<field name="allday"  class="oe_inline"/>
                                         <label for="allday" string="All Day?"/>)
                                     </div>
                                     <field name="date_deadline" groups="base.group_no_one"
                                         attrs="{'invisible': ['|', ('allday','=',True), ('duration','&lt;', 24)]}"
-                                        on_change="onchange_dates(date,False,date_deadline)"/>
+                                        />
                                 </group>
                                 <group>
                                     <field name="categ_ids" widget="many2many_tags"/>

From cbf55efbd52fb251b56936fa91ecac8dfdb3bc57 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 12:42:12 +0100
Subject: [PATCH 054/134] [TYPO] Remove strptime inserted by error in last
 commit

bzr revid: jke@openerp.com-20140218114212-lbxfceagz51kj1eb
---
 addons/calendar/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index f5bb558e7fd..d42096bbec9 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -891,7 +891,7 @@ class calendar_event(osv.Model):
             start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
             user = self.pool['res.users'].browse(cr, uid, uid)
             tz = pytz.timezone(user.tz) if user.tz else pytz.utc
-            start = pytz.utc.localize(datetime.strptime(start)).astimezone(tz)     # convert start in user's timezone
+            start = pytz.utc.localize(start).astimezone(tz)     # convert start in user's timezone
             start = start.astimezone(pytz.utc)                  # convert start back to utc
 
             value['duration'] = 24.0

From 35439fc8643cb880dc7bfdbc333e7c32275f9eef Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 18 Feb 2014 13:17:26 +0100
Subject: [PATCH 055/134] [FIX] auth_signup: duplicated login must not generate
 500 errors

bzr revid: chs@openerp.com-20140218121726-sm266vfhe44qsfro
---
 addons/auth_signup/res_users.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 3af52017e05..aaab74271ca 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -25,7 +25,7 @@ from urlparse import urljoin
 
 from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import osv, fields
-from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT, ustr
 from ast import literal_eval
 from openerp.tools.translate import _
 
@@ -236,7 +236,11 @@ class res_users(osv.Model):
         # create a copy of the template user (attached to a specific partner_id if given)
         values['active'] = True
         context = dict(context or {}, no_reset_password=True)
-        return self.copy(cr, uid, template_user_id, values, context=context)
+        try:
+            return self.copy(cr, uid, template_user_id, values, context=context)
+        except Exception, e:
+            # copy may failed if asked login is not available.
+            raise SignupError(ustr(e))
 
     def reset_password(self, cr, uid, login, context=None):
         """ retrieve the user corresponding to login (login or email),

From 53790502df45be07807b7c5a33fe9233a91742ed Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 13:31:24 +0100
Subject: [PATCH 056/134] [FIX] Fix bug with timezone, for no all_day event
 also ! (Eg : in hr_holidays)

bzr revid: jke@openerp.com-20140218123124-axbf3bvznlgqytsf
---
 addons/web_calendar/static/src/js/web_calendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 4c4102f4748..6a7b19b2e23 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -656,8 +656,8 @@ openerp.web_calendar = function(instance) {
                     date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate());
                 }
                 else {
-                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7));
-                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19));
+                    date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);
+                    date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19);
                 }
                 data[this.date_start] = instance.web.parse_value(date_start_day, this.fields[this.date_start]);
                 if (this.date_stop) {

From 266adaa44ca3cca3faba1338fdb0f20f8458b3c3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 18 Feb 2014 13:41:15 +0100
Subject: [PATCH 057/134] [FIX] auth_signup: wrap the creation (copy) of the
 user inside a savepoint to keep the cursor alive in case of postgresql
 exception

bzr revid: chs@openerp.com-20140218124115-39j7vi3l8z6qqh2u
---
 addons/auth_signup/res_users.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index aaab74271ca..e91af657cc2 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -237,7 +237,8 @@ class res_users(osv.Model):
         values['active'] = True
         context = dict(context or {}, no_reset_password=True)
         try:
-            return self.copy(cr, uid, template_user_id, values, context=context)
+            with cr.savepoint():
+                return self.copy(cr, uid, template_user_id, values, context=context)
         except Exception, e:
             # copy may failed if asked login is not available.
             raise SignupError(ustr(e))

From b34108ac73b4e84b3410153e428ddcfc43b3fe6e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 18 Feb 2014 14:08:00 +0100
Subject: [PATCH 058/134] [FIX] gamification: accpet and discard challenges
 wizard should work as superuser, the user do no need gamification rights

bzr revid: mat@openerp.com-20140218130800-vth6elmbtrjmdouq
---
 addons/gamification/models/challenge.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index fec8e04c4b7..d66c95f6a0b 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -620,21 +620,25 @@ class gamification_challenge(osv.Model):
         return self.write(cr, uid, challenge.id, {'last_report_date': fields.date.today()}, context=context)
 
     ##### Challenges #####
-    def accept_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
+    def accept_challenge(self, cr, uid, challenge_ids, context=None):
         """The user accept the suggested challenge"""
-        user_id = user_id or uid
+        return self._accept_challenge(cr, SUPERUSER_ID, uid, challenge_ids, context=context)
+
+    def _accept_challenge(self, cr, uid, user_id, challenge_ids, context=None):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
         self.message_post(cr, uid, challenge_ids, body=message, context=context)
-        self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
+        self.write(cr, uid, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
         return self.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
 
-    def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
+    def discard_challenge(self, cr, uid, challenge_ids, context=None):
         """The user discard the suggested challenge"""
-        user_id = user_id or uid
+        return self._discard_challenge(cr, SUPERUSER_ID, uid, challenge_ids, context=context)
+
+    def _discard_challenge(self, cr, uid, user_id, challenge_ids, context=None):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
-        self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
+        self.message_post(cr, uid, challenge_ids, body=message, context=context)
         return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
     def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):

From 5fbeea64b544b270a12f8c47b0b03471613aa243 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 18 Feb 2014 14:11:12 +0100
Subject: [PATCH 059/134] [IMP] remove useless html files

bzr revid: mat@openerp.com-20140218131112-3sd0f8nnv5w6c93s
---
 addons/gamification/html/index.html | 86 -----------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 addons/gamification/html/index.html

diff --git a/addons/gamification/html/index.html b/addons/gamification/html/index.html
deleted file mode 100644
index 890efa0d1ec..00000000000
--- a/addons/gamification/html/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-        <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
-        <h3 class="oe_slogan">Leverage natural desire for competition</h3>
-        <p class="oe_mt32">
-               Reinforce good habits and improve win rates with real-time recognition and rewards inspired by <a href="http://en.wikipedia.org/wiki/Gamification">game mechanics</a>. Align teams around clear business objectives with challenges, personal objectives and team leader boards.
-        </p>
-        <div class="oe_span4 oe_centered">
-            <h3>Leaderboards</h3>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_game_01.png">
-            </div>
-            <p>
-               Promote leaders and competition amongst sales team with performance ratios.
-            </p>
-        </div>
-        <div class="oe_span4 oe_centered">
-            <h3>Personnal Objectives</h3>
-            <div class="oe_row_img">
-                <img class="oe_picture" src="crm_game_02.png">
-            </div>
-            <p>
-                Assign clear goals to users to align them with the company objectives.
-            </p>
-        </div>
-        <div class="oe_span4 oe_centered">
-            <h3>Visual Information</h3>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_game_03.png">
-            </div>
-            <p>
-                See in an glance the progress of each user.
-            </p>
-        </div>
-    </div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Create custom Challenges</h2>
-        <div class="oe_span6">
-            <p class="oe_mt32">
-Use predefined goals to generate easily your own challenges. Assign it to a team or individual users. Receive feedback as often as needed: daily, weekly... Repeat it automatically to compare progresses through time.
-            </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Motivate with Badges</h2>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_linkedin.png">
-            </div>
-        </div>
-        <div class="oe_span6">
-            <p class="oe_mt32">
-Inspire achievement with recognition of coworker's good work by rewarding badges. These can be deserved manually or upon completion of challenges. Add fun to the competition with rare badges.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Adapt to any module</h2>
-        <div class="oe_span6">
-            <p class="oe_mt32">
-Create goals linked to any module. The evaluation system is very flexible and can be used for many different tasks : sales evaluation, creation of events, project completion or even helping new users to complete their profile.
-            </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="crm_sc_02.png">
-            </div>
-        </div>
-    </div>
-</section>

From 1435af64b5ab2615173a8a217c8fb719ac8a93be Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 14:11:59 +0100
Subject: [PATCH 060/134] [TYPO] Remove end whitespaces

bzr revid: jke@openerp.com-20140218131159-8a5hj0i843m3r3dx
---
 .../calendar/static/src/js/base_calendar.js   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index 0f5693eacbc..337895ee3d5 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -1,7 +1,7 @@
 openerp.calendar = function(instance) {
     var _t = instance.web._t;
     var QWeb = instance.web.qweb;
-    instance.calendar = {}
+    instance.calendar = {};
     
 
     instance.web.WebClient = instance.web.WebClient.extend({
@@ -11,8 +11,8 @@ openerp.calendar = function(instance) {
         get_next_notif: function() {
             var self= this;
             this.rpc("/calendar/notify")
-            .then( 
-                function(result) { 
+            .then(
+                function(result) {
                     _.each(result,  function(res) {
                         setTimeout(function() {
                             //If notification not already displayed, we add button and action on it
@@ -21,25 +21,25 @@ openerp.calendar = function(instance) {
                                 res.message += QWeb.render("notify_footer");
                                 a = self.do_notify(res.title,res.message,true);
                                 
-                                $(".link2event").on('click', function() { 
+                                $(".link2event").on('click', function() {
                                     self.rpc("/web/action/load", {
                                         action_id: "calendar.action_calendar_event_notify",
-                                    }).then( function(r) { 
+                                    }).then( function(r) {
                                         r.res_id = res.event_id;
-                                        return self.action_manager.do_action(r);                                         
-                                    });                                    
+                                        return self.action_manager.do_action(r);
+                                    });
                                 });
-                                a.element.find(".link2recall").on('click',function() { 
+                                a.element.find(".link2recall").on('click',function() {
                                     self.get_notif_box(this).find('.ui-notify-close').trigger("click");
-                                });                                
-                                a.element.find(".link2showed").on('click',function() { 
+                                });
+                                a.element.find(".link2showed").on('click',function() {
                                     self.get_notif_box(this).find('.ui-notify-close').trigger("click");
                                     self.rpc("/calendar/notify_ack");
                                 });
                             }
                             //If notification already displayed in the past, we remove the css attribute which hide this notification
                             else if (self.get_notif_box($.find(".eid_"+res.event_id)).attr("style") !== ""){
-                                self.get_notif_box($.find(".eid_"+res.event_id)).attr("style","");                                
+                                self.get_notif_box($.find(".eid_"+res.event_id)).attr("style","");
                             }
                         },res.timer * 1000);
                     });
@@ -48,7 +48,7 @@ openerp.calendar = function(instance) {
         },
         check_notifications: function() {
             var self= this;
-            self.get_next_notif();                        
+            self.get_next_notif();
             setInterval(function(){
                 self.get_next_notif();
             }, 5 * 60  * 1000 );
@@ -58,7 +58,7 @@ openerp.calendar = function(instance) {
         show_application: function() {
             this._super();
             this.check_notifications();
-        }
+        },        
     });
     
 
@@ -92,7 +92,7 @@ openerp.calendar = function(instance) {
             
             var reload_page = function(){
                 return location.replace(action_url);
-            }
+            };
             reload_page();
 
         },
@@ -108,7 +108,7 @@ openerp.calendar = function(instance) {
             });
         },
         map_tag: function(value){
-            return _.map(value, function(el) {return {name: el[1], id:el[0], state: el[2]};})
+            return _.map(value, function(el) {return {name: el[1], id:el[0], state: el[2]};});
         },
         get_render_data: function(ids){
             var self = this;
@@ -121,7 +121,7 @@ openerp.calendar = function(instance) {
             if (! self.get("effective_readonly")) {
                 var tag_element = self.tags.tagElements();
                 _.each(data,function(value, key){
-                    $(tag_element[key]).find(".custom-edit").addClass(data[key][2])
+                    $(tag_element[key]).find(".custom-edit").addClass(data[key][2]);
                 });
             }
         }
@@ -134,7 +134,7 @@ openerp.calendar = function(instance) {
         instance.session.session_bind(instance.session.origin).done(function () {
             new instance.calendar.invitation(null,db,action,id,view,attendee_data).appendTo($("body").addClass('openerp'));
         });
-    }
+    };
     
     
     

From 4a35b2e4b0938defdee768e351bd83235b3645f4 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 18 Feb 2014 14:31:38 +0100
Subject: [PATCH 061/134] [FIX] gamification: skip challenges where every goal
 is achieved in serialisation

bzr revid: mat@openerp.com-20140218133138-9od9xqr3dv4hl95b
---
 addons/gamification/models/challenge.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index d66c95f6a0b..77105a7b947 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -433,7 +433,7 @@ class gamification_challenge(osv.Model):
     ##### JS utilities #####
 
     def _get_serialized_challenge_lines(self, cr, uid, challenge, user_id=False, restrict_goal_ids=False, restrict_top=False, context=None):
-        """Return a serialised version of the goals information
+        """Return a serialised version of the goals information if the user has not completed every goal
 
         :challenge: browse record of challenge to compute
         :user_id: res.users id of the user retrieving progress (False if no distinction, only for ranking challenges)
@@ -487,6 +487,7 @@ class gamification_challenge(osv.Model):
         (start_date, end_date) = start_end_date_for_period(challenge.period)
 
         res_lines = []
+        all_reached = True
         for line in challenge.line_ids:
             line_data = {
                 'name': line.definition_id.name,
@@ -537,6 +538,8 @@ class gamification_challenge(osv.Model):
                         'completeness': goal.completeness,
                         'state': goal.state,
                     })
+                    if goal.state != 'reached':
+                        all_reached = False
                 else:
                     ranking += 1
                     if user_id and goal.user_id.id == user_id:
@@ -554,8 +557,12 @@ class gamification_challenge(osv.Model):
                         'completeness': goal.completeness,
                         'state': goal.state,
                     })
+                    if goal.state != 'reached':
+                        all_reached = False
             if goal_ids:
                 res_lines.append(line_data)
+        if all_reached:
+            return []
         return res_lines
 
     ##### Reporting #####

From ce2807901028e320fe389cfd42c00e36e0d4ad5d Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Tue, 18 Feb 2014 14:50:09 +0100
Subject: [PATCH 062/134] [FIX] Fix bug with synchro google for recurrent event
 excluded

bzr revid: jke@openerp.com-20140218135009-vtuplqdhsx3qe03l
---
 addons/google_calendar/google_calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index a47fd4637ee..ff8dedcb244 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -586,7 +586,7 @@ class google_calendar(osv.AbstractModel):
                 if new_google_internal_event_id:
                     #TODO WARNING, NEED TO CHECK THAT EVENT and ALL instance NOT DELETE IN GMAIL BEFORE !
                     res = self.update_recurrent_event_exclu(cr,uid,new_google_internal_event_id,source_attendee_record.google_internal_event_id,att.event_id,context=context)
-                    att_obj.write(cr, uid, [att.event_id.id], {'google_internal_event_id': new_google_internal_event_id})
+                    att_obj.write(cr, uid, [att.id], {'google_internal_event_id': new_google_internal_event_id})
 
     def check_and_sync(self, cr, uid, oe_event, google_event, context):
         if datetime.strptime(oe_event.oe_update_date,"%Y-%m-%d %H:%M:%S.%f") > datetime.strptime(google_event['updated'],"%Y-%m-%dT%H:%M:%S.%fz"):

From a90962e56dd535f530577fc900d51d9da8f69f9e Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 18 Feb 2014 14:51:01 +0100
Subject: [PATCH 063/134] [IMP] do not change the API and use superuser inside
 the method instead of in the call

bzr revid: mat@openerp.com-20140218135101-uozhw08pkr04q49z
---
 addons/gamification/models/challenge.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 77105a7b947..06d0c44baac 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -627,26 +627,28 @@ class gamification_challenge(osv.Model):
         return self.write(cr, uid, challenge.id, {'last_report_date': fields.date.today()}, context=context)
 
     ##### Challenges #####
-    def accept_challenge(self, cr, uid, challenge_ids, context=None):
+    # TODO in trunk, remove unused parameter user_id
+    def accept_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
-        return self._accept_challenge(cr, SUPERUSER_ID, uid, challenge_ids, context=context)
+        return self._accept_challenge(cr, uid, uid, challenge_ids, context=context)
 
     def _accept_challenge(self, cr, uid, user_id, challenge_ids, context=None):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
-        self.message_post(cr, uid, challenge_ids, body=message, context=context)
-        self.write(cr, uid, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
-        return self.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
+        self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
+        self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
+        return self.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
 
-    def discard_challenge(self, cr, uid, challenge_ids, context=None):
+    # TODO in trunk, remove unused parameter user_id
+    def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user discard the suggested challenge"""
-        return self._discard_challenge(cr, SUPERUSER_ID, uid, challenge_ids, context=context)
+        return self._discard_challenge(cr, uid, uid, challenge_ids, context=context)
 
     def _discard_challenge(self, cr, uid, user_id, challenge_ids, context=None):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
-        self.message_post(cr, uid, challenge_ids, body=message, context=context)
-        return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
+        self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
+        return self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
     def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):
         result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'challenge_wizard')

From cce60acc151fb036f665069eb85008c0d46b2c78 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 18 Feb 2014 15:04:03 +0100
Subject: [PATCH 064/134] [FIX] gamification: when auto-subscribing users to
 challenges, do it as superuser

bzr revid: mat@openerp.com-20140218140403-eamxtm6dvwj3g5d3
---
 addons/gamification/models/res_users.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index d25d725a4ac..85cc18636f0 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import osv
 from challenge import MAX_VISIBILITY_RANKING
 
@@ -39,10 +40,10 @@ class res_users_gamification_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
 
             challenge_obj = self.pool.get('gamification.challenge')
-            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+            challenge_ids = challenge_obj.search(cr, SUPERUSER_ID, [('autojoin_group_id', 'in', user_group_ids)], context=context)
             if challenge_ids:
-                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
-                challenge_obj.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
+                challenge_obj.write(cr, SUPERUSER_ID, challenge_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
+                challenge_obj.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
         return write_res
 
     def create(self, cr, uid, vals, context=None):
@@ -54,10 +55,10 @@ class res_users_gamification_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
 
             challenge_obj = self.pool.get('gamification.challenge')
-            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+            challenge_ids = challenge_obj.search(cr, SUPERUSER_ID, [('autojoin_group_id', 'in', user_group_ids)], context=context)
             if challenge_ids:
-                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, write_res)]}, context=context)
-                challenge_obj.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
+                challenge_obj.write(cr, SUPERUSER_ID, challenge_ids, {'user_ids': [(4, write_res)]}, context=context)
+                challenge_obj.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
         return write_res
 
     # def get_goals_todo_info(self, cr, uid, context=None):
@@ -130,8 +131,8 @@ class res_groups_gamification_group(osv.Model):
             user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
 
             challenge_obj = self.pool.get('gamification.challenge')
-            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
+            challenge_ids = challenge_obj.search(cr, SUPERUSER_ID, [('autojoin_group_id', 'in', ids)], context=context)
             if challenge_ids:
-                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
-                challenge_obj.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
+                challenge_obj.write(cr, SUPERUSER_ID, challenge_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
+                challenge_obj.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
         return write_res

From c42f9553ec44b040aba41395b04773aa1cbfe647 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 18 Feb 2014 15:06:10 +0100
Subject: [PATCH 065/134] [IMP] remove pointless semicolons, use
 @expectedFailure instead of commenting broken test

bzr revid: xmo@openerp.com-20140218140610-t4amo9b2jjkk2r0h
---
 addons/website/tests/test_ui.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 44ab1e7992e..7869479c483 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -1,5 +1,8 @@
 import os
-import openerp
+
+import unittest2
+
+import openerp.tests
 
 inject = [
     ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../static/src/js/website.tour.js')),
@@ -8,15 +11,14 @@ inject = [
 
 class TestUi(openerp.tests.HttpCase):
     def test_01_pubic_homepage(self):
-        self.phantom_js("/", "console.log('ok')", "openerp.website.snippet");
+        self.phantom_js("/", "console.log('ok')", "openerp.website.snippet")
 
+    @unittest2.expectedFailure
     def test_02_public_login_logout(self):
-        # Page injection works but i suspect multiple files doesnt
-        return
-        self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", inject=inject);
+        self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", inject=inject)
 
     def test_03_admin_homepage(self):
-        self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin');
+        self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin')
 
     def test_04_admin_tour_banner(self):
         self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour", login='admin')

From 49e81fb1339d836c310730d708fab447445a404d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 18 Feb 2014 15:11:29 +0100
Subject: [PATCH 066/134] [IMP] hw_proxy: initial commit for the posbox's
 documentation

bzr revid: fva@openerp.com-20140218141129-sa4bhpi535sd7uhb
---
 addons/hw_proxy/doc/index.rst | 390 ++++++++++++++++++++++++++++++++++
 1 file changed, 390 insertions(+)
 create mode 100644 addons/hw_proxy/doc/index.rst

diff --git a/addons/hw_proxy/doc/index.rst b/addons/hw_proxy/doc/index.rst
new file mode 100644
index 00000000000..c44f9c870bc
--- /dev/null
+++ b/addons/hw_proxy/doc/index.rst
@@ -0,0 +1,390 @@
+====================
+PosBox Documentation
+====================
+
+Posbox Setup Guide
+==================
+
+Prerequisites
+-------------
+
+Before you start setting up your PosPox make sure you have everything.
+You will need :
+
+-  The PosBox
+-  A 2A Power adapter
+-  A computer or tablet with an up to date Firefox, Chrome or Safari web
+   browser (we recommend Chrome)
+-  A running SaaS or V8.0 OpenERP Instance with the Point of Sale
+   Installed.
+-  A local network set up with DHCP ( this is the default setting )
+-  A RJ45 Ethrnet Cable
+-  An Epson USB TM-T20 Printer or another compatible printer.
+-  A Honewell Voyager USB Barcode Scanner or another compatible scanner.
+-  An Epson compatible cash drawer.
+
+Setup
+-----
+
+1) Power the PosBox.
+~~~~~~~~~~~~~~~~~~~~
+
+Plug the PosBox to the 2A Power Adapter, a bright red status led should
+light up.
+
+2) Connect it to the Local Network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Connect the PosBox to the Local Network with the RJ45 Cable. Make sure
+You connect the PosBox to the same Network as your POS device. Once
+connected a bright yellow status led should light up, and a green status
+led should flash.
+
+3) Connect the USB Printer
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Put a paper roll in the printer, power it up, then connect it to one of
+the PosBox's USB port
+
+4) Connect the cash drawer
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The cash drawer should be connected to the printer with the RJ25 cable
+
+5) Connect the USB Barcode Scanner
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Connect the usb barcode scanner to one of the PosBox's USB port. The
+Barcode Scanner should immediately light up and emit a loud beep.
+
+6) Configure the USB Barcode Scanner
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The barcode scanner should be configured in QWERTY and emit a new line /
+return symbol after each scan. This is most likely the default
+configuration of your barcode scanner.
+
+7) Make sure the PosBox is ready
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Once powered, The PosBox needs less than a minute to boot. Once the
+PosBox is ready, it should print a status receipt with its IP Adress.
+Also, the last status led, just after the red power status led, should
+be permanently lit green.
+
+8) Set up the Point of Sale
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Make sure to activate the 'Print via Proxy', 'Remote Scanning' or
+'Cashdrawer' options in the Point of Sale configuration. If you are
+using firefox, you must manually specify the PosBox's IP address which
+was printed on the status receipt.
+
+If you are running multiple Point of Sales on the same PosBox, make sure
+that only one of them has Remote Scanning activated.
+
+9) Launch the Point of Sale.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you didn't spcecify the PosBox's IP address in the config, the POS
+will need some time to perform a network scan to find the PosBox. This
+is only done once.
+
+The Point of Sale is now connected to the PosBox and your Hardware
+should be ready to use.
+
+PosBoxless Setup Guide
+======================
+
+If you are running your Point of Sale on a debian-based linux
+distribution, you do not need the PosBox as you can run its software
+locally. However the installation process is not foolproof. You'll need
+at least to know how to install and run openerp. You may also run into
+issues specific to your distribution or to your particular setup and
+hardware configuration.
+
+Prerequisites
+-------------
+
+-  A debian based linux distribution (Debian, Ubuntu, Mint, etc.)
+-  A running trunk version of the OpenERP server
+-  You must uninstall any esc-pos printer driver as it will conflict
+   with OpenERP's built-in driver.
+
+Setup
+-----
+
+1) Extra dependencies
+~~~~~~~~~~~~~~~~~~~~~
+
+The driver modules requires the installation of new python modules:
+
+::
+
+    $ sudo pip install pyserial
+    $ sudo pip install --pre pyusb
+
+2) Database Setup
+~~~~~~~~~~~~~~~~~
+
+You must create a database called ``posbox`` with the modules
+``hw_proxy``, ``hw_escpos``, and ``hw_scanner`` installed.
+
+3) Access Rights
+~~~~~~~~~~~~~~~~
+
+The drivers need raw access to the printer and barcode scanner devices.
+Doing so requires a bit system administration. First we are going to
+create a group that has haccess to usb devices:
+
+::
+
+    $ sudo groupadd usbusers
+
+Then we add the user who will run the OpenERP server to ``usbusers``
+
+::
+
+    $ sudo useradd -G usbusers USERNAME
+
+Then we need to create a udev rule that will automatically allow members
+of ``usbusers`` to access raw usb devices. To do so create a file called
+``99-usbusers.rule`` in the ``/etc/udev/rules.d/`` directory with the
+following content:
+
+::
+
+    SUBSYSTEM=="usb", GROUP="usbusers", MODE="0660"
+    SUBSYSTEMS=="usb", GROUP="usbusers", MODE="0660"
+
+Then you need to reboot your machine.
+
+4) Start the local OpenERP Installl
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We must launch the OpenERP server on the port ``8069`` with the correct
+database settings:
+
+::
+
+    $ ./server/openerp-server --addons-path=addons,web/addons --db-filter='^posbox$' --xmlrpc-port=8069 -d posbox
+
+5) Check that everything works
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Plug all your hardware to your machine's USB ports, and go to
+``http://localhost/hw_proxy/status`` refresh the page a few times and
+see if all your devices are indicated as *Connected*. Possible source of
+errors are: The paths on the distribution differ from the paths expected
+by the drivers, another process has grabbed exclusive access to the
+devices, the udev rules do not apply or a superceeded by others.
+
+5) Automatically Start OpenERP
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You must now make sure that this OpenERP install is automatically
+started after boot. There are various ways to do so, and how to do it
+depends on your particular setup. We use *systemd* on the PosBox, but
+*upstart* or *sysvinit* are other options.
+
+6) Set up the Point of Sale
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Make sure that one of the posbox Make sure the IP Adress field in the
+POS Config is either ``127.0.0.1`` or ``localhost`` or simply leave it
+empty.
+
+PosBox Technical Documentation
+==============================
+
+Technical Overview
+------------------
+
+The PosBox Hardware
+~~~~~~~~~~~~~~~~~~~
+
+The PosBox's Hardware is based on a model B Raspberry Pi, a popular
+open-source micro-computer. The Raspberry Pi is powered with a 2A
+micro-usb power adapter. 2A is needed to give enough power to the
+barcode scanners. And we recommend Samsung power adapters for their
+availability and reliability ( but beware of counterfeits ). The
+Raspberry is protected by a ModMyPi Raspberry Pi Case. The Software is
+installed on a 8Gb Class 10 or Higher SD Card. The SD Card's class is
+important to ensure good performances. All this hardware is easily
+available worldwide from independant vendors.
+
+Compatible Peripherals
+~~~~~~~~~~~~~~~~~~~~~~
+
+-  Printers:
+
+   -  Epson TM-T20
+   -  Support for Other Esc-Pos compatible printers can be easily added
+      on a case-by-case basis, please see the *Unsupported Printers*
+      chapter of this manual.
+
+-  Barcode Scannners:
+
+   -  Metapace S61
+   -  Honeywell Voyager 95x0 Series.
+   -  Most other barcode scanners should work out of the box. Some
+      barcode scanners need more power than the PosBox can provide and
+      must be plugged in a self-powered USB HUB. This is the case for
+      Datalogic Barcode Scanners.
+
+-  Cash Drawers:
+
+   -  As the cash drawers are connected to the printer, All Epson
+      compatible cash drawers should work out of the Box.
+
+The PosBox Software
+~~~~~~~~~~~~~~~~~~~
+
+The PosBox runs a Raspbian Linux distribution, a Debian derivative
+optimized for the Raspberry Pi. It also runs a barebones install of
+OpenERP which provides the webserver and the drivers. The printer &
+scanner drivers are implemented as openerp modules. Those modules are
+named ``hw_proxy``, ``hw_escpos``, ``hw_scanner`` and are the only
+modules installed and running. OpenERP is only used for the framework it
+provides. No business data is processed or stored on the PosBox. The
+OpenERP install is a full bazaar clone of the ``trunk`` branch, and can
+thus be updated trough the usual means.
+
+We use systemd to manage the Openerp server. Systemd makes sure OpenERP
+starts up at boot and is always up and running. Its systemd unit file is
+called ``openerp.service``, and can be found in
+``/etc/systemd/system/openerp.service``. The systemd version used is
+quite old and thus ``journalctl`` is not available. All logs can be
+found in instead ``/var/logs/syslog``
+
+We removed all graphical software from the default install to reduce to
+image size but nothing prevents you from reinstalling them.
+
+Local Access
+~~~~~~~~~~~~
+
+If you plug a QWERTY USB keyboard into one of the PosBox's USB ports,
+and if you connect a computer monitor to the *HDMI* port of the PosBox,
+you can use it as a small UNIX computer and perform various
+administration tasks.
+
+Once the PosBox is ready press ``ALT-F2`` to access the login prompt.
+The login is ``pi`` and the password ``admin``. The OpenERP install is
+in the ``~/openerp`` directory along with a few scripts to help with
+debugging and administration.
+
+Remote Access
+~~~~~~~~~~~~~
+
+If you have the PosBox's IP address and a SSH client you can access the
+PosBox's system remotely. The login / password are ``pi``/``admin``
+
+Unsupported Printers
+~~~~~~~~~~~~~~~~~~~~
+
+The PosBox should be able to print to any ESC-POS printer, not just the
+Epson TM-T20. If You have such a printer, you can activate it with the
+following steps:
+
+-  Get local or remote access to the PosBox.
+-  Plug in your printer
+-  type ``lsusb`` in a prompt
+-  Find your printer in the list of connected USB devices
+-  Find your printer's vendor id: It consists of two hexadecimal numbers
+   separated by a colon.
+-  Edit ``~/openerp/addons/hw_escpos/escpos/supported_devices.py`` and
+   add an entry for your printer.
+-  Restar The PosBox.
+-  If everything works properly you can send your printer's name and
+   vendor ID to ``support@openerp.com`` and we'll add it to the list of
+   supported devices.
+
+Updating The PosBox Software
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The best way to update the PosBox software is to download a new version
+of the image and flash the SD-Card with it. This operation is described
+in details on the following tutorial
+``http://elinux.org/RPi_Easy_SD_Card_Setup``, just replace the standard
+raspberry pi image to the latest one found at
+``http://nightly.openerp.com/trunk/posbox/``
+
+Troubleshoot
+------------
+
+The POS cannot connect to the PosBox.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  The easiest way to make sure the PosBox is properly set-up is to turn
+   it on with the printer plugged in as it will print a receipt
+   indicating any error if encountered or the PosBox's IP adress in case
+   of success. If no receipt is printed, check the following steps:
+-  Make sure the PosBox is powered on, indicated by a brightly lid red
+   status LED.
+-  Make sure the PosBox is ready, this is indicated by a brightly lid
+   green status LED just above the red power status LED. The PosBox
+   should be ready one minute after it is powered on.
+-  Make sure the PosBox is connected to the Network. This is indicated
+   by a brightly lid yellow status LED.
+-  Make sure the PosBox is connected to the same network as your POS
+   device. Both the device and the posbox should be visible in the list
+   of connected devices on your network router.
+-  Make sure that your LAN is set up with DHCP, and gives ip Address in
+   the range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup
+   your LAN that way, you must manually set up your PosBox's ip-address.
+   See the relevant paragraph in the Setup chapter of this documentation
+-  If you have specified the PosBox's IP address in the config, make
+   sure it correspond to the printed on the PosBox's status receipt.
+-  Make sure that the POS is not loaded over HTTPS.
+-  A bug in Firefox's HTTP implementation prevents the autodiscovery
+   from working reliably. When using Firefox you should manually set up
+   the PosBox's ip address in the POS config.
+
+The Barcode Scanner is not working
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  The PosBox needs a 2A power supply to work with some barcode
+   scanners. If you are not using the provided power supply, make sure
+   the one you use has enough power.
+-  Some barcode scanners will need more than 2A and will not work, or
+   will work unreliably, even with the provided power supply. In those
+   case you can plug the barcode scanner in a self-powered USB Hub.
+-  Some poorly built barcode scanners do not advertise themselves as
+   barcode scanners but as a usb keyboard instead, and will not be
+   recognized by the PosBox.
+
+The Barcode Scanner is not working reliably
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  Make sure that no more than one device with 'Scan via Proxy' enabled
+   are connected to the PosBox at the same time.
+
+Printing the receipt takes too much time.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  A small delay before the first print is expected, as the PosBox will
+   do some preprocessing to speed up the next printings. If you suffer
+   delays afterwards it is most likely due to poor network connection
+   between the POS and the PosBox.
+
+Some characters are not correctly printed on the receipt.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  The PosBox does not support all languages and characters. It
+   currently supports latin and cyrillic based scripts, with basic
+   japanese support.
+
+The Printer is Offline
+~~~~~~~~~~~~~~~~~~~~~~
+
+-  The PosBox only supports EPSON TM-T20 printers. Make sure the printer
+   is connected, powered, has enough paper and has its lid closed, and
+   does is not in an error status. If the error persists, please contact
+   support.
+
+The Cashdrawer does not open.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  The cashdrawer should be connected to the printer and should be
+   activated in the POS Configuration
+

From e473e795f6e70a416a01a73390217d91726a56db Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 15:42:15 +0100
Subject: [PATCH 067/134] [FIX] website: Page is added to menu even if the
 checkbox is unchecked at adding time

bzr revid: chm@openerp.com-20140218144215-vmlah8giy28oq3cd
---
 addons/website/static/src/js/website.editor.newpage.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index 19cf8060897..3feba25628f 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -35,8 +35,9 @@
                     }
                 }).then(function (val, field, $dialog) {
                     if (val) {
-                        console.log('/website/add/' + encodeURI(val) + "?add_menu=" + $dialog.find('input[type="checkbox"]').is(':checked'));
-                        document.location = '/website/add/' + encodeURI(val) + "?add_menu=" + $dialog.find('input[type="checkbox"]').is(':checked');
+                        var url = '/website/add/' + encodeURI(val);
+                        if ($dialog.find('input[type="checkbox"]').is(':checked')) url +="?add_menu=1";
+                        document.location = url;
                     }
                 });
             }

From 00c810ab14e101cb93caa395216650784d2737a4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 15:56:19 +0100
Subject: [PATCH 068/134] [FIX] website: Don't allow to edit the menu inline.
 Users try to change the link, but it does not work. We can put a tooltip
 explaning they should use the content top menu to edit the menu; bootstrap
 tooltip don't available in edit mode.

bzr revid: chm@openerp.com-20140218145619-fboofhu111s3g45p
---
 .../website/static/src/js/website.editor.newpage.js | 13 +++++++++++++
 addons/website/views/website_templates.xml          |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index 3feba25628f..b475223ecd9 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -13,6 +13,19 @@
             this.$(".oe_content_menu li.divider").removeClass("hidden");
             return res;
         },
+        edit: function () {
+            this.on('rte:ready', this, function () {
+                $('a:has(span[data-oe-model="website.menu"])').tooltip({
+                    title: _t('Save this page and use the top "Content" menu to edit the menu.'),
+                    placement: "bottom",
+                    trigger: "hover",
+                    show: 50,
+                    hide: 100,
+                    container: 'body'
+                });
+            });
+            return this._super();
+        },
         events: _.extend({}, website.EditorBar.prototype.events, {
             'click a[data-action=new_page]': function (ev) {
                 ev.preventDefault();
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index dc7f7cda12c..e2878c27dce 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -261,10 +261,11 @@
 
         <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
         <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
-        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
         <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
         <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+        <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
+        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
         <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
         <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>

From c930e2489f6240e3c9de1b86af65aef12fd15c75 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 16:11:27 +0100
Subject: [PATCH 069/134] [FIX] website_blog: At one step, it says 'delete the
 title', but it deletes the whole block

bzr revid: chm@openerp.com-20140218151127-a6471u9l0jpot6gq
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 addons/website_blog/static/src/js/website.tour.blog.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 453be324d56..f537f09a115 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1126,7 +1126,7 @@
         },
 
         change_cursor : function () {
-            var _class = this.$target.attr("class");
+            var _class = this.$target.attr("class") || "";
 
             var col = _class.match(/col-md-([0-9-]+)/i);
             col = col ? +col[1] : 0;
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index b6701d74634..7079c52315d 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -88,8 +88,8 @@
                 {
                     element:   '.oe_active .oe_snippet_remove',
                     placement: 'top',
-                    title:     _t("Delete the Title"),
-                    content:   _t("From this toolbar you can move, duplicate or delete the selected zone. Click on the garbage can image to delete the title."),
+                    title:     _t("Delete the block"),
+                    content:   _t("From this toolbar you can move, duplicate or delete the selected zone. Click on the garbage can image to delete the block. Or click on the Title and delete it."),
                 },
                 {
                     waitNot:   '.oe_active .oe_snippet_remove:visible',

From 09397684b31dc0fed57e4f7a1b172e72c1766aeb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 16:34:51 +0100
Subject: [PATCH 070/134] [FIX] website: change odrer of script tag because
 jquery-ui-1.9.1.custom overwrite jQuery and cancel some bootstrap method in
 edit mode

bzr revid: chm@openerp.com-20140218153451-uxd87o5b7zy3asvv
---
 addons/website/views/website_templates.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index e2878c27dce..5649ded4d4d 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -69,7 +69,6 @@
             <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
             <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
-            <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
             <script type="text/javascript">
                 // Bootstrap and jQuery UI conflicts
                 $.fn.bstooltip = $.fn.tooltip;
@@ -80,6 +79,8 @@
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
 
             <script type="text/javascript" src="/website/static/src/js/website.js"></script>
+            
+            <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
             <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
 
             <t t-raw="head or ''" name='layout_head'/>
@@ -249,7 +250,7 @@
             </div>
         </div>
     </xpath>
-    <xpath expr='//t[@name="layout_head"]' position="before">
+    <xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
         <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
         <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
@@ -264,7 +265,6 @@
         <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
         <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
         <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-        <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
         <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
         <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>

From 1c4f859f1f71ddb85bffce32beea76d4df25256f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 17:01:44 +0100
Subject: [PATCH 071/134] [FIX] website: jQuery (sizcache) trigger a change id
 in the page, the observer set as dirty all template. All template are saved
 when the user click on save button.

bzr revid: chm@openerp.com-20140218160144-5drlsnz4plyb9tqx
---
 addons/website/static/src/js/website.editor.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 7e867dca685..61e792133ca 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1667,6 +1667,8 @@
                 }
                 switch(m.type) {
                 case 'attributes': // ignore .cke_focus being added or removed
+                    // ignore id modification
+                    if (m.attributeName === 'id') { return false; }
                     // if attribute is not a class, can't be .cke_focus change
                     if (m.attributeName !== 'class') { return true; }
 

From 61c82f28a4f1e903be53ec6355938d178b2c79a9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 18 Feb 2014 17:03:39 +0100
Subject: [PATCH 072/134] [FIX] imports, use @expectedFailure, simplify some
 inject specs

bzr revid: xmo@openerp.com-20140218160339-2r34z4ks2o4lriu5
---
 addons/website/tests/test_ui.py            |  6 ++++--
 addons/website_blog/tests/test_ui.py       |  2 +-
 addons/website_event/tests/test_ui.py      |  2 +-
 addons/website_event_sale/tests/test_ui.py |  2 +-
 addons/website_sale/tests/test_ui.py       | 14 +++++++-------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 7869479c483..244e991442c 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -4,9 +4,11 @@ import unittest2
 
 import openerp.tests
 
+relfile = lambda *args: os.path.join(os.path.dirname(__file__), *args)
+
 inject = [
-    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../static/src/js/website.tour.js')),
-    ("openerp.website.Tour.LoginEdit", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.test.admin.js")),
+    ('openerp.website.Tour', relfile('../static/src/js/website.tour.js')),
+    ('openerp.website.Tour.LoginEdit', relfile('../static/src/js/website.tour.test.admin.js')),
 ]
 
 class TestUi(openerp.tests.HttpCase):
diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py
index 8a99cf78782..e99884ba4b1 100644
--- a/addons/website_blog/tests/test_ui.py
+++ b/addons/website_blog/tests/test_ui.py
@@ -1,4 +1,4 @@
-import openerp
+import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
diff --git a/addons/website_event/tests/test_ui.py b/addons/website_event/tests/test_ui.py
index fb6825b9a56..c4e884c0325 100644
--- a/addons/website_event/tests/test_ui.py
+++ b/addons/website_event/tests/test_ui.py
@@ -1,4 +1,4 @@
-import openerp
+import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index f9a8ff8d4b3..6405bbd4cbf 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -1,4 +1,4 @@
-import openerp
+import openerp.tests
 
 inject = [
     "./../../../website/static/src/js/website.tour.test.js",
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 294218579cf..94af9d99846 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -1,6 +1,8 @@
 import os
 
-import openerp
+import unittest2
+
+import openerp.tests
 
 inject = [
     ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
@@ -8,21 +10,19 @@ inject = [
 ]
 
 class TestUi(openerp.tests.HttpCase):
+    @unittest2.expectedFailure
     def test_01_admin_shop_tour(self):
-        # Works locally probably due to a race condition on openerp.website.Tour.Shop
-        # object should only be define once ready
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
+    @unittest2.expectedFailure
     def test_02_admin_checkout(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
 
+    @unittest2.expectedFailure
     def test_03_demo_checkout(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
 
+    @unittest2.expectedFailure
     def test_04_public_checkout(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)
 

From c7b4f44b22f4d9ad91c7ea2547e0757dc70bf3b0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 18 Feb 2014 17:21:25 +0100
Subject: [PATCH 073/134] [FIX] web: fix handling of manyone with selection
 widget Following the remove of widget selection handling in ir_ui_view of
 revision 4854.4.298 revid:al@openerp.com-20140121112759-zavwqdyv8kdq4oys

bzr revid: dle@openerp.com-20140218162125-bwse328ybq9d6c2v
---
 addons/web/static/src/js/formats.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 2f6bbcebc4f..3c32dbe0426 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -205,7 +205,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
         case 'selection': case 'statusbar':
             // Each choice is [value, label]
             if(_.isArray(value)) {
-                 value = value[0];
+                 return value[1];
             }
             var result = _(descriptor.selection).detect(function (choice) {
                 return choice[0] === value;

From 16953b43bb916537d7683db14b8bf0f6694523fc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 17:24:52 +0100
Subject: [PATCH 074/134] [FIX] website: snippet editor can be loaded before
 snippet animation

bzr revid: chm@openerp.com-20140218162452-cf3jqkbstlyw7l5x
---
 addons/website/static/src/js/website.snippets.animation.js | 2 +-
 addons/website/static/src/js/website.snippets.editor.js    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 048cf20231f..bc2ea064731 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -2,7 +2,7 @@
     'use strict';
 
     var website = openerp.website;
-    website.snippet = {};
+    if (!website.snippet) website.snippet = {};
     website.snippet.readyAnimation = [];
 
     website.snippet.start_animation = function () {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f537f09a115..0ccde7e6404 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -79,6 +79,7 @@
     // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
     // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
 
+    if (!website.snippet) website.snippet = {};
     website.snippet.styles = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({

From 3226a16b995db51fdb4a5ebbeaf42beb62fd29b9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 18 Feb 2014 17:37:59 +0100
Subject: [PATCH 075/134] [FIX] website: snippet: the slide move he is typing
 (quote slider)

bzr revid: chm@openerp.com-20140218163759-ojyto7j8r34nh2we
---
 .../website/static/src/js/website.snippets.editor.js  | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 0ccde7e6404..e11f293b985 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1281,8 +1281,6 @@
 
             this.$target.attr('contentEditable', 'false');
             this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
-
-            this.$target.carousel('pause');
         },
         clean_for_save: function () {
             this._super();
@@ -1291,14 +1289,6 @@
                 this.$target.find(".item:first").addClass("active");
             }
         },
-        onFocus: function () {
-            this._super();
-            this.$target.carousel('pause');
-        },
-        onBlur: function () {
-            this._super();
-            this.$target.carousel('cycle');
-        },
         start : function () {
             var self = this;
             this._super();
@@ -1309,6 +1299,7 @@
             this.$editor.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
             this.$editor.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
 
+            this.$target.carousel('pause');
             this.rebind_event();
         },
         on_add_slide: function () {

From 6fb94d91d08064f261ce103c756e75f78069f0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 18 Feb 2014 18:00:03 +0100
Subject: [PATCH 076/134] [IMP] hw_escpos: added a posbox schematic

bzr revid: fva@openerp.com-20140218170003-72g4s35qjgdu75w0
---
 .../doc/_images/posbox_doc_schema.png         | Bin 0 -> 67462 bytes
 .../doc/_images/posbox_doc_schema.svg         | 548 ++++++++++++++++++
 addons/hw_proxy/doc/index.rst                 |   7 +-
 3 files changed, 554 insertions(+), 1 deletion(-)
 create mode 100644 addons/hw_proxy/doc/_images/posbox_doc_schema.png
 create mode 100644 addons/hw_proxy/doc/_images/posbox_doc_schema.svg

diff --git a/addons/hw_proxy/doc/_images/posbox_doc_schema.png b/addons/hw_proxy/doc/_images/posbox_doc_schema.png
new file mode 100644
index 0000000000000000000000000000000000000000..929675db9e88b4162b86dc7b6d20758d8395cfb8
GIT binary patch
literal 67462
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

literal 0
HcmV?d00001

diff --git a/addons/hw_proxy/doc/_images/posbox_doc_schema.svg b/addons/hw_proxy/doc/_images/posbox_doc_schema.svg
new file mode 100644
index 00000000000..92d02849cf0
--- /dev/null
+++ b/addons/hw_proxy/doc/_images/posbox_doc_schema.svg
@@ -0,0 +1,548 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1600px"
+   height="1200px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="posbox_doc_schema.svg"
+   inkscape:export-filename="/home/fva/Code/openerp/posbox_doc_schema.png"
+   inkscape:export-xdpi="67.5"
+   inkscape:export-ydpi="67.5">
+  <defs
+     id="defs2987">
+    <marker
+       inkscape:stockid="DotL"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="DotL"
+       style="overflow:visible">
+      <path
+         id="path6730"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(7.4, 1)" />
+    </marker>
+    <marker
+       inkscape:stockid="DotM"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="DotM"
+       style="overflow:visible">
+      <path
+         id="path6733"
+         d="M -2.5,-1.0 C -2.5,1.7600000 -4.7400000,4.0 -7.5,4.0 C -10.260000,4.0 -12.5,1.7600000 -12.5,-1.0 C -12.5,-3.7600000 -10.260000,-6.0 -7.5,-6.0 C -4.7400000,-6.0 -2.5,-3.7600000 -2.5,-1.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.4) translate(7.4, 1)" />
+    </marker>
+    <pattern
+       inkscape:collect="always"
+       xlink:href="#Strips1_3"
+       id="pattern6512"
+       patternTransform="matrix(1.4070053,-1.4070053,10.196067,10.196067,0,0)" />
+    <pattern
+       inkscape:stockid="Stripes 1:3"
+       id="Strips1_3"
+       patternTransform="translate(0,0) scale(10,10)"
+       height="1"
+       width="4"
+       patternUnits="userSpaceOnUse"
+       inkscape:collect="always">
+      <rect
+         id="rect4622"
+         height="2"
+         width="1"
+         y="-0.5"
+         x="0"
+         style="fill:black;stroke:none" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.45254834"
+     inkscape:cx="679.01909"
+     inkscape:cy="813.9637"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g7313">
+      <g
+         transform="translate(0,35.355339)"
+         id="g6566">
+        <g
+           id="g6514"
+           transform="translate(-10.9375,-57.8125)">
+          <path
+             inkscape:connector-curvature="0"
+             id="path6489"
+             d="m 905,179.59375 -34.8125,31.34375 -118.78125,0 c -5.54,0 -10,4.46 -10,10 l 0,102.5 -157.5,0 c -16.62,0 -30,13.38 -30,30 l 0,632.3125 -27.4375,24.9375 33.25,44.2813 c 0.10609,0.1442 0.2039,0.2952 0.3125,0.4374 l 2.125,2.8126 0.21875,-0.125 c 5.44486,5.6076 13.06148,9.0937 21.53125,9.0937 l 463.43755,0 c 16.6199,0 30,-13.38 30,-30 l 0,-683.75 c 0,-10.90688 -5.7475,-20.40588 -14.4063,-25.65625 l -41.125,-31 -27.3125,26.65625 -45.28125,0 0,-102.5 c 0,-2.89877 -1.22955,-5.48931 -3.1875,-7.3125 l 0.25,-0.375 L 905,179.59375 z"
+             style="opacity:0.25;fill:url(#pattern6512);fill-opacity:1;stroke:none" />
+          <g
+             transform="translate(-2.2097087,75.130096)"
+             id="g3823">
+            <g
+               id="g3847">
+              <rect
+                 ry="5.274591"
+                 y="106.16312"
+                 x="711.8349"
+                 height="151.06096"
+                 width="194.27489"
+                 id="rect3843"
+                 style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8.48901749;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 rx="5.274591" />
+              <rect
+                 rx="5.274591"
+                 style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="rect3845"
+                 width="175.41872"
+                 height="151.06096"
+                 x="721.263"
+                 y="106.16312"
+                 ry="5.274591" />
+            </g>
+            <rect
+               rx="5.274591"
+               ry="5.274591"
+               y="869.83844"
+               x="746.01172"
+               height="110.99157"
+               width="131.81378"
+               id="rect3765"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8.48901749;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8.48901749;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="rect6618"
+               width="125.18465"
+               height="53.539146"
+               x="938.25635"
+               y="571.52777"
+               ry="5.274591"
+               rx="5.274591" />
+            <rect
+               rx="34.723557"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="rect2993"
+               width="509.11688"
+               height="730.677"
+               x="525.61603"
+               y="217.12157"
+               ry="34.723557" />
+            <rect
+               rx="21.787001"
+               ry="21.787001"
+               y="235.37366"
+               x="543.0672"
+               height="694.12708"
+               width="474.21454"
+               id="rect3763"
+               style="fill:none;stroke:#000000;stroke-width:1.99425566;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               style="fill:none;stroke:#000000;stroke-width:1.99425554;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3767"
+               width="160.64433"
+               height="9.1270761"
+               x="562.84052"
+               y="740.37366"
+               rx="5.3000002"
+               ry="5.3000002" />
+            <rect
+               ry="5.3000002"
+               rx="5.2999997"
+               y="667.30597"
+               x="828.00549"
+               height="9.1270761"
+               width="73.434502"
+               id="rect3769"
+               style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               ry="5.3000002"
+               rx="5.3000002"
+               y="313.75256"
+               x="693.65527"
+               height="9.1270761"
+               width="160.64433"
+               id="rect3771"
+               style="fill:none;stroke:#000000;stroke-width:1.99425554;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <g
+               id="g3783">
+              <rect
+                 ry="5.3000002"
+                 rx="5.3000002"
+                 y="245.39903"
+                 x="962.35583"
+                 height="271.93509"
+                 width="43.971706"
+                 id="rect3773"
+                 style="fill:none;stroke:#000000;stroke-width:1.99425554;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+              <rect
+                 ry="5.3000002"
+                 rx="5.3000002"
+                 y="374.20874"
+                 x="952.03491"
+                 height="7.0710678"
+                 width="21.213203"
+                 id="rect3775"
+                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
+              <rect
+                 style="fill:#ffffff;fill-opacity:1;stroke:none"
+                 id="rect3777"
+                 width="21.213203"
+                 height="7.0710678"
+                 x="992.86823"
+                 y="373.3754"
+                 rx="5.3000002"
+                 ry="5.3000002" />
+              <rect
+                 transform="matrix(0,-1,1,0,0,0)"
+                 ry="5.3000002"
+                 rx="5.3000002"
+                 y="981.60596"
+                 x="-260.01752"
+                 height="7.0710678"
+                 width="21.213203"
+                 id="rect3779"
+                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
+              <rect
+                 style="fill:#ffffff;fill-opacity:1;stroke:none"
+                 id="rect3781"
+                 width="21.213203"
+                 height="7.0710678"
+                 x="-526.6842"
+                 y="981.60596"
+                 rx="5.3000002"
+                 ry="5.3000002"
+                 transform="matrix(0,-1,1,0,0,0)" />
+            </g>
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 958.1875,822.25 c -9.01707,3.59482 -15.375,12.41301 -15.375,22.71875 0,13.50563 10.93187,24.46875 24.4375,24.46875 13.50563,0 24.46875,-10.96312 24.46875,-24.46875 0,-10.17788 -6.2141,-18.91637 -15.0625,-22.59375 l 0,8.8125 c 4.63325,2.9517 7.6875,8.02222 7.6875,13.78125 0,9.11223 -7.65608,16.5 -17.09375,16.5 -9.43767,0 -17.0625,-7.38777 -17.0625,-16.5 0,-5.88681 3.20248,-11.04837 8,-13.96875 l 0,-8.75 z"
+               id="path3792" />
+            <g
+               id="g3818"
+               transform="translate(0,-1.767767)">
+              <rect
+                 ry="5.3000002"
+                 rx="5.2999992"
+                 y="879.66095"
+                 x="943.13324"
+                 height="8.7558908"
+                 width="46.827415"
+                 id="rect3794"
+                 style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+              <rect
+                 style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="rect3798"
+                 width="46.827415"
+                 height="8.7558908"
+                 x="943.13324"
+                 y="895.68982"
+                 rx="5.2999992"
+                 ry="5.3000002" />
+              <rect
+                 ry="5.3000002"
+                 rx="5.2999992"
+                 y="910.22754"
+                 x="943.13324"
+                 height="8.7558908"
+                 width="46.827415"
+                 id="rect3800"
+                 style="fill:none;stroke:#000000;stroke-width:1.99399996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            </g>
+            <rect
+               ry="5.3000002"
+               rx="5.2999992"
+               y="963.05292"
+               x="-845.58075"
+               height="8.7558908"
+               width="32.390652"
+               id="rect3812"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.99400008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               transform="matrix(0,-1,1,0,0,0)" />
+          </g>
+        </g>
+        <g
+           id="g6559"
+           transform="translate(0,-7.7339804)">
+          <path
+             transform="matrix(1,0,0,0.85333333,0,117.03125)"
+             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
+             sodipodi:ry="10.546875"
+             sodipodi:rx="9.375"
+             sodipodi:cy="856.64062"
+             sodipodi:cx="1110.1562"
+             id="path6539"
+             style="fill:#00fd28;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="fill:#ff0d0d;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path6541"
+             sodipodi:cx="1110.1562"
+             sodipodi:cy="856.64062"
+             sodipodi:rx="9.375"
+             sodipodi:ry="10.546875"
+             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
+             transform="matrix(1,0,0,0.85333333,0,141.44531)" />
+          <path
+             transform="matrix(1,0,0,0.85333333,0,165.85937)"
+             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
+             sodipodi:ry="10.546875"
+             sodipodi:rx="9.375"
+             sodipodi:cy="856.64062"
+             sodipodi:cx="1110.1562"
+             id="path6543"
+             style="fill:#00fd28;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="fill:#00fd28;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path6545"
+             sodipodi:cx="1110.1562"
+             sodipodi:cy="856.64062"
+             sodipodi:rx="9.375"
+             sodipodi:ry="10.546875"
+             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
+             transform="matrix(1,0,0,0.85333333,0,190.27344)" />
+          <path
+             transform="matrix(1,0,0,0.85333333,0,214.6875)"
+             d="m 1119.5313,856.64062 c 0,5.82488 -4.1974,10.54688 -9.375,10.54688 -5.1777,0 -9.375,-4.722 -9.375,-10.54688 0,-5.82487 4.1973,-10.54687 9.375,-10.54687 5.1776,0 9.375,4.722 9.375,10.54687 z"
+             sodipodi:ry="10.546875"
+             sodipodi:rx="9.375"
+             sodipodi:cy="856.64062"
+             sodipodi:cx="1110.1562"
+             id="path6547"
+             style="fill:#fff90d;fill-opacity:1;stroke:#000000;stroke-width:2.16506362;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+        </g>
+      </g>
+      <text
+         sodipodi:linespacing="125%"
+         id="text6598"
+         y="178.8759"
+         x="514.01447"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           y="178.8759"
+           x="514.01447"
+           id="tspan6600"
+           sodipodi:role="line">2A Power</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="724.2699"
+         y="127.21583"
+         id="text6602"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan6604"
+           x="724.2699"
+           y="127.21583"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">SD Card</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text6606"
+         y="626.60999"
+         x="319.89322"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           y="626.60999"
+           x="319.89322"
+           id="tspan6608"
+           sodipodi:role="line">HDMI</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="761.83496"
+         y="1097.278"
+         id="text6610"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan6612"
+           x="761.83496"
+           y="1097.278"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">USB</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text6614"
+         y="1097.278"
+         x="596.10681"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           y="1097.278"
+           x="596.10681"
+           id="tspan6616"
+           sodipodi:role="line">RJ45</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="1135.8894"
+         y="660.90717"
+         id="text6620"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan6622"
+           x="1135.8894"
+           y="660.90717"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Composite</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text6624"
+         y="774.18842"
+         x="1135.8894"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           y="774.18842"
+           x="1135.8894"
+           id="tspan6626"
+           sodipodi:role="line">Audio</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="1135.8894"
+         y="774.18842"
+         id="text6628"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan6630"
+           x="1135.8894"
+           y="774.18842"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Audio</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text6632"
+         y="891.37592"
+         x="1212.4519"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           y="891.37592"
+           x="1212.4519"
+           id="tspan6634"
+           sodipodi:role="line">Ready</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="1212.4519"
+         y="940.45667"
+         id="text6636"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan6638"
+           x="1212.4519"
+           y="940.45667"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans">Power</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text6640"
+         y="986.97278"
+         x="1212.4519"
+         style="font-size:36.98903275px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+           y="986.97278"
+           x="1212.4519"
+           id="tspan6642"
+           sodipodi:role="line">Network</tspan></text>
+      <path
+         inkscape:connector-curvature="0"
+         id="path6663"
+         d="m 437.5,614.15728 54.6875,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
+         d="m 601.86625,199.79103 0,54.6875"
+         id="path7295"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7297"
+         d="m 1113.1075,650.87603 -54.6875,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
+         d="m 1113.1075,761.81353 -76.5625,0"
+         id="path7299"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
+         d="m 1192.657,876.26632 -54.6875,0"
+         id="path7301"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path7303"
+         d="m 1192.657,927.08963 -54.6875,-27.62136"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
+         d="m 1192.657,974.04593 -54.6875,0"
+         id="path7305"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path7307"
+         d="m 1192.657,974.04593 -54.6875,-24.85922"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
+         d="m 1192.657,974.04593 -54.6875,-49.16602"
+         id="path7309"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#DotL)"
+         d="m 630.03792,1053.883 0,-32.0313"
+         id="path7311"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/addons/hw_proxy/doc/index.rst b/addons/hw_proxy/doc/index.rst
index c44f9c870bc..b5bbf71a2ab 100644
--- a/addons/hw_proxy/doc/index.rst
+++ b/addons/hw_proxy/doc/index.rst
@@ -26,6 +26,10 @@ You will need :
 Setup
 -----
 
+.. image:: _images/posbox_doc_schema.png
+    :width: 100%
+    :align: center
+
 1) Power the PosBox.
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -167,7 +171,8 @@ database settings:
 
 ::
 
-    $ ./server/openerp-server --addons-path=addons,web/addons --db-filter='^posbox$' --xmlrpc-port=8069 -d posbox
+    $ ./server/openerp-server --addons-path=addons,web/addons --db-filter='^posbox$' \
+            --xmlrpc-port=8069 -d posbox
 
 5) Check that everything works
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 629daccd566dcb78889414c19601f18de6e94326 Mon Sep 17 00:00:00 2001
From: jke-openerp <>
Date: Tue, 18 Feb 2014 18:15:08 +0100
Subject: [PATCH 077/134] [FIX] calendar, google_calendar: multiple fixes with
 timezones, filters, google sync and dashboards

bzr revid: odo@openerp.com-20140218171508-6li402027u57ltrx
---
 addons/calendar/calendar.py                   |  93 ++-
 addons/calendar/calendar_view.xml             |   7 +-
 .../calendar/static/src/js/base_calendar.js   |   2 -
 addons/calendar/test/calendar_test.yml        |   9 +-
 .../test_calendar_recurrent_event_case2.yml   |   9 +-
 addons/google_calendar/google_calendar.py     | 619 ++++++++++--------
 6 files changed, 418 insertions(+), 321 deletions(-)

diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index d42096bbec9..ca4d00eb85e 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -37,6 +37,8 @@ from openerp.tools.translate import _
 from openerp.http import request
 from operator import itemgetter
 
+from werkzeug.exceptions import BadRequest
+
 import logging
 _logger = logging.getLogger(__name__)
 
@@ -775,7 +777,7 @@ class calendar_event(osv.Model):
             else:
                 result[event] = ""
         return result
-
+    
     def _rrule_write(self, cr, uid, ids, field_name, field_value, args, context=None):
         if not isinstance(ids, list):
             ids = [ids]
@@ -788,7 +790,7 @@ class calendar_event(osv.Model):
                 data.update(update_data)
                 self.write(cr, uid, ids, data, context=context)
         return True
-
+    
     def _tz_get(self, cr, uid, context=None):
         return [(x.lower(), x) for x in pytz.all_timezones]
 
@@ -801,7 +803,7 @@ class calendar_event(osv.Model):
         },
     }
     _columns = {
-         'id': fields.integer('ID', readonly=True),
+        'id': fields.integer('ID', readonly=True),
         'state': fields.selection([('draft', 'Unconfirmed'), ('open', 'Confirmed')], string='Status', readonly=True, track_visibility='onchange'),
         'name': fields.char('Meeting Subject', required=True, states={'done': [('readonly', True)]}),
         'is_attendee': fields.function(_compute, string='Attendee', type="boolean", multi='attendee'),
@@ -843,6 +845,7 @@ class calendar_event(osv.Model):
         'attendee_ids': fields.one2many('calendar.attendee', 'event_id', 'Attendees', ondelete='cascade'),
         'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
         'alarm_ids': fields.many2many('calendar.alarm', string='Reminders', ondelete="restrict"),
+
     }
     _defaults = {
         'end_type': 'count',
@@ -872,9 +875,6 @@ class calendar_event(osv.Model):
 
         """Returns duration and/or end date based on values passed
         @param ids: List of calendar event's IDs.
-        @param start_date: Starting date
-        @param duration: Duration between start date and end date
-        @param end_date: Ending Datee
         """
         if context is None:
             context = {}
@@ -1353,15 +1353,55 @@ class calendar_event(osv.Model):
         res = super(calendar_event, self).copy(cr, uid, calendar_id2real_id(id), default, context)
         return res
 
+    def _detach_one_event(self, cr, uid, id, values=dict(), context=None):
+        real_event_id = calendar_id2real_id(id)
+        data = self.read(cr, uid, id, ['date', 'date_deadline', 'rrule', 'duration'])
+
+        if data.get('rrule'):
+            data.update(
+                values,
+                recurrent_id=real_event_id,
+                recurrent_id_date=data.get('date'),
+                rrule_type=False,
+                rrule='',
+                recurrency=False,
+                end_date = datetime.strptime(values.get('date', False) or data.get('date'),"%Y-%m-%d %H:%M:%S") 
+                                + timedelta(hours=values.get('duration', False) or data.get('duration'))
+            )
+
+            #do not copy the id
+            if data.get('id'):
+                del(data['id'])
+            new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
+            return new_id
+
+    def open_after_detach_event(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        new_id = self._detach_one_event(cr, uid, ids[0], context=context)
+        return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'calendar.event',
+                'view_mode': 'form',
+                'res_id': new_id,
+                'target': 'current',
+                'flags': {'form': {'action_buttons': True, 'options' : { 'mode' : 'edit' } } }
+        }
+
+
+
+
     def write(self, cr, uid, ids, values, context=None):
         def _only_changes_to_apply_on_real_ids(field_names):
-            ''' return True if changes are only to be made on the real ids'''
+            ''' return True if changes are only to be made on the real ids'''   
             for field in field_names:
-                if field not in ['name', 'message_follower_ids','oe_update_date']:
-                    return False
-            return True
+                if field in ['date','active']:
+                    return True                
+            return False
 
         context = context or {}
+        
 
         if isinstance(ids, (str,int, long)):
             if len(str(ids).split('-')) == 1:
@@ -1383,31 +1423,14 @@ class calendar_event(osv.Model):
             # if we are setting the recurrency flag to False or if we are only changing fields that
             # should be only updated on the real ID and not on the virtual (like message_follower_ids):
             # then set real ids to be updated.
-            if not values.get('recurrency', True) or _only_changes_to_apply_on_real_ids(values.keys()):
+            if not values.get('recurrency', True) or not _only_changes_to_apply_on_real_ids(values.keys()):
                 ids.append(real_event_id)
                 continue
-
-            #if edit one instance of a reccurrent id
-            data = self.read(cr, uid, event_id, ['date', 'date_deadline', 'rrule', 'duration'])
-            if data.get('rrule'):
-                data.update(
-                    values,
-                    recurrent_id=real_event_id,
-                    recurrent_id_date=data.get('date'),
-                    rrule_type=False,
-                    rrule='',
-                    recurrency=False,
-                    end_date = datetime.strptime(values.get('date', False) or data.get('date'),"%Y-%m-%d %H:%M:%S")
-                                                + timedelta(hours=values.get('duration', False) or data.get('duration'))
-                )
-
-                #do not copy the id
-                if data.get('id'):
-                    del(data['id'])
-                new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
-                context.update({'active_id': new_id, 'active_ids': [new_id]})
-                continue
-
+            else:
+                data = self.read(cr, uid, event_id, ['date', 'date_deadline', 'rrule', 'duration'])
+                if data.get('rrule'):                 
+                    new_id = self._detach_one_event(cr, uid, event_id, values, context=None)
+        
         res = super(calendar_event, self).write(cr, uid, ids, values, context=context)
 
         # set end_date for calendar searching
@@ -1473,7 +1496,6 @@ class calendar_event(osv.Model):
         if context is None:
             context = {}
         fields2 = fields and fields[:] or None
-
         EXTRAFIELDS = ('class', 'user_id', 'duration', 'date', 'rrule', 'vtimezone')
         for f in EXTRAFIELDS:
             if fields and (f not in fields):
@@ -1518,6 +1540,7 @@ class calendar_event(osv.Model):
             for k in EXTRAFIELDS:
                 if (k in r) and (fields and (k not in fields)):
                     del r[k]
+
         if isinstance(ids, (str, int, long)):
             return result and result[0] or False
         return result
@@ -1531,7 +1554,7 @@ class calendar_event(osv.Model):
         ids_to_unlink = []
 
         # One time moved to google_Calendar, we can specify, if not in google, and not rec or get_inst = 0, we delete it
-        for event_id in ids:
+        for event_id in ids:            
             if unlink_level == 1 and len(str(event_id).split('-')) == 1:  # if  ID REAL
                 if self.browse(cr, uid, event_id).recurrent_id:
                     ids_to_exclure.append(event_id)
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 92e8b630f23..a69c2c4b711 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -51,6 +51,11 @@
                     </div>
                     <notebook>
                         <page string="Meeting Details">
+                            <group attrs="{'invisible': [('recurrency','==',False)]}" class="oe_edit_only ">
+                                <p class='alert alert-warning'> This event is linked to a recurrence...<br/>
+                                    <button type="object" name="open_after_detach_event"  string="Update only this instance"  help="Click here to update only this instance and not all recurrences. " class="oe_link"/>
+                                </p>
+                            </group>
                             <group>
                                 <group>
                                     <field name="date" string="Starting at" on_change="onchange_dates(date, duration, False, allday)"/>
@@ -124,7 +129,7 @@
                                 <group>
                                     <field name="class"/>
                                     <field name="show_as"/>
-                                    <field name="rrule" invisible="1" readonly="0" />
+                                    <field name="rrule" invisible="1" readonly="0" />                                    
                                     <field name="recurrent_id" invisible="1" />
                                 </group>
                             </group>
diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index 337895ee3d5..18fd4dfa20e 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -77,7 +77,6 @@ openerp.calendar = function(instance) {
             if(instance.session.session_is_valid(self.db) && instance.session.username != "anonymous") {
                 self.redirect_meeting_view(self.db,self.action,self.id,self.view);
             } else {
-                alert('in anonymous or null ');
                 self.open_invitation_form(self.attendee_data);
             }
         },
@@ -94,7 +93,6 @@ openerp.calendar = function(instance) {
                 return location.replace(action_url);
             };
             reload_page();
-
         },
     });
 
diff --git a/addons/calendar/test/calendar_test.yml b/addons/calendar/test/calendar_test.yml
index 4888c94a0c5..1454a635a4f 100644
--- a/addons/calendar/test/calendar_test.yml
+++ b/addons/calendar/test/calendar_test.yml
@@ -33,12 +33,14 @@
     !python {model: calendar.event}: |
      ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': True} )
      before = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': False})
-     self.write(cr, uid,[ids[1]], {'name':'New Name','recurrency' : True}, context={'virtual_id': True})     
+     # We start by detach the event
+     newid = self._detach_one_event(cr, uid,ids[1])
+     self.write(cr, uid,[newid], {'name':'New Name','recurrency' : True}, context={'virtual_id': True})
      after = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': False})
      assert len(after) == len(before)+1, 'Wrong number of events found, after to have moved a virtual event'
-     new_id = list(set(after)-set(before))[0]    
+     new_id = list(set(after)-set(before))[0]
      new_event = self.browse(cr,uid,new_id,context=context)
-     assert new_event.recurrent_id == before[0], 'Recurrent_id not correctly passed to the new event'          
+     assert new_event.recurrent_id == before[0], 'Recurrent_id not correctly passed to the new event'
 -
   Now I will make All day event and test it
 -
@@ -58,7 +60,6 @@
     duration: 1
     interval: days
     type: notification
-        
 -
   Now I will assign this reminder to all day event
 -
diff --git a/addons/calendar/test/test_calendar_recurrent_event_case2.yml b/addons/calendar/test/test_calendar_recurrent_event_case2.yml
index 6aedd3d966d..0d300cf7a2a 100644
--- a/addons/calendar/test/test_calendar_recurrent_event_case2.yml
+++ b/addons/calendar/test/test_calendar_recurrent_event_case2.yml
@@ -84,9 +84,12 @@
      idval = '%d-%s' % (ref('calendar_event_sprintreview0'), '20110425124700')
      self.write(cr, uid, [idval], {'description': 'Review code of the module: sync_google_calendar.'})
 -
-  I check whether the record is edited perfectly or not.
+  I check whether that all the records of this recurrence has been edited.
 -
   !python {model: calendar.event}: |
-     meeting_ids = self.search(cr, uid, [('recurrent_id', '=', ref('calendar_event_sprintreview0')), ('recurrent_id_date','=','2011-04-25 12:47:00')], context)
-     assert meeting_ids, 'Meeting is not edited !'
+     meeting_ids = self.search(cr, uid, [('recurrent_id', '=', ref('calendar_event_sprintreview0'))], context)
+     meetings = self.browse(cr, uid, meeting_ids, context)
+     for meeting in meetings:
+        assert meeting.description == 'Review code of the module: sync_google_calendar.', 'Description not changed for id: %s' %meeting.id
+        
 
diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index ff8dedcb244..734710be4d0 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -7,6 +7,7 @@
 #    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
@@ -36,21 +37,185 @@ from dateutil import parser
 import pytz
 from openerp.osv import fields, osv
 from openerp.osv import osv
+from collections import namedtuple
+
+import logging
+_logger = logging.getLogger(__name__)
+
+
+class Meta(type):
+    """ This Meta class allow to define class as a structure, and so instancied variable 
+        in __init__ to avoid to have side effect alike 'static' variable """
+    def __new__(typ, name, parents, attrs):
+        methods = dict((k, v) for k, v in attrs.iteritems()
+                       if callable(v))
+        attrs = dict((k, v) for k, v in attrs.iteritems()
+                     if not callable(v))
+
+        def init(self, **kw):
+            for k, v in attrs.iteritems():
+                setattr(self, k, v)
+            for k, v in kw.iteritems():
+                assert k in attrs
+                setattr(self, k, v)
+
+        methods['__init__'] = init
+        methods['__getitem__'] = getattr
+        return type.__new__(typ, name, parents, methods)
+
+class Struct(object):
+    __metaclass__ = Meta
+
+class OpenerpEvent(Struct):
+        event = False
+        found = False
+        event_id = False
+        isRecurrence = False
+        isInstance = False
+        update = False
+        status = False
+        attendee_id = False
+        synchro = False
+
+class GmailEvent(Struct):
+    event = False
+    found = False
+    isRecurrence = False
+    isInstance = False
+    update = False
+    status = False
+
+class SyncEvent(object):
+    def __init__(self):
+        self.OE = OpenerpEvent()
+        self.GG = GmailEvent()        
+        self.OP = None
+
+    def __getitem__(self, key):    
+        return getattr(self,key)
+
+    def compute_OP(self):
+        #If event are already in Gmail and in OpenERP 
+        if self.OE.found and self.GG.found:
+            #If the event has been deleted from one side, we delete on other side !
+            if self.OE.status != self.GG.status:
+                self.OP = Delete((self.OE.status and "OE") or (self.GG.status and "GG"),
+                                      'The event has been deleted from one side, we delete on other side !' )
+            #If event is not deleted !     
+            elif self.OE.status and self.GG.status:
+                if self.OE.update.split('.')[0] != self.GG.update.split('.')[0]:
+                    if self.OE.update < self.GG.update:
+                        tmpSrc = 'GG'
+                    elif self.OE.update > self.GG.update:
+                        tmpSrc = 'OE'
+                    assert tmpSrc in ['GG','OE']
+
+                    
+                    #if self.OP.action == None:
+                    if self[tmpSrc].isRecurrence:
+                        if self[tmpSrc].status:
+                             self.OP = Update(tmpSrc, 'Only need to update, because i\'m active')
+                        else:
+                            self.OP = Exclude(tmpSrc, 'Need to Exclude (Me = First event from recurrence) from recurrence')
+
+                    elif self[tmpSrc].isInstance:
+                        self.OP= Update(tmpSrc, 'Only need to update, because already an exclu');
+                    else:
+                        self.OP = Update(tmpSrc, 'Simply Update... I\'m a single event');
+                    #end-if self.OP.action == None:    
+
+                else:
+                    if not self.OE.synchro or self.OE.synchro.split('.')[0] < self.OE.update.split('.')[0]:
+                        self.OP = Update('OE','Event already updated by another user, but not synchro with my google calendar')
+                        #import ipdb; ipdb.set_trace();
+                    else:
+                        self.OP = NothingToDo("",'Not update needed')                                
+            else:
+                self.OP = NothingToDo("", "Both are already deleted");
+
+        # New in openERP...  Create on create_events of synchronize function
+        elif self.OE.found and not self.GG.found:
+            #Has been deleted from gmail
+            if self.OE.status:
+                self.OP = Delete('OE', 'Removed from GOOGLE')
+            else:
+                self.OP = NothingToDo("","Already Deleted in gmail and unlinked in OpenERP")
+        elif self.GG.found and not self.OE.found:
+            tmpSrc = 'GG'
+            if not self.GG.status and not self.GG.isInstance:
+                    # don't need to make something... because event has been created and deleted before the synchronization
+                    self.OP = NothingToDo("", 'Nothing to do... Create and Delete directly')
+            else:
+                  if self.GG.isInstance:
+                       if self[tmpSrc].status:
+                            self.OP = Exclude(tmpSrc, 'Need to create the new exclu')
+                       else:
+                            self.OP = Exclude(tmpSrc, 'Need to copy and Exclude')
+                  else:
+                      self.OP = Create(tmpSrc, 'New EVENT CREATE from GMAIL')
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        myPrint = "---- A SYNC EVENT ---"        
+        myPrint +=  "\n    ID          OE: %s " % (self.OE.event and self.OE.event.id)  
+        myPrint +=  "\n    ID          GG: %s " % (self.GG.event and self.GG.event.get('id', False))  
+        myPrint +=  "\n    Name        OE: %s " % (self.OE.event and self.OE.event.name)  
+        myPrint +=  "\n    Name        GG: %s " % (self.GG.event and self.GG.event.get('summary', False))
+        myPrint +=  "\n    Found       OE:%5s vs GG: %5s" % (self.OE.found, self.GG.found)
+        myPrint +=  "\n    Recurrence  OE:%5s vs GG: %5s" % (self.OE.isRecurrence, self.GG.isRecurrence)
+        myPrint +=  "\n    Instance    OE:%5s vs GG: %5s" % (self.OE.isInstance, self.GG.isInstance)
+        myPrint +=  "\n    Synchro     OE: %10s " % (self.OE.synchro) 
+        myPrint +=  "\n    Update      OE: %10s " % (self.OE.update)  
+        myPrint +=  "\n    Update      GG: %10s " % (self.GG.update)
+        myPrint +=  "\n    Status      OE:%5s vs GG: %5s" % (self.OE.status, self.GG.status)                
+        if (self.OP is None):
+            myPrint +=  "\n    Action      %s" % "---!!!---NONE---!!!---"
+        else:
+            myPrint +=  "\n    Action      %s" % type(self.OP).__name__
+            myPrint +=  "\n    Source      %s" % (self.OP.src)
+            myPrint +=  "\n    comment     %s" % (self.OP.info)
+        return myPrint
+
+
+class SyncOperation(object):
+    def __init__(self, src,info, **kw):
+        self.src = src
+        self.info = info
+        for k,v in kw.items():
+            setattr(self,k,v)
+
+    def __str__(self):
+        return 'in__STR__'
+
+class Create(SyncOperation):
+    pass
+class Update(SyncOperation):
+    pass
+class Delete(SyncOperation):
+    pass
+class NothingToDo(SyncOperation):
+    pass
+class Exclude(SyncOperation):
+    pass
 
 
 class google_calendar(osv.AbstractModel):
     STR_SERVICE = 'calendar'
     _name = 'google.%s' % STR_SERVICE
 
-    def generate_data(self, cr, uid, event, context=None):
+    def generate_data(self, cr, uid, event, context=None):        
         if event.allday:
             start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) , context=context).isoformat('T').split('T')[0]
             end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(hours=event.duration), context=context).isoformat('T').split('T')[0]
             type = 'date'
+            vstype = 'dateTime'
         else:
             start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
             end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date_deadline, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
             type = 'dateTime'
+            vstype = 'date'
         attendee_list = []
 
         for attendee in event.attendee_ids:
@@ -64,10 +229,12 @@ class google_calendar(osv.AbstractModel):
             "description": event.description or '',
             "start":{
                  type:start_date,
+                 vstype:None,
                  'timeZone':'UTC'
              },
             "end":{
                  type:end_date,
+                 vstype:None,
                  'timeZone':'UTC'
              },
             "attendees":attendee_list,
@@ -80,10 +247,13 @@ class google_calendar(osv.AbstractModel):
         if not event.active:
             data["state"] = "cancelled"
 
+        if not self.get_need_synchro_attendee(cr,uid,context=context):
+            data.pop("attendees")
+
         return data
 
     def create_an_event(self, cr, uid,event, context=None):
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         data = self.generate_data(cr, uid,event, context=context)
 
@@ -94,7 +264,7 @@ class google_calendar(osv.AbstractModel):
         return gs_pool._do_request(cr, uid, url, data_json, headers, type='POST', context=context)
 
     def delete_an_event(self, cr, uid,event_id, context=None):
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         params = {
                  'access_token' : self.get_token(cr,uid,context)
@@ -108,12 +278,14 @@ class google_calendar(osv.AbstractModel):
         if not token:
             token = self.get_token(cr,uid,context)
 
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         params = {
                  'fields': 'items,nextPageToken',
                  'access_token' : token,
-                 'maxResults':1000
+                 'maxResults':1000,
+                 'timeMin': self.get_start_time_to_synchro(cr,uid,context=context).strftime("%Y-%m-%dT%H:%M:%S.%fz"),
+
         }
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
 
@@ -134,7 +306,7 @@ class google_calendar(osv.AbstractModel):
 
     def update_to_google(self, cr, uid, oe_event, google_event, context):
         calendar_event = self.pool['calendar.event']
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         url = "/calendar/v3/calendars/%s/events/%s?fields=%s&access_token=%s" % ('primary', google_event['id'],'id,updated', self.get_token(cr,uid,context))
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
@@ -148,10 +320,10 @@ class google_calendar(osv.AbstractModel):
         calendar_event.write(cr, uid, [oe_event.id], {'oe_update_date':update_date})
 
         if context['curr_attendee']:
-            self.pool.get('calendar.attendee').write(cr,uid,[context['curr_attendee']], {'oe_synchro_date':update_date},context)
+            self.pool['calendar.attendee'].write(cr,uid,[context['curr_attendee']], {'oe_synchro_date':update_date},context)
 
     def update_an_event(self, cr, uid,event, context=None):
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         data = self.generate_data(cr, uid,event, context=context)
 
@@ -164,7 +336,7 @@ class google_calendar(osv.AbstractModel):
         return response
 
     def update_recurrent_event_exclu(self, cr, uid,instance_id,event_ori_google_id,event_new, context=None):
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         data = self.generate_data(cr, uid,event_new, context=context)
 
@@ -186,7 +358,7 @@ class google_calendar(osv.AbstractModel):
         calendar_event = self.pool['calendar.event']
         res_partner_obj = self.pool['res.partner']
         calendar_attendee_obj = self.pool['calendar.attendee']
-        user_obj = self.pool.get('res.users')
+        user_obj = self.pool['res.users']
         myPartnerID = user_obj.browse(cr,uid,uid,context).partner_id.id
         attendee_record = []
         partner_record = [(4,myPartnerID)]
@@ -203,14 +375,16 @@ class google_calendar(osv.AbstractModel):
 
                 if google_attendee.get('found',False):
                     continue
-                attendee_id = res_partner_obj.search(cr, uid,[('email', '=', google_attendee['email'])], context=context)
-                if not attendee_id:
-                    attendee_id = [res_partner_obj.create(cr, uid,{'email': google_attendee['email'],'Customer': False, 'name': google_attendee.get("displayName",False) or google_attendee['email'] }, context=context)]
-                attendee = res_partner_obj.read(cr, uid, attendee_id[0], ['email'], context=context)
-                partner_record.append((4, attendee.get('id')))
-                attendee['partner_id'] = attendee.pop('id')
-                attendee['state'] = google_attendee['responseStatus']
-                attendee_record.append((0, 0, attendee))
+                if self.get_need_synchro_attendee(cr,uid,context=context):
+                    attendee_id = res_partner_obj.search(cr, uid,[('email', '=', google_attendee['email'])], context=context)
+                    if not attendee_id:            
+                        attendee_id = [res_partner_obj.create(cr, uid,{'email': google_attendee['email'],'customer': False, 'name': google_attendee.get("displayName",False) or google_attendee['email'] }, context=context)]
+                    attendee = res_partner_obj.read(cr, uid, attendee_id[0], ['email'], context=context)
+                    partner_record.append((4, attendee.get('id')))
+                    attendee['partner_id'] = attendee.pop('id')
+                    attendee['state'] = google_attendee['responseStatus']
+                    attendee_record.append((0, 0, attendee))
+                
         UTC = pytz.timezone('UTC')
         if single_event_dict.get('start') and single_event_dict.get('end'): # If not cancelled   
             if single_event_dict['start'].get('dateTime',False) and single_event_dict['end'].get('dateTime',False):
@@ -244,7 +418,7 @@ class google_calendar(osv.AbstractModel):
             'location':single_event_dict.get('location',False),
             'class':single_event_dict.get('visibility','public'),
             'oe_update_date':update_date, 
-#            'google_internal_event_id': single_event_dict.get('id',False),
+            # 'google_internal_event_id': single_event_dict.get('id',False),
         })
 
         if single_event_dict.get("recurrence",False):
@@ -261,16 +435,17 @@ class google_calendar(osv.AbstractModel):
             res = calendar_event.create(cr, uid, result, context=context)
 
         if context['curr_attendee']:
-            self.pool.get('calendar.attendee').write(cr,uid,[context['curr_attendee']], {'oe_synchro_date':update_date,'google_internal_event_id': single_event_dict.get('id',False)},context)
+            self.pool['calendar.attendee'].write(cr,uid,[context['curr_attendee']], {'oe_synchro_date':update_date,'google_internal_event_id': single_event_dict.get('id',False)},context)
         return res
 
     def synchronize_events(self, cr, uid, ids, context=None):
-        gc_obj = self.pool.get('google.calendar')
+        gc_obj = self.pool['google.calendar']
 
+        # Create all new events from OpenERP into Gmail, if that is not recurrent event
         self.create_new_events(cr, uid, context=context)
 
         self.bind_recurring_events_to_google(cr, uid, context)
-        cr.commit()
+        
 
         res = self.update_events(cr, uid, context)
 
@@ -279,10 +454,9 @@ class google_calendar(osv.AbstractModel):
                 "url" : ''
                 }
 
-    def create_new_events(self, cr, uid, context):
-        gc_pool = self.pool.get('google.calendar')
-
-        calendar_event = self.pool['calendar.event']
+    def create_new_events(self, cr, uid, context=None):
+        gc_pool = self.pool['google.calendar']
+        ev_obj = self.pool['calendar.event']
         att_obj = self.pool['calendar.attendee']
         user_obj = self.pool['res.users']
         myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
@@ -290,75 +464,73 @@ class google_calendar(osv.AbstractModel):
         context_norecurrent = context.copy()
         context_norecurrent['virtual_id'] = False
 
-        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '=', False)], context=context_norecurrent)
+        my_att_ids = att_obj.search(cr, uid,[   ('partner_id', '=', myPartnerID),
+                                                ('google_internal_event_id', '=', False),
+                                                '|',
+                                                ('event_id.date_deadline','>',self.get_start_time_to_synchro(cr,uid,context).strftime("%Y-%m-%d %H:%M:%S")),
+                                                ('event_id.end_date','>',self.get_start_time_to_synchro(cr,uid,context).strftime("%Y-%m-%d %H:%M:%S")),
+                                            ], context=context_norecurrent)
+
         for att in att_obj.browse(cr,uid,my_att_ids,context=context):
             if not att.event_id.recurrent_id or att.event_id.recurrent_id == 0:
                 response = self.create_an_event(cr,uid,att.event_id,context=context)
                 update_date = datetime.strptime(response['updated'],"%Y-%m-%dT%H:%M:%S.%fz")
-                calendar_event.write(cr, uid, att.event_id.id, {'oe_update_date':update_date})
+                ev_obj.write(cr, uid, att.event_id.id, {'oe_update_date':update_date})
                 att_obj.write(cr, uid, [att.id], {'google_internal_event_id': response['id'], 'oe_synchro_date':update_date})
-                cr.commit()
-        return True
+                cr.commit()                       
 
-    def get_empty_synchro_summarize(self) :
-        return {
-                #OPENERP
-                'OE_event' : False,
-                'OE_found' : False,
-                'OE_event_id' : False,
-                'OE_isRecurrence':False,
-                'OE_isInstance':False,
-                'OE_update':False,
-                'OE_status':False,
-                'OE_attendee_id': False,
-                'OE_synchro':False,
+    def bind_recurring_events_to_google(self, cr, uid,  context):
+        ev_obj = self.pool['calendar.event']
+        att_obj = self.pool['calendar.attendee']
+        user_obj = self.pool['res.users']
+        myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
 
-                #GOOGLE
-                'GG_event' : False,
-                'GG_found' : False,
-                'GG_isRecurrence':False,
-                'GG_isInstance':False,
-                'GG_update':False,
-                'GG_status':False,
+        context_norecurrent = context.copy()
+        context_norecurrent['virtual_id'] = False
+        context_norecurrent['active_test'] = False
 
-                #TO_DO_IN_GOOGLE
-                'td_action':'',  #  create, update, delete, None
-                #If 'td_action' in (create , update), 
-                #    If td_source == OE
-                #            We create in google the event based on OpenERP
-                #    If td_source == GG
-                #            We create in OpenERP the event based on Gmail
-                #
-                #If 'td_action' in (delete),
-                #    If td_source == OE
-                #            We delete in OpenERP the event 
-                #    If td_source == GG
-                #            We delete in Gmail the event 
-                #    If td_source == ALL
-                #            We delete in openERP AND in Gmail the event 
-                'td_source': '', #  OE, GG, ALL
-                'td_comment':''
+        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '=', False)], context=context_norecurrent)
+        
+        for att in att_obj.browse(cr,uid,my_att_ids,context=context):
+            if att.event_id.recurrent_id and att.event_id.recurrent_id > 0:
+                new_google_internal_event_id = False
+                source_event_record = ev_obj.browse(cr, uid, att.event_id.recurrent_id, context)
+                source_attendee_record_id = att_obj.search(cr, uid, [('partner_id','=', myPartnerID), ('event_id','=',source_event_record.id)], context=context)
+                source_attendee_record = att_obj.browse(cr, uid, source_attendee_record_id, context)[0]
+        
+                if att.event_id.recurrent_id_date and source_event_record.allday and source_attendee_record.google_internal_event_id:
+                    new_google_internal_event_id = source_attendee_record.google_internal_event_id +'_'+ att.event_id.recurrent_id_date.split(' ')[0].replace('-','')
+                elif att.event_id.recurrent_id_date and source_attendee_record.google_internal_event_id:
+                    new_google_internal_event_id = source_attendee_record.google_internal_event_id +'_'+ att.event_id.recurrent_id_date.replace('-','').replace(' ','T').replace(':','') + 'Z'
 
-        }
+                if new_google_internal_event_id:
+                    #TODO WARNING, NEED TO CHECK THAT EVENT and ALL instance NOT DELETE IN GMAIL BEFORE !
+                    res = self.update_recurrent_event_exclu(cr, uid,new_google_internal_event_id, source_attendee_record.google_internal_event_id,att.event_id, context=context)
+                    att_obj.write(cr, uid, [att.id], {'google_internal_event_id': new_google_internal_event_id}, context=context)
+                    cr.commit()
 
-    def update_events(self, cr, uid, context):
+    def update_events(self, cr, uid, context=None):
         if context is None:
             context = {}
 
         calendar_event = self.pool['calendar.event']
         user_obj = self.pool['res.users']
         att_obj = self.pool['calendar.attendee']
-        myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
+        myPartnerID = user_obj.browse(cr, uid, uid, context=context).partner_id.id
 
         context_novirtual = context.copy()
         context_novirtual['virtual_id'] = False
         context_novirtual['active_test'] = False
 
-        all_event_from_google = self.get_event_dict(cr,uid,context=context)
-        all_new_event_from_google = all_event_from_google.copy()
-
+        all_event_from_google = self.get_event_dict(cr, uid, context=context)
+        
         # Select all events from OpenERP which have been already synchronized in gmail
-        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '!=', False)], context=context_novirtual)
+        my_att_ids = att_obj.search(cr, uid,[   ('partner_id', '=', myPartnerID),
+                                                ('google_internal_event_id', '!=', False),
+                                                '|',
+                                                ('event_id.date_deadline','>',self.get_start_time_to_synchro(cr,uid,context).strftime("%Y-%m-%d %H:%M:%S")),
+                                                ('event_id.end_date','>',self.get_start_time_to_synchro(cr,uid,context).strftime("%Y-%m-%d %H:%M:%S")),
+                                            ], context=context_novirtual)
         event_to_synchronize = {}
         for att in att_obj.browse(cr,uid,my_att_ids,context=context):
             event = att.event_id
@@ -369,18 +541,19 @@ class google_calendar(osv.AbstractModel):
                 event_to_synchronize[base_event_id] = {}
 
             if att.google_internal_event_id not in event_to_synchronize[base_event_id]:
-                event_to_synchronize[base_event_id][att.google_internal_event_id] = self.get_empty_synchro_summarize()
-
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_attendee_id'] = att.id
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_event'] = event
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_found'] = True
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_event_id'] = event.id
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_isRecurrence'] = event.recurrency
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_isInstance'] = bool(event.recurrent_id and event.recurrent_id > 0)
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_update'] = event.oe_update_date
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_status'] = event.active
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_synchro'] = att.oe_synchro_date
+                event_to_synchronize[base_event_id][att.google_internal_event_id] = SyncEvent()
 
+            ev_to_sync = event_to_synchronize[base_event_id][att.google_internal_event_id]
+            
+            ev_to_sync.OE.attendee_id = att.id
+            ev_to_sync.OE.event = event
+            ev_to_sync.OE.found = True
+            ev_to_sync.OE.event_id = event.id
+            ev_to_sync.OE.isRecurrence = event.recurrency
+            ev_to_sync.OE.isInstance = bool(event.recurrent_id and event.recurrent_id > 0)
+            ev_to_sync.OE.update = event.oe_update_date
+            ev_to_sync.OE.status = event.active
+            ev_to_sync.OE.synchro = att.oe_synchro_date
 
         for event in all_event_from_google.values():
             event_id = event.get('id')
@@ -390,98 +563,28 @@ class google_calendar(osv.AbstractModel):
                 event_to_synchronize[base_event_id] = {}
 
             if event_id not in event_to_synchronize[base_event_id]:
-                event_to_synchronize[base_event_id][event_id] = self.get_empty_synchro_summarize()
-
-            event_to_synchronize[base_event_id][event_id]['GG_event'] = event
-            event_to_synchronize[base_event_id][event_id]['GG_found'] = True
-            event_to_synchronize[base_event_id][event_id]['GG_isRecurrence'] = bool(event.get('recurrence',''))
-            event_to_synchronize[base_event_id][event_id]['GG_isInstance'] = bool(event.get('recurringEventId',0))  
-            event_to_synchronize[base_event_id][event_id]['GG_update'] = event.get('updated',None) # if deleted, no date without browse event
-            if event_to_synchronize[base_event_id][event_id]['GG_update']:
-                event_to_synchronize[base_event_id][event_id]['GG_update'] =event_to_synchronize[base_event_id][event_id]['GG_update'].replace('T',' ').replace('Z','')
-            event_to_synchronize[base_event_id][event_id]['GG_status'] = (event.get('status') != 'cancelled')
-
+                event_to_synchronize[base_event_id][event_id] = SyncEvent()
 
+            ev_to_sync = event_to_synchronize[base_event_id][event_id]
+            
+            ev_to_sync.GG.event = event
+            ev_to_sync.GG.found = True
+            ev_to_sync.GG.isRecurrence = bool(event.get('recurrence',''))
+            ev_to_sync.GG.isInstance = bool(event.get('recurringEventId',0))  
+            ev_to_sync.GG.update = event.get('updated',None) # if deleted, no date without browse event
+            if ev_to_sync.GG.update:
+                ev_to_sync.GG.update = ev_to_sync.GG.update.replace('T',' ').replace('Z','')
+            ev_to_sync.GG.status = (event.get('status') != 'cancelled')
+            
         ######################  
         #   PRE-PROCESSING   #
         ######################
-
         for base_event in event_to_synchronize:
             for current_event in event_to_synchronize[base_event]:
-                event = event_to_synchronize[base_event][current_event]
-
-                #If event are already in Gmail and in OpenERP 
-                if event['OE_found'] and event['GG_found']:
-                    #If the event has been deleted from one side, we delete on other side !
-                    if event['OE_status'] != event['GG_status']:
-                        event['td_action'] = "DELETE"
-                        event['td_source'] = (event['OE_status'] and "OE") or (event['GG_status'] and "GG")
-                    #If event is not deleted !     
-                    elif event['OE_status'] and event['GG_status']:
-                        if event['OE_update'].split('.')[0] != event['GG_update'].split('.')[0]:
-                            if event['OE_update'] < event['GG_update']:
-                                event['td_source'] = 'GG'
-                            elif event['OE_update'] > event['GG_update']:
-                                event['td_source'] = 'OE'
-
-
-                            if event['td_action'] != "None":
-                                if event['%s_isRecurrence' % event['td_source']]:
-                                    if event['%s_status' % event['td_source']]:
-                                         event['td_action'] = "UPDATE"
-                                         event['td_comment'] = 'Only need to update, because i\'m active'
-                                    else:
-                                        event['td_action'] = "EXCLUDE"
-                                        event['td_comment'] = 'Need to Exclude (Me = First event from recurrence) from recurrence'
-
-                                elif event['%s_isInstance' % event['td_source']]:
-                                    event['td_action'] = "UPDATE"
-                                    event['td_comment'] = 'Only need to update, because already an exclu'
-                                else:
-                                    event['td_action'] = "UPDATE"
-                                    event['td_comment'] = 'Simply Update... I\'m a single event'
-
-                        else:
-                            if not event['OE_synchro'] or event['OE_synchro'].split('.')[0] < event['OE_update'].split('.')[0]:
-                                event['td_source'] = 'OE'
-                                event['td_action'] = "UPDATE"
-                                event['td_comment'] = 'Event already updated by another user, but not synchro with my google calendar'
-
-                            else:
-                                event['td_action'] = "None"
-                                event['td_comment'] = 'Not update needed'
-                    else:
-                        event['td_action'] = "None"
-                        event['td_comment'] = "Both are already deleted"  
-                # New in openERP...  Create on create_events of synchronize function
-                elif event['OE_found'] and not event['GG_found']:
-                    #Has been deleted from gmail
-                    if event['OE_status']:
-                        event['td_source'] = 'OE'
-                        event['td_action'] = 'DELETE'
-                        event['td_comment'] = 'Removed from GOOGLE ?'
-                    else:
-                        event['td_action'] = "None"  
-                        event['td_comment'] = "Already Deleted in gmail and unlinked in OpenERP"  
-                elif event['GG_found'] and not event['OE_found']:
-                    event['td_source'] = 'GG'
-                    if not event['GG_status'] and not event['GG_isInstance']:
-                            # don't need to make something... because event has been created and deleted before the synchronization
-                            event['td_action'] = 'None'
-                            event['td_comment'] = 'Nothing to do... Create and Delete directly'
-
-                    else:
-                          if event['GG_isInstance']:
-                               if event['%s_status' % event['td_source']]:
-                                    event['td_action'] = "EXCLUDE"     
-                                    event['td_comment'] = 'Need to create the new exclu'
-                               else:
-                                    event['td_action'] = "EXCLUDE"
-                                    event['td_comment'] = 'Need to copy and Exclude'    
-                          else:
-                              event['td_action'] = "CREATE"
-                              event['td_comment'] = 'New EVENT CREATE from GMAIL'
-
+                event_to_synchronize[base_event][current_event].compute_OP()                
+            #print event_to_synchronize[base_event]
+        #print "========================================================"    
+        
         ######################
         #      DO ACTION     #
         ###################### 
@@ -489,105 +592,62 @@ class google_calendar(osv.AbstractModel):
             event_to_synchronize[base_event] = sorted(event_to_synchronize[base_event].iteritems(),key=operator.itemgetter(0))
             for current_event in event_to_synchronize[base_event]:
                 cr.commit()
-                event = current_event[1] 
-                #############
-                ### DEBUG ###   
-                ############# 
-#                 if event['td_action'] and event['td_action'] != 'None':               
-#                     print "  Real Event  %s (%s)" %  (current_event[0],event['OE_event_id'])
-#                     print "    Found       OE:%5s vs GG: %5s" % (event['OE_found'],event['GG_found'])
-#                     print "    Recurrence  OE:%5s vs GG: %5s" % (event['OE_isRecurrence'],event['GG_isRecurrence'])
-#                     print "    Instance    OE:%5s vs GG: %5s" % (event['OE_isInstance'],event['GG_isInstance'])
-#                     print "    Synchro     OE: %10s " % (event['OE_synchro']) 
-#                     print "    Update      OE: %10s " % (event['OE_update'])  
-#                     print "    Update      GG: %10s " % (event['GG_update'])
-#                     print "    Status      OE:%5s vs GG: %5s" % (event['OE_status'],event['GG_status'])
-#                     print "    Action      %s" % (event['td_action'])
-#                     print "    Source      %s" % (event['td_source'])
-#                     print "    comment     %s" % (event['td_comment'])
+                event = current_event[1] # event is an Sync Event !
+                
+                actToDo = event.OP
+                actSrc = event.OP.src
 
-                context['curr_attendee'] = event.get('OE_attendee_id',False)
+                # if not isinstance(actToDo, NothingToDo):
+                #     print event
+                
+                context['curr_attendee'] = event.OE.attendee_id
 
-                actToDo = event['td_action']
-                actSrc = event['td_source']
-                if not actToDo:
-                    raise ("#!? WHAT I NEED TO DO ????")
-                else:
-                    if actToDo == 'None':
-                        continue
-                    elif actToDo == 'CREATE':
-                        context_tmp = context.copy()
-                        context_tmp['NewMeeting'] = True
-                        if actSrc == 'GG':
-                            res = self.update_from_google(cr, uid, False, event['GG_event'], "create", context=context_tmp)
-                            event['OE_event_id'] = res
-                            meeting = calendar_event.browse(cr,uid,res,context=context)
-                            attendee_record_id = att_obj.search(cr, uid, [('partner_id','=', myPartnerID), ('event_id','=',res)], context=context)
-                            self.pool.get('calendar.attendee').write(cr,uid,attendee_record_id, {'oe_synchro_date':meeting.oe_update_date,'google_internal_event_id': event['GG_event']['id']},context=context_tmp)
-                        elif  actSrc == 'OE':
-                            raise "Should be never here, creation for OE is done before update !"
-                        #TODO Add to batch
-                    elif actToDo == 'UPDATE':
-                        if actSrc == 'GG':
-                            self.update_from_google(cr, uid, event['OE_event'], event['GG_event'], 'write', context)
-                        elif  actSrc == 'OE':
-                            self.update_to_google(cr, uid, event['OE_event'], event['GG_event'], context)
-                    elif actToDo == 'EXCLUDE' :
-                        if actSrc == 'OE':
-                            self.delete_an_event(cr,uid,current_event[0],context=context)
-                        elif  actSrc == 'GG':
-                                new_google_event_id = event['GG_event']['id'].split('_')[1]
-                                if 'T' in new_google_event_id:
-                                    new_google_event_id = new_google_event_id.replace('T','')[:-1]
+                if isinstance(actToDo, NothingToDo):
+                    continue
+                elif isinstance(actToDo, Create):
+                    context_tmp = context.copy()
+                    context_tmp['NewMeeting'] = True
+                    if actSrc == 'GG':                        
+                        res = self.update_from_google(cr, uid, False, event.GG.event, "create", context=context_tmp)
+                        event.OE.event_id = res
+                        meeting = calendar_event.browse(cr,uid,res,context=context)
+                        attendee_record_id = att_obj.search(cr, uid, [('partner_id','=', myPartnerID), ('event_id','=',res)], context=context)
+                        self.pool['calendar.attendee'].write(cr, uid, attendee_record_id, {'oe_synchro_date':meeting.oe_update_date, 'google_internal_event_id':event.GG.event['id']}, context=context_tmp)
+                    elif  actSrc == 'OE':
+                        raise "Should be never here, creation for OE is done before update !"
+                    #TODO Add to batch
+                elif isinstance(actToDo, Update):
+                    if actSrc == 'GG':                            
+                        self.update_from_google(cr, uid, event.OE.event, event.GG.event, 'write', context)
+                    elif  actSrc == 'OE':                            
+                        self.update_to_google(cr, uid, event.OE.event, event.GG.event, context)
+                elif isinstance(actToDo, Exclude):
+                    if actSrc == 'OE':
+                        self.delete_an_event(cr,uid,current_event[0],context=context)
+                    elif  actSrc == 'GG':
+                            new_google_event_id = event.GG.event['id'].split('_')[1]
+                            if 'T' in new_google_event_id:
+                                new_google_event_id = new_google_event_id.replace('T','')[:-1]
+                            else:
+                                new_google_event_id = new_google_event_id + "000000"
+
+                                if event.GG.status:
+                                    parent_event = {}
+                                    parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id ,  new_google_event_id)
+                                    res = self.update_from_google(cr, uid, parent_event, event.GG.event, "copy", context)
                                 else:
-                                    new_google_event_id = new_google_event_id + "000000"
-    
-                                    if event['GG_status']:
-                                        parent_event = {}
-                                        parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].get('OE_event_id') ,  new_google_event_id)
-                                        res = self.update_from_google(cr, uid, parent_event, event['GG_event'], "copy", context)
-                                    else:
-                                        if event_to_synchronize[base_event][0][1].get('OE_event_id'):
-                                            parent_oe_id =  event_to_synchronize[base_event][0][1].get('OE_event_id')
-                                            calendar_event.unlink(cr,uid,"%s-%s" % (parent_oe_id,new_google_event_id),unlink_level=1,context=context)
+                                    if event_to_synchronize[base_event][0][1].OE.event_id:
+                                        parent_oe_id =  event_to_synchronize[base_event][0][1].OE.event_id
+                                        calendar_event.unlink(cr,uid,"%s-%s" % (parent_oe_id,new_google_event_id),unlink_level=1,context=context)
 
-                    elif actToDo == 'DELETE':
-                        if actSrc == 'GG':
-                            self.delete_an_event(cr,uid,current_event[0],context=context)
-                        elif  actSrc == 'OE':
-                            calendar_event.unlink(cr,uid,event['OE_event_id'],unlink_level=0,context=context)
+                elif isinstance(actToDo, Delete):
+                    if actSrc == 'GG':
+                        self.delete_an_event(cr,uid,current_event[0],context=context)
+                    elif  actSrc == 'OE':
+                        calendar_event.unlink(cr,uid,event.OE.event_id,unlink_level=0,context=context)
         return True
 
-    def bind_recurring_events_to_google(self, cr, uid,  context):
-        calendar_event = self.pool['calendar.event']
-        att_obj = self.pool.get('calendar.attendee')
-        user_obj = self.pool['res.users']
-        myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
-
-        context_norecurrent = context.copy()
-        context_norecurrent['virtual_id'] = False
-        context_norecurrent['active_test'] = False
-
-        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '=', False)], context=context_norecurrent)
-        for att in att_obj.browse(cr,uid,my_att_ids,context=context):
-            if att.event_id.recurrent_id and att.event_id.recurrent_id > 0:
-                new_google_internal_event_id = False
-                source_event_record = calendar_event.browse(cr, uid, att.event_id.recurrent_id, context)
-                source_attendee_record_id = att_obj.search(cr, uid, [('partner_id','=', myPartnerID), ('event_id','=',source_event_record.id)], context=context)
-                source_attendee_record = att_obj.browse(cr, uid, source_attendee_record_id, context)
-                if source_attendee_record:
-                    source_attendee_record = source_attendee_record[0]
-
-                if att.event_id.recurrent_id_date and source_event_record.allday and source_attendee_record.google_internal_event_id:
-                    new_google_internal_event_id = source_attendee_record.google_internal_event_id +'_'+ att.event_id.recurrent_id_date.split(' ')[0].replace('-','')
-                elif event.recurrent_id_date and source_attendee_record.google_internal_event_id:
-                    new_google_internal_event_id = source_attendee_record.google_internal_event_id +'_'+ att.event_id.recurrent_id_date.replace('-','').replace(' ','T').replace(':','') + 'Z'
-
-                if new_google_internal_event_id:
-                    #TODO WARNING, NEED TO CHECK THAT EVENT and ALL instance NOT DELETE IN GMAIL BEFORE !
-                    res = self.update_recurrent_event_exclu(cr,uid,new_google_internal_event_id,source_attendee_record.google_internal_event_id,att.event_id,context=context)
-                    att_obj.write(cr, uid, [att.id], {'google_internal_event_id': new_google_internal_event_id})
-
+    
     def check_and_sync(self, cr, uid, oe_event, google_event, context):
         if datetime.strptime(oe_event.oe_update_date,"%Y-%m-%d %H:%M:%S.%f") > datetime.strptime(google_event['updated'],"%Y-%m-%dT%H:%M:%S.%fz"):
             self.update_to_google(cr, uid, oe_event, google_event, context)
@@ -595,7 +655,7 @@ class google_calendar(osv.AbstractModel):
             self.update_from_google(cr, uid, oe_event, google_event, 'write', context)
 
     def get_sequence(self,cr,uid,instance_id,context=None):
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         params = {
                  'fields': 'sequence',
@@ -613,7 +673,7 @@ class google_calendar(osv.AbstractModel):
 #################################
 
     def get_token(self,cr,uid,context=None):
-        current_user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
+        current_user = self.pool['res.users'].browse(cr,uid,uid,context=context)
 
         if datetime.strptime(current_user.google_calendar_token_validity.split('.')[0], "%Y-%m-%d %H:%M:%S") < (datetime.now() + timedelta(minutes=1)):
             self.do_refresh_token(cr,uid,context=context)
@@ -622,20 +682,20 @@ class google_calendar(osv.AbstractModel):
         return current_user.google_calendar_token
 
     def do_refresh_token(self,cr,uid,context=None):
-        current_user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
-        gs_pool = self.pool.get('google.service')
+        current_user = self.pool['res.users'].browse(cr,uid,uid,context=context)
+        gs_pool = self.pool['google.service']
 
         refresh = current_user.google_calendar_rtoken
-        all_token = gs_pool._refresh_google_token_json(cr, uid, current_user.google_calendar_rtoken,self.STR_SERVICE,context=context)
+        all_token = gs_pool._refresh_google_token_json(cr, uid, current_user.google_calendar_rtoken, self.STR_SERVICE, context=context)
 
         vals = {}
         vals['google_%s_token_validity' % self.STR_SERVICE] = datetime.now() + timedelta(seconds=all_token.get('expires_in'))
         vals['google_%s_token' % self.STR_SERVICE] = all_token.get('access_token')
 
-        self.pool.get('res.users').write(cr,SUPERUSER_ID,uid,vals,context=context)
+        self.pool['res.users'].write(cr,SUPERUSER_ID,uid,vals,context=context)
 
     def need_authorize(self,cr,uid,context=None):
-        current_user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
+        current_user = self.pool['res.users'].browse(cr,uid,uid,context=context)
         return current_user.google_calendar_rtoken == False
 
     def get_calendar_scope(self,RO=False):
@@ -643,22 +703,30 @@ class google_calendar(osv.AbstractModel):
         return 'https://www.googleapis.com/auth/calendar%s' % (readonly)
 
     def authorize_google_uri(self,cr,uid,from_url='http://www.openerp.com',context=None):
-        url = self.pool.get('google.service')._get_authorize_uri(cr,uid,from_url,self.STR_SERVICE,scope=self.get_calendar_scope(),context=context)
+        url = self.pool['google.service']._get_authorize_uri(cr,uid,from_url,self.STR_SERVICE,scope=self.get_calendar_scope(),context=context)
         return url
 
     def can_authorize_google(self,cr,uid,context=None):
         return self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager')
 
     def set_all_tokens(self,cr,uid,authorization_code,context=None):
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
         all_token = gs_pool._get_google_token_json(cr, uid, authorization_code,self.STR_SERVICE,context=context)
 
         vals = {}
         vals['google_%s_rtoken' % self.STR_SERVICE] = all_token.get('refresh_token')
         vals['google_%s_token_validity' % self.STR_SERVICE] = datetime.now() + timedelta(seconds=all_token.get('expires_in'))
         vals['google_%s_token' % self.STR_SERVICE] = all_token.get('access_token')
-        self.pool.get('res.users').write(cr,SUPERUSER_ID,uid,vals,context=context)
+        self.pool['res.users'].write(cr,SUPERUSER_ID,uid,vals,context=context)
 
+    def get_start_time_to_synchro(self, cr, uid, context=None) :
+        # WILL BE AN IR CONFIG PARAMETER - beginning from SAAS4
+        number_of_week = 13
+        return datetime.now()-timedelta(weeks=number_of_week)
+
+    def get_need_synchro_attendee(self, cr, uid, context=None):
+        # WILL BE AN IR CONFIG PARAMETER - beginning from SAAS4
+        return True
 
 class res_users(osv.Model): 
     _inherit = 'res.users'
@@ -718,7 +786,6 @@ class calendar_attendee(osv.Model):
             # If attendees are updated, we need to specify that next synchro need an action
             # Except if it come from an update_from_google
             if not context.get('curr_attendee', False) and not context.get('NewMeeting', False):
-                self.pool.get('calendar.event').write(cr, uid, ref, {'oe_update_date':datetime.now()},context)
-
-        return super(calendar_attendee, self).write(cr, uid, ids, vals, context=context)
+                self.pool['calendar.event'].write(cr, uid, ref, {'oe_update_date':datetime.now()},context)
 
+        return super(calendar_attendee, self).write(cr, uid, ids, vals, context=context)
\ No newline at end of file

From ed355097fec96008b5591dbfdd407ca96906ffc7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 18 Feb 2014 18:48:05 +0100
Subject: [PATCH 078/134] [FIX] sale: avoid resetting groups for editable mode
 at each update/upgrade (no noupdate flag on this record)

bzr revid: odo@openerp.com-20140218174805-4qak0esqpikt372q
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d0b32f188a1..fbdd2756add 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -231,7 +231,7 @@
             <field name="name">sale.order.form.editable.list</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="groups_id" eval="[(6, 0, [ref('product.group_uos'), ref('product.group_stock_packaging'), ref('sale.group_mrp_properties')])]"/>
+            <field name="groups_id" eval="[(4, ref('product.group_uos')), (4, ref('product.group_stock_packaging')), (4, ref('sale.group_mrp_properties'))]"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='order_line']/tree" position="attributes">
                     <attribute name="editable"/>

From 723b083cf5e51beec166059350466e5504db46c9 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 18 Feb 2014 19:26:43 +0100
Subject: [PATCH 079/134] [FIX] pad: partial revert of global replace of
 urllib.urlencode() by werkzeug's version, this one was useful to handle
 sequences

The API of werkzeug's version does not accept a boolean
as the second argument, so this crashes.

bzr revid: odo@openerp.com-20140218182643-a13mvcmsav195dfx
---
 addons/pad/py_etherpad/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index fce51d36890..0db607fe16f 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -1,7 +1,7 @@
 """Module to talk to EtherpadLite API."""
 
 import json
-import werkzeug.urls
+import urllib
 import urllib2
 
 
@@ -32,7 +32,7 @@ class EtherpadLiteClient:
 
         params = arguments or {}
         params.update({'apikey': self.apiKey})
-        data = werkzeug.url_encode(params, True)
+        data = urllib.urlencode(params, True)
 
         try:
             opener = urllib2.build_opener()

From bb08d9aa3a40a5c33aef8a3d3b1840a5696fc92e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 19 Feb 2014 05:23:08 +0000
Subject: [PATCH 080/134] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140219052308-a68gl450xb2r5kd8
---
 addons/account_cancel/i18n/bs.po |  10 +-
 addons/event_sale/i18n/fi.po     |  94 ++++++++++
 addons/note/i18n/fi.po           | 286 +++++++++++++++++++++++++++++++
 3 files changed, 385 insertions(+), 5 deletions(-)
 create mode 100644 addons/event_sale/i18n/fi.po
 create mode 100644 addons/note/i18n/fi.po

diff --git a/addons/account_cancel/i18n/bs.po b/addons/account_cancel/i18n/bs.po
index 7e816663ac3..633fbd8a3aa 100644
--- a/addons/account_cancel/i18n/bs.po
+++ b/addons/account_cancel/i18n/bs.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-29 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2014-02-18 16:35+0000\n"
+"Last-Translator: Boško Stojaković <bluesoft83@gmail.com>\n"
 "Language-Team: Bosnian <bs@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-28 06:28+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-02-19 05:23+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #~ msgid "Account Cancel"
 #~ msgstr "Računovodstvo - povrat"
diff --git a/addons/event_sale/i18n/fi.po b/addons/event_sale/i18n/fi.po
new file mode 100644
index 00000000000..0220b172e4d
--- /dev/null
+++ b/addons/event_sale/i18n/fi.po
@@ -0,0 +1,94 @@
+# Finnish 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-18 20:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@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-19 05:23+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "Tuote"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sales order line."
+msgstr ""
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+"Valitse tapahtuma ja se luo automaattisesti rekisteröinnin kyseiseen "
+"tapahtumaan."
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+"Valitse tapahtumatyypit, joiden avulla myyntitilausrivillä voidaan suodattaa "
+"vain tämän tyyppiset tapahtumat."
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Tapahtumatyyppi"
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr "Tapahtumaan rekisteröityminen"
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "Tapahtumatyyppi"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr "Tekninen koulutus"
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr "Rekisteröinti %s on luotu myyntitilaukselta %s."
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "Tapahtuma"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilausrivi"
diff --git a/addons/note/i18n/fi.po b/addons/note/i18n/fi.po
new file mode 100644
index 00000000000..3dd81b62b05
--- /dev/null
+++ b/addons/note/i18n/fi.po
@@ -0,0 +1,286 @@
+# Finnish 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: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2014-02-18 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@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-19 05:23+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Muistiinpanon sisältö"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Muistiipanojen vaiheet"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "Tämä viikko"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Muistiinpanon tunniste"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Muistiinpano"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Ryhmittely..."
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Seuraajat"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Tänään"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Käyttäjät"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Muistiinpanojenvaiheet"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Lukemattomat viestit"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr "Muistilaput ryhmittäin"
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Jos valittu, uudet viestit vaativat huomiosi."
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Vaiheen nimi"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "on seuraaja"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr "Huomenna"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Aktiivinen"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Muistiinpanon vaiheen omistaja."
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Ryhmät"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Vaihe"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Tunnisteen nimi"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Muistiinpanot"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Myöhemmin"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Muistiinpanon vaihe"
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Yhteenveto"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Käyttäjien vaiheet"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Muistiinpanon yhteenveto"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Vaiheet"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Viesti- ja kommunikointihistoria"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Poista"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Väri-indeksi"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Järjestysluku"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Tunnisteet"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Arkisto"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Käytä yhteistyöhön tauluja (Etherpad)"
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Sisältää viestien yhteenvedon (viestien määrän,...). Tämä yhteenveto on "
+"valmiiksi  html-muodossa, jotta se voidaan viedä kanban näkymään."
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Omistaja"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Käytetään järjestämään muistiinpanon vaiheet"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Valmis pvm."
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Tyhjää ei näytetä"

From 517ace3e414debcb2fd1fb7c0a3f46c431b46047 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 19 Feb 2014 10:07:31 +0100
Subject: [PATCH 081/134] [FIX] website: snippet: click on bullet don't change
 the slide of carousel. Fix unique id for each carousel.

bzr revid: odo@openerp.com-20140219090731-c77q63xc77osyw6w
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index e11f293b985..23c5956ebf4 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -390,7 +390,7 @@
                             website.snippet.start_animation();
 
                             self.create_overlay($target);
-                            if ($snippet.data("snippet-editor")) {
+                            if ($target.data("snippet-editor")) {
                                 $target.data("snippet-editor").drop_and_build_snippet($target);
                             }
 

From 42634d2a0d9c427b6aee477787bd3a93ec88a800 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 19 Feb 2014 10:24:02 +0100
Subject: [PATCH 082/134] [FIX] website rte: Select some text > Click on the
 link button > Start typing > The focus is still on your text, you loose what
 you selected

bzr revid: odo@openerp.com-20140219092402-bf8vkin5q07rv9bf
---
 addons/website/static/src/js/website.editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 61e792133ca..8b27c97acb3 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -994,6 +994,7 @@
         start: function () {
             var sup = this._super();
             this.$el.modal({backdrop: 'static'});
+            this.$('input:first').focus();
             return sup;
         },
         save: function () {

From 78c0fcd060a8ffed43cbc7195de25c9d7221ff2d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 19 Feb 2014 10:39:04 +0100
Subject: [PATCH 083/134] [FIX] website_blog: Change typo; Step where you have
 to change the title, it switch to the next step at the time you write
 somethingand the title is hidden by the next step

bzr revid: odo@openerp.com-20140219093904-2qefjssihoi524ip
---
 addons/website_blog/static/src/js/website.tour.blog.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index 7079c52315d..e76e793dfda 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -27,7 +27,7 @@
                     element:   '#content-menu-button',
                     placement: 'left',
                     title:     _t("Add Content"),
-                    content:   _t("Create new pages, blogs, menu items and products through the <em>'Content'</em> menu."),
+                    content:   _t("Use this <em>'Content'</em> menu to create a new blog post like any other document (page, menu, products, event, ...)."),
                     popover:   { fixed: true },
                 },
                 {
@@ -59,7 +59,7 @@
                 {
                     waitNot:   '#wrap h1[data-oe-model="blog.post"]:contains("Blog Post Title")',
                     element:   'button[data-action=snippet]',
-                    placement: 'bottom',
+                    placement: 'left',
                     title:     _t("Layout Your Blog Post"),
                     content:   _t("Use well designed building blocks to structure the content of your blog. Click 'Insert Blocks' to add new content."),
                     popover:   { fixed: true },
@@ -68,7 +68,7 @@
                     snippet:   'image-text',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Block"),
-                    content:   _t("Drag the <em>'Image-Text'</em> block and drop it in your page."),
+                    content:   _t("Drag this block and drop it in your page."),
                     popover:   { fixed: true },
                 },
                 {
@@ -82,7 +82,7 @@
                     snippet:   'text-block',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
-                    content:   _t("Drag the <em>'Text Block'</em> block and drop it below the image block."),
+                    content:   _t("Drag this block and drop it below the image block."),
                     popover:   { fixed: true },
                 },
                 {

From abb58ee3b84aae63de009a674bc9ce29bdf0c0d3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 11:11:10 +0100
Subject: [PATCH 084/134] [FIX] possibility of select being interrupted, just
 restart the call

uses EnvironmentError because not sure if socket.error or os.error

bzr revid: xmo@openerp.com-20140219101110-4g4o658vzsol7jae
---
 openerp/tests/common.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index e4183ed0392..70412067f6e 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -4,18 +4,16 @@ The module :mod:`openerp.tests.common` provides unittest2 test cases and a few
 helpers and classes to write tests.
 
 """
+import errno
 import json
 import logging
 import os
 import select
 import subprocess
-import sys
 import threading
 import time
 import unittest2
-import uuid
 import xmlrpclib
-import threading
 
 import openerp
 
@@ -197,7 +195,12 @@ class HttpCase(TransactionCase):
                 "PhantomJS tests should take less than %s seconds" % timeout)
 
             # read a byte
-            ready, _, _ = select.select([phantom.stdout], [], [], 0.5)
+            try:
+                ready, _, _ = select.select([phantom.stdout], [], [], 0.5)
+            except EnvironmentError, e:
+                if e.errno == errno.EINTR: continue
+                raise
+
             if ready:
                 s = phantom.stdout.read(1)
                 if s:

From fbead8fab1e909df393c002ad1954f0848443385 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 11:13:34 +0100
Subject: [PATCH 085/134] [IMP] style

use break instead of return so cleanup can eventually be put after loop if necessary (?)

bzr revid: xmo@openerp.com-20140219101334-n8fcmzxptrqj717a
---
 openerp/tests/common.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 70412067f6e..901f0d9857b 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -189,7 +189,7 @@ class HttpCase(TransactionCase):
         """
         t0 = time.time()
         buf = bytearray()
-        while 1:
+        while True:
             # timeout
             self.assertLess(time.time(), t0 + timeout,
                 "PhantomJS tests should take less than %s seconds" % timeout)
@@ -203,16 +203,15 @@ class HttpCase(TransactionCase):
 
             if ready:
                 s = phantom.stdout.read(1)
-                if s:
-                    buf.append(s)
-                else:
+                if not s:
                     break
+                buf.append(s)
 
             # process lines
             if '\n' in buf:
                 line, buf = buf.split('\n', 1)
                 if line == "ok":
-                    return
+                    break
                 if line.startswith("error"):
                     # 'error $message' or use generic message
                     self.fail(line[6:] or "phantomjs test failed")

From 1f71463cfc1261415d2c42044b396aa173688498 Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Wed, 19 Feb 2014 16:22:46 +0530
Subject: [PATCH 086/134] [IMP] extract subtype ordering from
 lp:~openerp-dev/openobject-addons/trunk-visibility-hr_holidays-darshan.

bzr revid: dka@tinyerp.com-20140219105246-qmm78w81erhfvhlc
---
 addons/mail/mail_message_subtype.py         | 2 ++
 addons/mail/mail_thread.py                  | 3 ++-
 addons/mail/static/src/css/mail.css         | 4 ++++
 addons/mail/static/src/js/mail_followers.js | 8 ++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index bef6e427c3b..427f3396c35 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -50,7 +50,9 @@ class mail_message_subtype(osv.osv):
             help="Model the subtype applies to. If False, this subtype applies to all models."),
         'default': fields.boolean('Default',
             help="Activated by default when subscribing."),
+        'sequence': fields.integer('Sequence'),
     }
+    _order = 'sequence'
     _defaults = {
         'default': True,
     }
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9a8adee31c3..94c6bbca788 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from collections import OrderedDict
 import base64
 import datetime
 import dateutil
@@ -186,7 +187,7 @@ class mail_thread(osv.AbstractModel):
         # find current model subtypes, add them to a dictionary
         subtype_obj = self.pool.get('mail.message.subtype')
         subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
-        subtype_dict = dict((subtype.name, dict(default=subtype.default, followed=False, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
+        subtype_dict = OrderedDict((subtype.name, OrderedDict(default=subtype.default, followed=False, parent_model=subtype.parent_id.res_model, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index bfae7571a9c..fee73a7e08d 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -757,4 +757,8 @@
 .openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item {
     visibility: visible;
 }
+.subtype-border {
+    border-bottom: 1px solid #dddddd;
+    margin-bottom: 10px;
+}
 
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 938d6a01f6d..2986b700560 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -267,7 +267,15 @@ openerp_mail_followers = function(session, mail) {
             var records = data[id].message_subtype_data;
             this.records_length = $.map(records, function(value, index) { return index; }).length;
             if (this.records_length > 1) { self.display_followers(); }
+            var old_model = '';
             _(records).each(function (record, record_name) {
+                if (old_model != record.parent_model){
+                    if (old_model != ''){
+                        var index = $($list).find('.oe_subtype').length;
+                        $($($list).find('.oe_subtype')[index-1]).addClass('subtype-border');
+                    }
+                    old_model = record.parent_model;
+                }
                 record.name = record_name;
                 record.followed = record.followed || undefined;
                 $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);

From a09b0db51dcfb80cb28a54eace0c0d90fbf5fc1b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 19 Feb 2014 11:55:02 +0100
Subject: [PATCH 087/134] [FIX] website: Select some text > Click on the link
 button > Select Page textfield and start typing (e.g. comm) > There is a lot
 of noise here; Dsiplaying create page for existing page

bzr revid: odo@openerp.com-20140219105502-jg8f2i1gpz5vdarf
---
 addons/website/models/website.py               | 9 +++++----
 addons/website/static/src/js/website.editor.js | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 3dcb028fed2..99187fc7bad 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -175,10 +175,8 @@ class website(osv.osv):
         return '%s.%s' % (module, slugify(name, max_length=50))
 
     def page_exists(self, cr, uid, ids, name, module='website', context=None):
-        page = self.page_for_name(cr, uid, ids, name, module=module, context=context)
-
         try:
-           self.pool["ir.model.data"].get_object_reference(cr, uid, module, name)
+           return self.pool["ir.model.data"].get_object_reference(cr, uid, module, name)
         except:
             return False
 
@@ -348,6 +346,7 @@ class website(osv.osv):
         router = request.httprequest.app.get_db_router(request.db)
         # Force enumeration to be performed as public user
         uid = self.get_public_user(cr, uid, context=context)
+        url_list = []
         for rule in router.iter_rules():
             if not self.rule_is_enumerable(rule):
                 continue
@@ -369,7 +368,9 @@ class website(osv.osv):
             for values in generated:
                 domain_part, url = rule.build(values, append_unknown=False)
                 page = {'name': url, 'url': url}
-
+                if url in url_list:
+                    continue
+                url_list.append(url)
                 if not filtered and query_string and not self.page_matches(cr, uid, page, query_string, context=context):
                     continue
                 yield page
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 8b27c97acb3..dc82c0c17b9 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1034,10 +1034,13 @@
         },
         start: function () {
             var self = this;
+            var last;
             this.$('#link-page').select2({
                 minimumInputLength: 1,
                 placeholder: _t("New or existing page"),
                 query: function (q) {
+                    if (q.term == last) return;
+                    last = q.term;
                     $.when(
                         self.page_exists(q.term),
                         self.fetch_pages(q.term)

From 4821fad601dd60ad1b7eb8a9a37bbe253c7141f4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 19 Feb 2014 12:03:35 +0100
Subject: [PATCH 088/134] [FIX] auth_signup: fix route when mode signup or
 reset

Do not call super web_login when in mode reset or signup mode, as this is non-sense.

bzr revid: odo@openerp.com-20140219110335-lz7ti2r1dxst36ty
---
 addons/auth_signup/controllers/main.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 16baa97d018..08b67108c3f 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -36,7 +36,10 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
     def web_login(self, *args, **kw):
         mode = request.params.get('mode')
         qcontext = request.params.copy()
-        super_response = super(AuthSignup, self).web_login(*args, **kw)
+        super_response = None
+        if request.httprequest.method != 'POST' or mode not in ('reset', 'signup'):
+            # Default behavior is to try to login,  which in reset or signup mode in a non-sense.
+            super_response = super(AuthSignup, self).web_login(*args, **kw)
         response = webmain.render_bootstrap_template(request.session.db, 'auth_signup.signup', qcontext, lazy=True)
         if isinstance(super_response, LazyResponse):
             response.params['values'].update(super_response.params['values'])
@@ -78,8 +81,8 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
                     res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login)
                     qcontext['message'] = _("An email has been sent with credentials to reset your password")
                     response.params['template'] = 'web.login'
-                except Exception:
-                    qcontext['error'] = _("Could not reset your password")
+                except Exception, e:
+                    qcontext['error'] = exception_to_unicode(e) or _("Could not reset your password")
                     _logger.exception('error when resetting password')
             else:
                 values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password'))

From b3722090cc0647f3b6a11708d50299defed8ad13 Mon Sep 17 00:00:00 2001
From: "Darshan Kalola (OpenERP)" <dka@tinyerp.com>
Date: Wed, 19 Feb 2014 16:38:45 +0530
Subject: [PATCH 089/134] [IMP]add help in sequence field.

bzr revid: dka@tinyerp.com-20140219110845-r8r90mzkw73otdx1
---
 addons/mail/mail_message_subtype.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index 427f3396c35..a15cf1a79a7 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -50,7 +50,7 @@ class mail_message_subtype(osv.osv):
             help="Model the subtype applies to. If False, this subtype applies to all models."),
         'default': fields.boolean('Default',
             help="Activated by default when subscribing."),
-        'sequence': fields.integer('Sequence'),
+        'sequence': fields.integer('Sequence', help="Used to order subtypes."),
     }
     _order = 'sequence'
     _defaults = {

From f9993774f1ebe197fb72cce66a209c902d3dd9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 19 Feb 2014 12:13:30 +0100
Subject: [PATCH 090/134] [IMP] note: user_id owner field added in model,
 allowing to tune a bit the access rules, notably about reading and creation.
 This allows by the way to remove the hack about the operation in context when
 subscribing users on a document. The new rules on create and read now include
 user_id, aka the owner of a note can always create (default value) and read
 its notes. Also removed an unnecessary field (current_partner_id), as it was
 buggy and unnecessary; view udpated accordingly.

[IMP] mail: removed a hack introduced in saas-3 with the current orm operation
in context to by-pass some access rules when subscribing someone on a document.

bzr revid: tde@openerp.com-20140219111330-l3hw5324hvuikpjc
---
 addons/mail/mail_thread.py       | 17 +++++--------
 addons/note/note.py              |  9 ++-----
 addons/note/note_view.xml        |  3 +--
 addons/note/security/ir.rule.xml | 41 +++++++++++++++++++-------------
 4 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9a8adee31c3..eea95a6c5ed 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -348,11 +348,7 @@ class mail_thread(osv.AbstractModel):
             message_follower_ids = values.get('message_follower_ids') or []  # webclient can send None or False
             message_follower_ids.append([4, pid])
             values['message_follower_ids'] = message_follower_ids
-            # add operation to ignore access rule checking for subscription
-            context_operation = dict(context, operation='create')
-        else:
-            context_operation = context
-        thread_id = super(mail_thread, self).create(cr, uid, values, context=context_operation)
+        thread_id = super(mail_thread, self).create(cr, uid, values, context=context)
 
         # automatic logging unless asked not to (mainly for various testing purpose)
         if not context.get('mail_create_nolog'):
@@ -1558,12 +1554,11 @@ class mail_thread(osv.AbstractModel):
 
         user_pid = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         if set(partner_ids) == set([user_pid]):
-            if context.get('operation', '') != 'create':
-                try:
-                    self.check_access_rights(cr, uid, 'read')
-                    self.check_access_rule(cr, uid, ids, 'read')
-                except (osv.except_osv, orm.except_orm):
-                    return False
+            try:
+                self.check_access_rights(cr, uid, 'read')
+                self.check_access_rule(cr, uid, ids, 'read')
+            except (osv.except_osv, orm.except_orm):
+                return False
         else:
             self.check_access_rights(cr, uid, 'write')
             self.check_access_rule(cr, uid, ids, 'write')
diff --git a/addons/note/note.py b/addons/note/note.py
index 00c67c37191..7f03f43b36a 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -72,12 +72,6 @@ class note_note(osv.osv):
     def onclick_note_not_done(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'open': True}, context=context)
 
-    #used for undisplay the follower if it's the current user
-    def _get_my_current_partner(self, cr, uid, ids, name, args, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        pid = user.partner_id and user.partner_id.id or False
-        return dict.fromkeys(ids, pid)
-
     #return the default stage for the uid user
     def _get_default_stage_id(self,cr,uid,context=None):
         ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)], context=context)
@@ -101,6 +95,7 @@ class note_note(osv.osv):
         'name': fields.function(_get_note_first_line, 
             string='Note Summary', 
             type='text', store=True),
+        'user_id': fields.many2one('res.users', 'Owner'),
         'memo': fields.html('Note Content'),
         'sequence': fields.integer('Sequence'),
         'stage_id': fields.function(_get_stage_per_user, 
@@ -113,9 +108,9 @@ class note_note(osv.osv):
         'date_done': fields.date('Date done'),
         'color': fields.integer('Color Index'),
         'tag_ids' : fields.many2many('note.tag','note_tags_rel','note_id','tag_id','Tags'),
-        'current_partner_id' : fields.function(_get_my_current_partner, type="many2one", relation='res.partner', string="Owner"),
     }
     _defaults = {
+        'user_id': lambda self, cr, uid, ctx=None: uid,
         'open' : 1,
         'stage_id' : _get_default_stage_id,
     }
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index f3b9e4669c7..35d4ce316fc 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -49,7 +49,6 @@
           <field name="open"/>
           <field name="memo"/>
           <field name="date_done"/>
-          <field name="current_partner_id"/>
           <field name="message_follower_ids"/>
           <field name="tag_ids"/>
           <templates>
@@ -82,7 +81,7 @@
                 <field name="tag_ids"/>
                 <div class="oe_right">
                   <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
-                    <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
+                    <img t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
                   </t>
                 </div>
                 <div class="oe_clear"></div>
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index 2c6e9f3bc7f..2b9645cc9d4 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -1,23 +1,30 @@
 <?xml version="1.0"?>
 <openerp>
 <data>
-  <record id="note_note_rule_global" model="ir.rule">
-    <field name="name">Only followers can access a sticky notes</field>
-    <field ref="model_note_note" name="model_id"/>
-    <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
-    <field eval="True" name="global"/>
-    <field eval="1" name="perm_unlink"/>
-    <field eval="0" name="perm_write"/>
-    <field eval="1" name="perm_read"/>
-    <field eval="0" name="perm_create"/>
-  </record>
+    <record id="note_note_rule_global" model="ir.rule">
+        <field name="name">Only followers can access a sticky notes</field>
+        <field name="model_id" ref="model_note_note"/>
+        <field name="domain_force">['|', ('user_id', '=', user.id), ('message_follower_ids', '=', user.partner_id.id)]</field>
+        <field name="global" eval="True"/>
+        <field name="perm_create" eval="False"/>
+        <field name="perm_unlink" eval="False"/>
+    </record>
+
+    <record id="note_note_create_unlink_global" model="ir.rule">
+        <field name="name">note: create / unlink: responsible</field>
+        <field name="model_id" ref="model_note_note"/>
+        <field name="domain_force">[('user_id', '=', user.id)]</field>
+        <field name="global" eval="True"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_read" eval="False"/>
+    </record>
+
+    <record id="note_stage_rule_global" model="ir.rule">
+        <field name="name">Each user have his stage name</field>
+        <field name="model_id" ref="model_note_stage"/>
+        <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
+        <field name="global" eval="True"/>
+    </record>
 
-  <record id="note_stage_rule_global" model="ir.rule">
-    <field name="name">Each user have his stage name</field>
-    <field ref="model_note_stage" name="model_id"/>
-    <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
-    <field eval="True" name="global"/>
-  </record>
 </data>
 </openerp>
-

From 035ad1331618fa0d7c7b6881ded0d09ad2d19a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 19 Feb 2014 13:35:05 +0100
Subject: [PATCH 091/134] [FIX] mass_mailing: still fixing issues due to
 read_group update done in saas-3. Indeed it now returns a date or datetime
 depending on the field type whether before saas-3 only a date was returned.

bzr revid: odo@openerp.com-20140219123505-7lvstb3x9mdv0gr0
---
 addons/mass_mailing/mass_mailing.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 516e68db3d9..e7583d8e739 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -168,8 +168,10 @@ class MassMailing(osv.Model):
                            'tooltip': (date_begin + relativedelta.relativedelta(days=i)).strftime('%d %B %Y'),
                            } for i in range(0, self._period_number)]
         group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        field_col_info = obj._all_columns.get(groupby_field.split(':')[0])
+        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if field_col_info.column._type == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
         for group in group_obj:
-            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT).date()
+            group_begin_date = datetime.strptime(group['__domain'][0][2], pattern).date()
             timedelta = relativedelta.relativedelta(group_begin_date, date_begin)
             section_result[timedelta.days] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
         return section_result

From d5cb5c2a14d9945714e09ebc733ed06a4b673126 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 13:38:50 +0100
Subject: [PATCH 092/134] [FIX] correctly display JS stack frames in phantomjs
 runner

altered reporting to handle and deserialize JSON if JSON-deserializable. Can't
just send multiple lines as driver currently does not handle multiple lines of
message... Yeah turns out having a JSON-based protocol between phantomjs and
the python runner allowed multiple lines in messages, who'd have thought eh?

bzr revid: xmo@openerp.com-20140219123850-0h0upb3x33j7leqk
---
 openerp/tests/common.py      | 11 +++++++++--
 openerp/tests/phantomtest.js | 38 ++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 901f0d9857b..4bc13b61dbb 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -210,11 +210,18 @@ class HttpCase(TransactionCase):
             # process lines
             if '\n' in buf:
                 line, buf = buf.split('\n', 1)
+
+                line = str(line)
                 if line == "ok":
                     break
                 if line.startswith("error"):
-                    # 'error $message' or use generic message
-                    self.fail(line[6:] or "phantomjs test failed")
+                    line_ = line[6:]
+                    try: line_ = json.loads(line_)
+                    except ValueError: pass
+                    self.fail(line_ or "phantomjs test failed")
+
+                try: line = json.loads(line)
+                except ValueError: pass
                 _logger.info("phantomjs: %s", line)
 
     def phantom_run(self, cmd, timeout):
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index 669bd00ec42..1cdfeabce76 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -10,10 +10,8 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
         } else {
             if(!condition) {
                 var message = timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms";
-                console.log(message);
                 console.log("Waiting for " + ready);
-                console.log("error");
-                phantom.exit(1);
+                error(message);
             } else {
                 clearInterval(interval);
                 callback();
@@ -22,6 +20,10 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
     }, 250);
 }
 
+function error(message) {
+    console.log('error', message);
+    phantom.exit(1);
+}
 function PhantomTest() {
     var self = this;
     this.options = JSON.parse(phantom.args[phantom.args.length-1]);
@@ -30,15 +32,6 @@ function PhantomTest() {
     this.origin = 'http://localhost';
     this.origin += this.options.port ? ':' + this.options.port : '';
 
-    // ----------------------------------------------------
-    // test reporting
-    // ----------------------------------------------------
-    this.error = function(message) {
-        console.log(message);
-        console.log("error");
-        phantom.exit(1);
-    };
-
     // ----------------------------------------------------
     // configure phantom and page
     // ----------------------------------------------------
@@ -50,10 +43,21 @@ function PhantomTest() {
     this.page = require('webpage').create();
     this.page.viewportSize = { width: 1366, height: 768 };
     this.page.onError = function(message, trace) {
-        self.error(message + " " + trace);
+        var msg = [message];
+        if (trace && trace.length) {
+            msg.push.apply(msg, trace.map(function (frame) {
+                var result = [' at ', frame.file, ':', frame.line];
+                if (frame.function) {
+                    result.push(' (in ', frame.function, ')');
+                }
+                return result.join('');
+            }));
+            msg.push('(leaf frame on top)')
+        }
+        error(JSON.stringify(msg.join('\n')));
     };
     this.page.onAlert = function(message) {
-        self.error(message);
+        error(message);
     };
     this.page.onConsoleMessage = function(message) {
         console.log(message);
@@ -79,7 +83,7 @@ function PhantomTest() {
                 if(!found) {
                     console.log('Injecting', src, 'needed for', need);
                     if(!self.page.injectJs(src)) {
-                        self.error("Cannot inject " + src);
+                        error("Cannot inject " + src);
                     }
                 }
             }
@@ -90,7 +94,7 @@ function PhantomTest() {
             var message = ("Timeout\nhref: " + window.location.href
                 + "\nreferrer: " + document.referrer
                 + "\n\n" + document.body.innerHTML).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
-            self.error(message);
+            error(message);
         });
     }, self.timeout);
 
@@ -109,7 +113,7 @@ function PhantomTest() {
         var url = self.origin + url_path;
         self.page.open(url, function(status) {
             if (status !== 'success') {
-                self.error("failed to load " + url)
+                error("failed to load " + url)
             } else {
                 console.log('loaded', url, status);
                 // process ready

From 86a537e6a757a57294b268981d6ac97fd4dd28ff Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 15:02:41 +0100
Subject: [PATCH 093/134] [FIX] typo method name

bzr revid: xmo@openerp.com-20140219140241-5p6u4t818mkuo74w
---
 addons/website/tests/test_ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 244e991442c..b4b58a10b3b 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -12,7 +12,7 @@ inject = [
 ]
 
 class TestUi(openerp.tests.HttpCase):
-    def test_01_pubic_homepage(self):
+    def test_01_public_homepage(self):
         self.phantom_js("/", "console.log('ok')", "openerp.website.snippet")
 
     @unittest2.expectedFailure

From a77097ce606d64164d7e9be1cddb2ede84233ad6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 15:21:15 +0100
Subject: [PATCH 094/134] [REM] broken and PITA test_02_public_login_logout

* / fails to load, it turns out Tour is undefined because unlogged home does
  not load bootstrap-tour

* after injecting bootstrap-tour, redirects to /login (to log in), tries to
  inject tour again except this time ``openerp.website`` is completely empty
  (although it is present on the page), no idea why.

removed test because whatever, if enable-test-fix-tour is ever rewritten and
fixed it may reappear.

bzr revid: xmo@openerp.com-20140219142115-5kpu5uvzpkwnt1ef
---
 addons/website/tests/test_ui.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index b4b58a10b3b..d9c3107558f 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -1,24 +1,11 @@
 import os
 
-import unittest2
-
 import openerp.tests
 
-relfile = lambda *args: os.path.join(os.path.dirname(__file__), *args)
-
-inject = [
-    ('openerp.website.Tour', relfile('../static/src/js/website.tour.js')),
-    ('openerp.website.Tour.LoginEdit', relfile('../static/src/js/website.tour.test.admin.js')),
-]
-
 class TestUi(openerp.tests.HttpCase):
     def test_01_public_homepage(self):
         self.phantom_js("/", "console.log('ok')", "openerp.website.snippet")
 
-    @unittest2.expectedFailure
-    def test_02_public_login_logout(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", inject=inject)
-
     def test_03_admin_homepage(self):
         self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin')
 

From 55a9e5af2723817b7d85ea9d5cb49d50fba5e7c3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 15:47:54 +0100
Subject: [PATCH 095/134] [FIX] re-enable website_sale tests because they pass
 so whatever

bzr revid: xmo@openerp.com-20140219144754-52dz24qmnjq72zor
---
 addons/website/tests/test_ui.py      | 2 --
 addons/website_sale/tests/test_ui.py | 2 --
 2 files changed, 4 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index d9c3107558f..c9dd80ff885 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -1,5 +1,3 @@
-import os
-
 import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 94af9d99846..da4dacd58f2 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -10,11 +10,9 @@ inject = [
 ]
 
 class TestUi(openerp.tests.HttpCase):
-    @unittest2.expectedFailure
     def test_01_admin_shop_tour(self):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
-    @unittest2.expectedFailure
     def test_02_admin_checkout(self):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
 

From fc780d5a811d313e40772903dc81f0cc2319bd48 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 19 Feb 2014 16:53:03 +0100
Subject: [PATCH 096/134] [FIX] actually retry select on EINTR

Turns out select has its own select.error which does *not* subclass
EnvironmentError (or OSError or IOError) and does *not* have a .errno
attribute. So use the correct exception, might just work better than using
a completely different one with no relation.

bzr revid: xmo@openerp.com-20140219155303-sgz7m3gnzr2bmani
---
 openerp/tests/common.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 4bc13b61dbb..2f10371a8f0 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -197,8 +197,12 @@ class HttpCase(TransactionCase):
             # read a byte
             try:
                 ready, _, _ = select.select([phantom.stdout], [], [], 0.5)
-            except EnvironmentError, e:
-                if e.errno == errno.EINTR: continue
+            except select.error, e:
+                # In Python 2, select.error has no relation to IOError or
+                # OSError, and no errno/strerror/filename, only a pair of
+                # unnamed arguments (matching errno and strerror)
+                err, _ = e.args
+                if err == errno.EINTR: continue
                 raise
 
             if ready:

From 50849309d17db9a3d5fd0bcd9d546843aee7d3ea Mon Sep 17 00:00:00 2001
From: "jke@openerp.com" <>
Date: Wed, 19 Feb 2014 17:31:34 +0100
Subject: [PATCH 097/134] [FIX] web_calendar: correct timezone handling when
 creating new events

bzr revid: odo@openerp.com-20140219163134-dzmx34yffnithn30
---
 addons/web/static/src/js/views.js                 | 7 ++++++-
 addons/web_calendar/static/src/js/web_calendar.js | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index cb0d130e305..689b4d947fb 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -600,6 +600,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                     action_views_ids : views_ids
                 }, self.flags, self.flags[view.view_type] || {}, view.options || {})
             });
+            
             views_ids[view.view_type] = view.view_id;
         });
         if (this.flags.views_switcher === false) {
@@ -607,7 +608,11 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         }
         // If no default view defined, switch to the first one in sequence
         var default_view = this.flags.default_view || this.views_src[0].view_type;
-        return this.switch_mode(default_view);
+  
+
+        return this.switch_mode(default_view, null, this.flags[default_view] && this.flags[default_view].options);
+      
+        
     },
     switch_mode: function(view_type, no_store, view_options) {
         var self = this;
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 6a7b19b2e23..77bf3fb7337 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -652,8 +652,8 @@ openerp.web_calendar = function(instance) {
                 }
                 if (this.all_day) {
                     event_end = (new Date(event_end.getTime())).addDays(1);
-                    date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate());
-                    date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate());
+                    date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),12);
+                    date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),12);
                 }
                 else {
                     date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);
@@ -666,7 +666,6 @@ openerp.web_calendar = function(instance) {
                                 
             }
             else {
-                
                 data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]);
                 if (this.date_stop) {
                     data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]);
@@ -1070,6 +1069,8 @@ openerp.web_calendar = function(instance) {
             return infos;
         },
         slow_create: function(data) {
+            //if all day, we could reset time to display 00:00:00
+            
             var self = this;
             var def = $.Deferred();
             var defaults = {};

From 2c4466258dc2eeb89017eda3ade1e1b9b19fd9de Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 19 Feb 2014 17:32:13 +0100
Subject: [PATCH 098/134] [FIX] web: do not float buttons in header bar to the
 left. This make them invisible if they are the sole children of the header.

bzr revid: odo@openerp.com-20140219163213-8z4fxio7p7nzesf0
---
 addons/web/static/src/css/base.css  | 3 +--
 addons/web/static/src/css/base.sass | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 81ca509f4f9..567091708a4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -2034,7 +2034,6 @@
 }
 .openerp .oe_form > :not(.oe_form_nosheet) header .oe_button {
   margin: 3px 2px 1px;
-  float: left;
 }
 .openerp .oe_form > :not(.oe_form_nosheet) header .oe_button:first-child {
   margin-left: 6px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f51e806d1ee..2844d094599 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1649,7 +1649,6 @@ $sheet-padding: 16px
             float: right
         .oe_button
             margin: 3px 2px 1px
-            float: left
             &:first-child
                 margin-left: 6px
 

From bb89e548668b88a231a364d106a2cd6e57442ae6 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 19 Feb 2014 17:32:37 +0100
Subject: [PATCH 099/134] [FIX] web: set default: handle false values + correct
 display of selection fields

bzr revid: odo@openerp.com-20140219163237-ns5zbzxvtrr3a6ed
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0a30d4db649..599664d14de 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1030,8 +1030,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     open_defaults_dialog: function () {
         var self = this;
         var display = function (field, value) {
+            if (!value) { return value; }
             if (field instanceof instance.web.form.FieldSelection) {
-                return _(field.values).find(function (option) {
+                return _(field.get('values')).find(function (option) {
                     return option[0] === value;
                 })[1];
             } else if (field instanceof instance.web.form.FieldMany2One) {

From d24b67ed3ec568e3eb5b4296519e28a2721314b2 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 20 Feb 2014 05:14:43 +0000
Subject: [PATCH 100/134] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140220051443-j5eojea132bflo3e
---
 addons/account/i18n/fr_CA.po   | 10849 +++++++++++++++++++++++++++++++
 addons/web_linkedin/i18n/fi.po |   137 +
 2 files changed, 10986 insertions(+)
 create mode 100644 addons/account/i18n/fr_CA.po
 create mode 100644 addons/web_linkedin/i18n/fi.po

diff --git a/addons/account/i18n/fr_CA.po b/addons/account/i18n/fr_CA.po
new file mode 100644
index 00000000000..9833ae4ae74
--- /dev/null
+++ b/addons/account/i18n/fr_CA.po
@@ -0,0 +1,10849 @@
+# French (Canada) 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: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2014-02-19 17:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <fr_CA@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-20 05:14+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.fiscal.position.account:0
+msgid ""
+"An account fiscal position could be defined only once time on same accounts."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:369
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#: code:addons/account/account_move_line.py:1210
+#, python-format
+msgid "Bad Account!"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Error!\n"
+"You cannot create recursive account templates."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
+#, python-format
+msgid "Reconcile"
+msgstr "Réconciliation"
+
+#. module: account
+#: field:account.bank.statement,name:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+#: xsl:account.transfer:0
+#: field:cash.box.in,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1058
+#: code:addons/account/account_invoice.py:820
+#: code:addons/account/account_invoice.py:823
+#: code:addons/account/account_invoice.py:826
+#: code:addons/account/account_invoice.py:1545
+#: code:addons/account/account_move_line.py:98
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#: code:addons/account/account_move_line.py:864
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3197
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid ""
+"You have to set the 'End  of Year Entries Journal' for this Fiscal Year "
+"which is set after generating opening entries from 'Generate Opening "
+"Entries'."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a fiscal period.\n"
+"              </p><p>\n"
+"                An accounting period typically is a month or a quarter. It\n"
+"                usually corresponds to the periods of the tax declaration.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,code_digits:0
+msgid "No. of digits to use for account code"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_analytic_collected_id:0
+msgid ""
+"Set the analytic account that will be used by default on the invoice tax "
+"lines for invoices. Leave empty if you don't want to use an analytic account "
+"on the invoice tax lines by default."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income_view1
+msgid "Income View"
+msgstr ""
+
+#. module: account
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_sequence_next:0
+msgid "Next credit note number"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_voucher:0
+msgid ""
+"This includes all the basic requirements of voucher entries for bank, cash, "
+"sales, purchase, expense, contra, etc.\n"
+"                This installs the module account_voucher."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+msgid "Manual Recurring"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a customer refund. \n"
+"              </p><p>\n"
+"                A refund is a document that credits an invoice completely "
+"or\n"
+"                partially.\n"
+"              </p><p>\n"
+"                Instead of manually creating a customer refund, you\n"
+"                can generate it directly from the related customer invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_budget:0
+msgid "Budget management"
+msgstr ""
+
+#. module: account
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_multi_currency:0
+msgid "Allow multi currencies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:77
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_analytic_accounting:0
+msgid "Allows you to use the analytic accounting."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_asset:0
+msgid ""
+"This allows you to manage the assets owned by a company or a person.\n"
+"                It keeps track of the depreciation occurred on those assets, "
+"and creates account move for those depreciation lines.\n"
+"                This installs the module account_asset. If you do not check "
+"this box, you will be able to do invoicing & payments,\n"
+"                but not accounting (Journal Items, Chart of Accounts, ...)"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
+#, python-format
+msgid "Period :"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,chart_template_id:0
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,tax_calculation_rounding_method:0
+msgid ""
+"If you select 'Round per line' : for each tax, the tax amount will first be "
+"computed and rounded for each PO/SO/invoice line and then these rounded "
+"amounts will be summed, leading to the total amount for that tax. If you "
+"select 'Round globally': for each tax, the tax amount will be computed for "
+"each PO/SO/invoice line, then these amounts will be summed and eventually "
+"this total tax amount will be rounded. If you sell with tax included, you "
+"should choose 'Round per line' because you certainly want the sum of your "
+"tax-included line subtotals to be equal to the total amount with taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Available Coins"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: view:account.journal:0
+#: field:account.journal.cashbox.line,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence of this line when displaying the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
+#, python-format
+msgid "Nothing to reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,decimal_precision:0
+msgid "Decimal precision on journal entries"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,period:0
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified journal does not have any account move entries in draft state for "
+"this period."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly."
+msgstr ""
+
+#. module: account
+#: field:account.journal,profit_account_id:0
+msgid "Profit Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1156
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3201
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1591
+#, python-format
+msgid "Cannot create move with currency different from .."
+msgstr ""
+
+#. module: account
+#: model:email.template,report_name:account.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on a centralized journal."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_analytic_paid_id:0
+msgid ""
+"Set the analytic account that will be used by default on the invoice tax "
+"lines for refunds. Leave empty if you don't want to use an analytic account "
+"on the invoice tax lines by default."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:297
+#: code:addons/account/report/account_partner_ledger.py:272
+#, python-format
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Configure your company bank accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1361
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#, python-format
+msgid ""
+"Cannot %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only refund this invoice."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/project/wizard/project_account_analytic_line.py:47
+#: model:ir.model,name:account.model_project_account_analytic_line
+#, python-format
+msgid "Analytic Entries by line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:826
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:851
+#, python-format
+msgid "Entry is already reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency differs from the "
+"company currency."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account Code and Name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_manual_reconcile
+msgid ""
+"<p>\n"
+"                    No journal items found.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1677
+#, python-format
+msgid ""
+"You cannot unreconcile journal items if they has been generated by the       "
+"                                                  opening/closing fiscal "
+"year process."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_chart
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_journal_id:0
+msgid "Purchase journal"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,supplier_invoice_number:0
+msgid "The reference of this invoice as provided by the supplier."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_liability
+#: model:account.financial.report,name:account.account_financial_report_liability0
+#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:899
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code, this field will contain the "
+"basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Features"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_bank_statement.py:424
+#: code:addons/account/account_invoice.py:77
+#: code:addons/account/account_invoice.py:775
+#: code:addons/account/account_move_line.py:195
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add an account.\n"
+"              </p><p>\n"
+"                When doing multi-currency transactions, you may loose or "
+"gain\n"
+"                some amount due to changes of exchange rate. This menu "
+"gives\n"
+"                you a forecast of the Gain or Loss you'd realized if those\n"
+"                transactions were ended today. Only for accounts having a\n"
+"                secondary currency set.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr ""
+
+#. module: account
+#: field:account.journal,with_last_closing_balance:0
+msgid "Opening With Last Closing Balance"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+msgid ""
+"Check this box if you don't want any tax related to this tax code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Refund "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
+#: model:ir.ui.menu,name:account.journal_cash_move_lines
+msgid "Cash Registers"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_journal_id:0
+msgid "Sale refund journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cash log.\n"
+"              </p><p>\n"
+"                A Cash Register allows you to manage cash entries in your "
+"cash\n"
+"                journals. This feature provides an easy way to follow up "
+"cash\n"
+"                payments on a daily basis. You can enter the coins that are "
+"in\n"
+"                your cash box, and then post entries when money comes in or\n"
+"                goes out of the cash box.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
+#: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3092
+#, python-format
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Refunds"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: help:account.account,foreign_balance:0
+msgid ""
+"Total amount (in Secondary currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The amount expressed in the secondary currency must be positif when journal "
+"item are debit and negatif when journal item are credit."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: view:account.tax.code:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.config.settings,chart_template_id:0
+msgid "Template"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.action_account_entries_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
+msgid "Entries Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.account,level:0
+#: field:account.financial.report,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_financial_report.py:70
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+msgid "Profit and Loss"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_reconcile_select
+#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to Close"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_sequence_prefix:0
+msgid "Invoice sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the status will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' "
+"status."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:612
+#: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1483
+#, python-format
+msgid ""
+"There is no default debit account defined \n"
+"on journal \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:10
+#, python-format
+msgid ""
+"There is nothing to reconcile. All invoices and payments\n"
+"                    have been reconciled, your partner balance is clean."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,code_digits:0
+#: field:account.config.settings,code_digits:0
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_report_common.py:164
+#, python-format
+msgid "Not implemented."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: help:account.fiscal.position,active:0
+msgid ""
+"By unchecking the active field, you may hide a fiscal position without "
+"deleting it."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,company_footer:0
+msgid "Bank accounts footer preview"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Advanced Settings"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new account type.\n"
+"              </p><p>\n"
+"                An account type is used to determine how an account is used "
+"in\n"
+"                each journal. The deferral method of an account type "
+"determines\n"
+"                the process for the annual closing. Reports such as the "
+"Balance\n"
+"                Sheet and the Profit and Loss report use the category\n"
+"                (profit/loss or balance sheet).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: code:addons/account/account_invoice.py:1157
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.move,balance:0
+msgid "balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_analytic_accounting:0
+msgid "Analytic accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: help:res.company,tax_calculation_rounding_method:0
+msgid ""
+"If you select 'Round per Line' : for each tax, the tax amount will first be "
+"computed and rounded for each PO/SO/invoice line and then these rounded "
+"amounts will be summed, leading to the total amount for that tax. If you "
+"select 'Round Globally': for each tax, the tax amount will be computed for "
+"each PO/SO/invoice line, then these amounts will be summed and eventually "
+"this total tax amount will be rounded. If you sell with tax included, you "
+"should choose 'Round per line' because you certainly want the sum of your "
+"tax-included line subtotals to be equal to the total amount with taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+#: view:report.account_type.sales:0
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+#, python-format
+msgid ""
+"The journal must have centralized counterpart without the Skipping draft "
+"state option checked."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:854
+#, python-format
+msgid "Some entries are already reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"Select a configuration package to setup automatically your\n"
+"                        taxes and chart of accounts."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_payment:0
+msgid "Manage payment orders"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Duration"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,last_closing_balance:0
+msgid "Last Closing Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the tax declaration."
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_check_writing:0
+msgid "Pay your suppliers by check"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_ids:0
+#: field:account.invoice,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a tax declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1071
+#: code:addons/account/account.py:1073
+#: code:addons/account/account.py:1116
+#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1356
+#: code:addons/account/account.py:1363
+#: code:addons/account/account.py:1587
+#: code:addons/account/account.py:1591
+#: code:addons/account/account.py:1677
+#: code:addons/account/account.py:2358
+#: code:addons/account/account.py:2678
+#: code:addons/account/account.py:3465
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:419
+#: code:addons/account/account_cash_statement.py:256
+#: code:addons/account/account_cash_statement.py:300
+#: code:addons/account/account_invoice.py:899
+#: code:addons/account/account_invoice.py:933
+#: code:addons/account/account_invoice.py:1124
+#: code:addons/account/account_move_line.py:579
+#: code:addons/account/account_move_line.py:828
+#: code:addons/account/account_move_line.py:851
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/account_move_line.py:1121
+#: code:addons/account/account_move_line.py:1156
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_invoice_refund.py:109
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
+#: code:addons/account/wizard/account_use_model.py:44
+#: code:addons/account/wizard/pos_box.py:31
+#: code:addons/account/wizard/pos_box.py:35
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to record a new supplier invoice.\n"
+"              </p><p>\n"
+"                You can control the invoice from your supplier according to\n"
+"                what you purchased or received. OpenERP can also generate\n"
+"                draft invoices automatically from purchase orders or "
+"receipts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1058
+#, python-format
+msgid ""
+"This journal already contains items for this period, therefore you cannot "
+"modify its company field."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a bank statement.\n"
+"              </p><p>\n"
+"                A bank statement is a summary of all financial transactions\n"
+"                occurring over a given period of time on a bank account. "
+"You\n"
+"                should receive this periodicaly from your bank.\n"
+"              </p><p>\n"
+"                OpenERP allows you to reconcile a statement line directly "
+"with\n"
+"                the related sale or puchase invoices.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,currency_id:0
+msgid "Default company currency"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+#: field:account.move.line,move_id:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.invoice.tax,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:406
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_follower_ids:0
+#: field:account.invoice,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:656
+#, python-format
+msgid ""
+"You cannot change the type of account to '%s' type as it contains journal "
+"items!"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscal Year"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
+#, python-format
+msgid "Journal :"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.fiscal.position.tax:0
+msgid "A tax fiscal position could be defined only once time on same taxes."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.actions.act_window,name:account.action_account_config
+msgid "Configure Accounting"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
+#, python-format
+msgid "Good job!"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_asset:0
+msgid "Assets management"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:274
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,cash_control:0
+msgid ""
+"If you want the journal should be control at opening/closing, check this "
+"option"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_sequence_next:0
+msgid "Next supplier credit note number"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:256
+#, python-format
+msgid "You do not have rights to open this %s journal !"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_supplier_inv_check_total
+msgid "Check Total on supplier invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,default_sale_tax:0
+msgid "This sale tax will be assigned by default on new products."
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: report:account.central.journal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: view:account.config.settings:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.open.closed.fiscalyear,fyear_id:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:653
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type as it "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account Based on this Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:933
+#, python-format
+msgid ""
+"Cannot create the invoice.\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. In order to avoid rounding "
+"issues, the latest line of your payment term must be of type 'balance'."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:478
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:579
+#, python-format
+msgid "You cannot create journal items on a closed account %s %s."
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Account Properties"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin. Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3202
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a journal entry.\n"
+"              </p><p>\n"
+"                A journal entry consists of several journal items, each of\n"
+"                which is either a debit or a credit transaction.\n"
+"              </p><p>\n"
+"                OpenERP automatically creates one journal entry per "
+"accounting\n"
+"                document: invoice, refund, supplier payment, bank "
+"statements,\n"
+"                etc. So, you should record journal entries manually "
+"only/mainly\n"
+"                for miscellaneous operations.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.conf_account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.line,account_tax_id:0
+#: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,default_purchase_tax:0
+#: field:account.config.settings,purchase_tax:0
+msgid "Default purchase tax"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3541
+#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_invoice.py:507
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:624
+#: code:addons/account/account_invoice.py:632
+#: code:addons/account/account_invoice.py:657
+#: code:addons/account/account_move_line.py:536
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:434
+#, python-format
+msgid "Statement %s confirmed, journal items were created."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,price_average:0
+#: field:account.invoice.report,user_currency_price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:res.partner.bank:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Purchase Tax"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to start a new fiscal year.\n"
+"              </p><p>\n"
+"                Define your company's financial year according to your "
+"needs. A\n"
+"                financial year is a period at the end of which a company's\n"
+"                accounts are made up (usually 12 months). The financial year "
+"is\n"
+"                usually referred to by the date in which it ends. For "
+"example,\n"
+"                if a company's financial year ends November 30, 2011, then\n"
+"                everything between December 1, 2010 and November 30, 2011\n"
+"                would be referred to as FY 2011.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:accounting.report:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_unread:0
+#: field:account.invoice,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1071
+#, python-format
+msgid "You should choose the periods that belong to the same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You cannot delete a posted journal entry \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Accounting Period"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_journal_id:0
+msgid "Sale journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_invoice.py:775
+#: code:addons/account/account_move_line.py:195
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:781
+#, python-format
+msgid ""
+"This journal already contains items, therefore you cannot modify its company "
+"field."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:409
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,only_one_chart_template:0
+msgid "Only One Chart Template Available"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_summary:0
+#: field:account.invoice,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,date_stop:0
+msgid "End date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report_pl
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:823
+#, python-format
+msgid ""
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:431
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: view:account.installer:0
+msgid "Date Range"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2678
+#, python-format
+msgid "There is no parent code for the template account."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,code_digits:0
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_accountant:0
+msgid ""
+"Full accounting features: journals, legal statements, chart of accounts, etc."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3460
+#: code:addons/account/account_bank.py:94
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_chart_of_accounts:0
+msgid "Company has a chart of accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Account Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+msgid ""
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.config.settings:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+msgid "Account Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1016
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralized journal. Uncheck the "
+"centralized counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1465
+#, python-format
+msgid "No Partner Defined !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.cashbox.line,subtotal_opening:0
+msgid "Opening Subtotal"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You cannot create journal items with a secondary currency without recording "
+"both 'currency' and 'amount currency' field."
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,paypal_account:0
+msgid ""
+"Paypal account (email) for receiving online payments (credit card, etc.) If "
+"you set a paypal account, the customer  will be able to pay your invoices or "
+"quotations with a button \"Pay with  Paypal\" in automated emails or through "
+"the OpenERP portal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:536
+#, python-format
+msgid ""
+"Cannot find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Journals/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,date_start:0
+msgid "Start date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"You will be able to edit and validate this\n"
+"                                    credit note directly or keep it draft,\n"
+"                                    waiting for the document to be issued "
+"by\n"
+"                                    your supplier/customer."
+msgstr ""
+
+#. module: account
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:98
+#, python-format
+msgid ""
+"You have not supplied enough arguments to compute the initial balance, "
+"please select a period and a journal in the context."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,expects_chart_of_accounts:0
+msgid "This company has its own chart of accounts"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: view:cash.box.out:0
+#: model:ir.actions.act_window,name:account.action_cash_box_out
+msgid "Take Money Out"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a customer invoice.\n"
+"              </p><p>\n"
+"                OpenERP's electronic invoicing allows to ease and fasten "
+"the\n"
+"                collection of customer payments. Your customer receives the\n"
+"                invoice by email and he can pay online and/or import it\n"
+"                in his own system.\n"
+"              </p><p>\n"
+"                The discussions with your customer are automatically "
+"displayed at\n"
+"                the bottom of each invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Options"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period Length (days)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1363
+#, python-format
+msgid ""
+"You cannot modify a posted entry of this journal.\n"
+"First you should set the journal to allow cancelling entries."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Continue"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:930
+#, python-format
+msgid ""
+"There is no fiscal year defined for this date.\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,default_purchase_tax:0
+msgid "This purchase tax will be assigned by default on new products."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: view:account.config.settings:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_cashbox_line
+msgid "account.journal.cashbox.line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.line:0
+#: selection:account.balance.report,filter:0
+#: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice.refund,date:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.line,date:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: field:analytic.entries.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2358
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:res.groups,name:account.group_proforma_invoices
+msgid "Pro-forma Invoices"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_check_supplier_invoice_total:0
+msgid "Check the total of supplier invoices"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The status is 'Draft'. At the end of "
+"monthly period it is in 'Done' status."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries cannot be found."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,complete_tax_set:0
+msgid "Complete set of taxes"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:115
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: field:res.company,expects_chart_of_accounts:0
+msgid "Expects a Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_ids:0
+#: help:account.invoice,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any tax related to this tax Code to appear "
+"on invoices."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#, python-format
+msgid "You cannot use an inactive account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_account_config
+#: model:ir.ui.menu,name:account.menu_board_account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:573
+#: code:addons/account/wizard/account_invoice_refund.py:146
+#, python-format
+msgid "Insufficient Data!"
+msgstr ""
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Accounting & Finance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_analytic_collected_id:0
+msgid "Invoice Tax Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid ""
+"If you put \"%(year)s\" in the prefix, it will be replaced by the current "
+"year."
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,decimal_precision:0
+msgid ""
+"As an example, a decimal precision of 2 will allow journal entries  like: "
+"9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
+"0.0231 EUR."
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.account.type,name:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:424
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid ""
+"Error!\n"
+"You cannot create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Error!\n"
+"The duration of the Period(s) is/are invalid."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:668
+#, python-format
+msgid "You cannot change the code of account which contains journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_sequence_prefix:0
+msgid "Supplier invoice sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:610
+#: code:addons/account/account_invoice.py:625
+#, python-format
+msgid ""
+"Cannot find a chart of account, you should create one from Settings\\"
+"Configuration\\Accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:191
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.cashbox.line,subtotal_closing:0
+msgid "Closing Subtotal"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:864
+#, python-format
+msgid ""
+"You have to provide an account for the write off/exchange difference entry."
+msgstr ""
+
+#. module: account
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,opening_reconciliation:0
+msgid "Opening Entries Reconciliation"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
+#, python-format
+msgid "Last Reconciliation:"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,state:0
+msgid "Balanced"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:115
+#, python-format
+msgid ""
+"There is currently no company without chart of account. The wizard will "
+"therefore not be executed."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Set Your Accounting Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:122
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+#: view:account.chart.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+msgid "Journal Items to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,currency_id:0
+msgid "Currency as per company's country."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Computation"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Error!\n"
+"You cannot create an account which has parent account of different company."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:658
+#, python-format
+msgid ""
+"Cannot find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Journals\\Journals."
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3204
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Children/Sub Taxes"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: view:cash.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_proforma_invoices:0
+msgid "Allows you to put invoices in pro-forma state."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Unit Of Currency Definition"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column on report if the currency differs from the "
+"company currency."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3394
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "My Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Sale Tax"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The status is 'Draft'. If a report is "
+"printed it comes to 'Printed' status. When all transactions are done, it "
+"comes in 'Done' status."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3205
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,expects_chart_of_accounts:0
+msgid "Check this box if this company is a legal entity."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.conf_account_type_chk
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.config.settings:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.period.close:0
+#: view:account.state.open:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:cash.box.in:0
+#: view:cash.box.out:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "or"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Supplier Refund, otherwise a "
+"Partner bank account number."
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_collected_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"invoices. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:890
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
+
+#. module: account
+#: selection:res.company,tax_calculation_rounding_method:0
+msgid "Round Globally"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:922
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The encoded total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.journal,cash_control:0
+msgid "Cash Control"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:301
+#, python-format
+msgid "There is no %s Account on the journal %s."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_manager
+msgid "Financial Manager"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,details_ids:0
+#: view:account.journal:0
+msgid "CashBox Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_accountant:0
+msgid ""
+"If you do not check this box, you will be able to do invoicing & payments, "
+"but not accounting (Journal Items, Chart of  Accounts, ...)"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+#: field:accounting.report,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1454
+#, python-format
+msgid ""
+"Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: help:account.cashbox.line,number_opening:0
+msgid "Opening Unit Numbers"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: view:report.account.sales:0
+#: field:report.account.sales,name:0
+#: view:report.account_type.sales:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,sent:0
+msgid "It indicates that the invoice has been sent."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid ""
+"Cannot create an automatic sequence for this piece.\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Pro Forma Invoice "
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.ui.menu,name:account.menu_account_report_bs
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:188
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:508
+#, python-format
+msgid ""
+"Cannot find a chart of accounts for this company, you should create one."
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.config.settings:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+#: field:cash.box.in,amount:0
+#: field:cash.box.out,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_summary:0
+#: help:account.invoice,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were fully reconciled last "
+"time. It differs from the date of the last reconciliation made for this "
+"partner, as here we depict the fact that nothing more was to be reconciled "
+"at this date. This can be achieved in 2 ways: either the last debit/credit "
+"entry was reconciled, either the user pressed the button \"Fully "
+"Reconciled\" in the manual reconciliation process"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Recompute taxes and total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1116
+#, python-format
+msgid "You cannot modify/delete a journal with entries for this period."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,supplier_invoice_number:0
+msgid "Supplier Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "You can not add/modify entries in a closed period %s of journal %s."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset_view1
+msgid "Asset View"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be treated."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Tax Codes"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Refund "
+msgstr ""
+
+#. module: account
+#: view:cash.box.in:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,opening_details_ids:0
+msgid "Opening Cashbox Lines"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: selection:res.company,tax_calculation_rounding_method:0
+msgid "Round per Line"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#, python-format
+msgid "You must set a period length greater than 0."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Refund"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "You cannot change the tax, you should remove and recreate lines."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal.report,analytic_account_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1117
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:879
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.config.settings:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:390
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:95
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:276
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Select Company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add an account.\n"
+"              </p><p>\n"
+"                An account is part of a ledger allowing your company\n"
+"                to register all kinds of debit and credit transactions.\n"
+"                Companies present their annual accounts in two main parts: "
+"the\n"
+"                balance sheet and the income statement (profit and loss\n"
+"                account). The annual accounts of a company are required by "
+"law\n"
+"                to disclose a certain amount of information.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(update)"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2334
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes Included Prices"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: field:account.journal,loss_account_id:0
+msgid "Loss Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the status "
+"'Unposted', but you can set the option to skip that status on the related "
+"journal. In that case, they will behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' status."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1357
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_multi_currency:0
+msgid "Allows you multi currency environment"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Models"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1124
+#, python-format
+msgid ""
+"You cannot cancel an invoice which is partially paid. You need to "
+"unreconcile related payment entries first."
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a refund you received from a supplier.\n"
+"              </p><p>\n"
+"                Instead of creating the supplier refund manually, you can "
+"generate\n"
+"                refunds and reconcile them directly from the related "
+"supplier invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,complete_tax_set:0
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Bank & Cash"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.chart,fiscalyear:0
+#: view:account.fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.config.settings:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.period.close:0
+#: view:account.state.open:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:cash.box.in:0
+#: view:cash.box.out:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:633
+#, python-format
+msgid "Invoice line account's company and invoice's compnay does not match."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:69
+#, python-format
+msgid "Custom"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: field:account.journal,cashbox_line_ids:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+#: model:account.account.type,name:account.conf_account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: field:account.journal,internal_account_id:0
+msgid "Internal Transfers Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:32
+#, python-format
+msgid "Please check that the field 'Journal' is set on the Bank Statement"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,tax_calculation_rounding_method:0
+msgid "Round globally"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3465
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,difference:0
+msgid "Difference"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:414
+#, python-format
+msgid ""
+"There is no opening/closing period defined, please create one to set the "
+"initial balance."
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"higher ones. The order is important if you have a tax that has several tax "
+"children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1453
+#: code:addons/account/account.py:1482
+#: code:addons/account/account.py:1489
+#: code:addons/account/account_invoice.py:1015
+#: code:addons/account/account_move_line.py:1005
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Discard"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_default_company:0
+msgid "Has default company"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year: "
+"it will simply replace the old opening entries with the new ones."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:686
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1160
+#: selection:report.invoice.created,type:0
+#, python-format
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.financial.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.invoice.line,uos_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2%."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "Tax Name must be unique per company!"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:142
+#: code:addons/account/account_move_line.py:955
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You cannot provide a secondary currency if it is the same than the company "
+"one."
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:190
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
+msgstr ""
+
+#. module: account
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:189
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Total Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:636
+#, python-format
+msgid "You cannot remove an account that contains journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "You must set a start date."
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:147
+#, python-format
+msgid "No period found on the invoice."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:67
+#, python-format
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.reconcile:0
+msgid "You can only reconcile journal items with the same partner."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
+#, python-format
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+msgstr ""
+
+#. module: account
+#: help:account.move,to_check:0
+msgid ""
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2304
+#, python-format
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_voucher:0
+msgid "Manage customer payments"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid ""
+"Error!\n"
+"The start date of a fiscal year must precede its end date."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Misc"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, python-format
+msgid ""
+"You cannot validate a non-balanced entry.\n"
+"Make sure you have configured payment terms properly.\n"
+"The latest payment term line should be of the \"Balance\" type."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error!\n"
+"You cannot define children to an account with internal type different of "
+"\"View\"."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account Currency"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:458
+#, python-format
+msgid ""
+"You can not delete an invoice which is not cancelled. You should refund it "
+"instead."
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,closing_details_ids:0
+msgid "Closing Cashbox Lines"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_tax_rate:0
+msgid "Purchase tax (%)"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_account_charts_modules
+msgid "Chart Templates"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_proforma_invoices:0
+msgid "Allow pro-forma invoices"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_cash_box_out
+msgid "cash.box.out"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,currency_id:0
+msgid "Main currency of the company."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reports
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/account_move_line.py:780
+#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,tax_calculation_rounding_method:0
+msgid "Tax calculation rounding method"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Use this option if you want to cancel an invoice you should not\n"
+"                                    have issued. The credit note will be "
+"created, validated and reconciled\n"
+"                                    with the invoice. You will not be able "
+"to modify the credit note."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1490
+#, python-format
+msgid ""
+"There is no default credit account defined \n"
+"on journal \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"<p>\n"
+"                Click to add a new analytic account.\n"
+"              </p><p>\n"
+"                The normal chart of accounts has a structure defined by the\n"
+"                legal requirement of the country. The analytic chart of\n"
+"                accounts structure should reflect your own business needs "
+"in\n"
+"                term of costs/revenues reporting.\n"
+"              </p><p>\n"
+"                They are usually structured by contracts, projects, products "
+"or\n"
+"                departements. Most of the OpenERP operations (invoices,\n"
+"                timesheets, expenses, etc) generate analytic entries on the\n"
+"                related account.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3206
+#, python-format
+msgid "OPEJ"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3193
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for credit note and period will "
+"be chosen accordingly!"
+msgstr ""
+
+#. module: account
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3541
+#, python-format
+msgid ""
+"You have to set a code for the bank account defined on the selected chart of "
+"accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1541
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:820
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
+
+#. module: account
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_sequence_prefix:0
+msgid "Credit note sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.config.settings:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+#: code:addons/account/account.py:3092
+#, python-format
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
+#: field:account.invoice.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,paypal_account:0
+msgid "Paypal account"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid ""
+"Error!\n"
+"You cannot create recursive accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_cash_box_in
+msgid "cash.box.in"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,period:0
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_move_reconciliation.js:89
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: field:account.financial.report,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "Profit"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation Transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: field:account.installer,charts:0
+msgid "Accounting Package"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
+#: code:addons/account/account.py:1031
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_unread:0
+#: help:account.invoice,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account
+#: field:res.company,tax_calculation_rounding_method:0
+msgid "Tax Calculation Rounding Method"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open for Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:901
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:382
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:420
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: help:account.move.reconcile,opening_reconciliation:0
+msgid ""
+"Is this reconciliation produced by the opening of a new fiscal year ?."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1465
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,residual:0
+#: field:account.invoice.report,user_currency_residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Cash Control"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "No Fiscal Year Defined for This Company"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3196
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+#, python-format
+msgid "Please define a sequence on the journal."
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_followup:0
+msgid ""
+"This allows to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"                This installs the module account_followup."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:account.treasury.report,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:158
+#, python-format
+msgid "Select a starting and an ending period."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_sequence_next:0
+msgid "Next invoice number"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid ""
+"This wizard will remove the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: view:account.config.settings:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation Result"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Use this option if you want to cancel an invoice and create a new\n"
+"                                    one. The credit note will be created, "
+"validated and reconciled\n"
+"                                    with the current invoice. A new, draft, "
+"invoice will be created \n"
+"                                    so that you can edit it."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:381
+#, python-format
+msgid "Unknown Error!"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_type_ids:0
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1210
+#, python-format
+msgid ""
+"You cannot use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a journal.\n"
+"              </p><p>\n"
+"                A journal is used to record transactions of all accounting "
+"data\n"
+"                related to the day-to-day business.\n"
+"              </p><p>\n"
+"                A typical company may use one journal per payment method "
+"(cash,\n"
+"                bank accounts, checks), one purchase journal, one sale "
+"journal\n"
+"                and one for miscellaneous information.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3391
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3194
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,debit_credit:0
+msgid ""
+"This option allows you to get more details about the way your balances are "
+"computed. Because it is space consuming, we do not allow to use it while "
+"doing a comparison."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid "This account will be used to value outgoing stock using cost price."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.common.report:0
+#: view:account.invoice:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure?"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_tax_rate:0
+msgid "Sales tax (%)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new recurring entry.\n"
+"              </p><p>\n"
+"                A recurring entry occurs on a recurrent basis from a "
+"specific\n"
+"                date, i.e. corresponding to the signature of a contract or "
+"an\n"
+"                agreement with a customer or a supplier. You can create "
+"such\n"
+"                entries to automate the postings in the system.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:829
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_check_writing:0
+msgid ""
+"This allows you to check writing and printing.\n"
+"                This installs the module account_check_writing."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
+#: field:wizard.multi.charts.accounts,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the credit note that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2334
+#, python-format
+msgid "Wrong model !"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+#: view:account.tax.template:0
+msgid "Tax Template"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1121
+#, python-format
+msgid ""
+"You cannot do this modification on a reconciled entry. You can just change "
+"some non legal fields or you must unreconcile first.\n"
+"%s."
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,bank_statement_id:0
+#: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3198
+#, python-format
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_is_follower:0
+#: field:account.invoice,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error!\n"
+"You cannot select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_fiscal_year:0
+msgid "Company has a fiscal year"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:634
+#, python-format
+msgid "You cannot deactivate an account that contains journal items."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.move.line,amount_residual:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Unit of Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3195
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid ""
+"Once draft invoices are confirmed, you will not be able\n"
+"                        to modify them. The invoices will receive a unique\n"
+"                        number and journal items will be created in your "
+"chart\n"
+"                        of accounts."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_journal_id:0
+msgid "Purchase refund journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Configure Accounting Data"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:901
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:36
+#, python-format
+msgid ""
+"Please check that the field 'Internal Transfers Account' is set on the "
+"payment method '%s'."
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3203
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:analytic.entries.report:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma status,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' status is used when user create invoice,a invoice number is "
+"generated.Its in open status till user does not pay invoice.             \n"
+"* The 'Paid' status is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' status is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability_view1
+msgid "Liability View"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Ask Refund"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_sequence_prefix:0
+msgid "Supplier credit note sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_payment:0
+msgid ""
+"This allows you to create and manage your payment orders, with purposes to\n"
+"                    * serve as base for an easy plug-in of various automated "
+"payment mechanisms, and\n"
+"                    * provide a more efficient way to manage invoice "
+"payments.\n"
+"                This installs the module account_payment."
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries."
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,residual:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number_closing:0
+#: field:account.cashbox.line,number_opening:0
+msgid "Number of Units"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:478
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Date / Period"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Error!\n"
+"The period is invalid. Either some periods are overlapping or the period's "
+"dates are not matching the scope of the fiscal year."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "There is nothing due with this customer."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_paid_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"refunds. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Source"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the information related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,sent:0
+msgid "Sent"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,default_sale_tax:0
+#: field:account.config.settings,sale_tax:0
+msgid "Default sale tax"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1587
+#, python-format
+msgid "Cannot create moves for different companies."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense_view1
+msgid "Expense View"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1502
+#, python-format
+msgid " Centralisation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_start:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: view:cash.box.in:0
+#: model:ir.actions.act_window,name:account.action_cash_box_in
+msgid "Put Money In"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:922
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure your Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_items
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_tax_code_items
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1119
+#, python-format
+msgid ""
+"You cannot do this modification on a confirmed entry. You can just change "
+"some non legal fields or you must unconfirm the journal entry first.\n"
+"%s."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_budget:0
+msgid ""
+"This allows accountants to manage analytic and crossovered budgets.\n"
+"                Once the master budgets and the budgets are defined,\n"
+"                the project managers can set the planned amount on each "
+"analytic account.\n"
+"                This installs the module account_budget."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Invoice "
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1073
+#, python-format
+msgid "Start period should precede then end period."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+#: field:account.invoice.report,user_currency_price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: field:account.config.settings,period:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: view:account.print.journal:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: model:ir.actions.act_window,name:account.action_account_period
+#: model:ir.ui.menu,name:account.menu_action_account_period
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: field:account.account,tax_ids:0
+#: view:account.account.template:0
+#: field:account.account.template,tax_ids:0
+#: view:account.chart.template:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Sale/Purchase Journal(s) defined."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.generate,date:0
+msgid "Generate Entries Before"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_stop:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
+
+#. module: account
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid "This account will be used to value outgoing stock using sale price."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: field:account.invoice,amount_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:109
+#, python-format
+msgid "Cannot %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_analytic_paid_id:0
+msgid "Refund Tax Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
+#: field:account.config.settings,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
+#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
+#: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,description:0
+#: field:cash.box.in,name:0
+#: field:cash.box.out,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:56
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "Unable to change tax!"
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer. The tool search can also be used to personalise your Invoices "
+"reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_followup:0
+msgid "Manage customer payment follow-ups"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1158
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+#, python-format
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:783
+#, python-format
+msgid "Already reconciled."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: help:account.move,balance:0
+msgid ""
+"This is a field only used for internal purpose and shouldn't be displayed"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:99
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.analytic.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by Type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1546
+#, python-format
+msgid ""
+"The selected unit of measure is not compatible with the unit of measure of "
+"the product."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new tax code.\n"
+"              </p><p>\n"
+"                Depending on the country, a tax code is usually a cell to "
+"fill\n"
+"                in your legal tax statement. OpenERP allows you to define "
+"the\n"
+"                tax structure and each tax computation will be registered "
+"in\n"
+"                one or several tax code.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Select the period and the journal you want to fill.\n"
+"              </p><p>\n"
+"                This view can be used by accountants in order to quickly "
+"record\n"
+"                entries in OpenERP. If you want to record a supplier "
+"invoice,\n"
+"                start by recording the line of the expense account. OpenERP\n"
+"                will propose to you automatically the Tax related to this\n"
+"                account and the counterpart \"Account Payable\".\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Install more chart templates"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:1159
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:641
+#, python-format
+msgid ""
+"You cannot remove/deactivate an account which is set on a customer or "
+"supplier."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and accounts used for the partner."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:573
+#, python-format
+msgid "The payment term of supplier does not have a payment term line."
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_move_reconciliation.js:74
+#: code:addons/account/static/src/js/account_move_reconciliation.js:80
+#, python-format
+msgid "Never"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "Loss"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: help:account.cashbox.line,number_closing:0
+msgid "Closing Unit Numbers"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_central_journal
+#: model:ir.model,name:account.model_account_central_journal
+msgid "Account Central Journal"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,tax_calculation_rounding_method:0
+msgid "Round per line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
diff --git a/addons/web_linkedin/i18n/fi.po b/addons/web_linkedin/i18n/fi.po
new file mode 100644
index 00000000000..5b1b3039361
--- /dev/null
+++ b/addons/web_linkedin/i18n/fi.po
@@ -0,0 +1,137 @@
+# Finnish 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2014-02-19 10:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@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-20 05:14+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr ""
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:331
+#, python-format
+msgid "No results found"
+msgstr "Haku ei tuottanut tuloksia."
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:62
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr "Kirjaudun LinkedIn:iin."
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "Henkilöt"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "tuntematon"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:263
+#, python-format
+msgid "LinkedIn search"
+msgstr "LinkedIn-haku"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:31
+#, python-format
+msgid ""
+"LinkedIn access was not enabled on this server.\n"
+"            Please ask your administrator to configure it in Settings > "
+"Configuration > Sales > Social Network Integration."
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:60
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn ei ole vahvistettu käyttöön"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr "Lisää uusi hakemus ja täytä lomake:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "Siirry tähän URL-osoitteeseen:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "Ohjelmointityökalu on JavaScript"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript API Toimialue:"

From 24111f62f953db1009421e3104810c7d9b232ea9 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Thu, 20 Feb 2014 09:58:37 +0100
Subject: [PATCH 101/134] [FIX] domain added to see only your own contact in
 model calendar.contact

bzr revid: jke@openerp.com-20140220085837-t2ut7qo4yi4lr4a8
---
 addons/calendar/contacts.py       | 2 +-
 addons/calendar/contacts_view.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/calendar/contacts.py b/addons/calendar/contacts.py
index 2cd42b55d37..dc964554629 100644
--- a/addons/calendar/contacts.py
+++ b/addons/calendar/contacts.py
@@ -26,7 +26,7 @@ class calendar_contacts(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users','Me'),
-        'partner_id': fields.many2one('res.partner','Employee',required=True, domain=[('customer','=',True)]),
+        'partner_id': fields.many2one('res.partner','Employee',required=True, domain=[]),
         'active':fields.boolean('active'),        
      }
     _defaults = {
diff --git a/addons/calendar/contacts_view.xml b/addons/calendar/contacts_view.xml
index cf685f88d00..1d014fea1f6 100644
--- a/addons/calendar/contacts_view.xml
+++ b/addons/calendar/contacts_view.xml
@@ -16,6 +16,7 @@
             <field name="res_model">calendar.contacts</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="view_calendar_contacts" />
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">

From d4e62ca71305988e8046fb58ddb3c44ca081972a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 20 Feb 2014 11:00:36 +0100
Subject: [PATCH 102/134] [IMP] ir.actions.act_window: make `multi` field
 visible in form view + improve label/desc

bzr revid: odo@openerp.com-20140220100036-uu0hg9lqhpc257pr
---
 openerp/addons/base/ir/ir_actions.py  | 2 +-
 openerp/addons/base/ir/ir_actions.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 21639aba2e0..2e95b3ee306 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -270,7 +270,7 @@ class ir_actions_act_window(osv.osv):
         'filter': fields.boolean('Filter'),
         'auto_search':fields.boolean('Auto Search'),
         'search_view' : fields.function(_search_view, type='text', string='Search View'),
-        'multi': fields.boolean('Action on Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view"),
+        'multi': fields.boolean('Restrict to lists', help="If checked and the action is bound to a model, it will only appear in the More menu on list views"),
     }
 
     _defaults = {
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 7e6c1f9be4b..7ac0252da80 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -180,6 +180,7 @@
                                     <field name="auto_refresh"/>
                                     <field name="auto_search"/>
                                     <field name="filter"/>
+                                    <field name="multi"/>
                                 </group>
                             </group>
                             <group string="Help">

From bc86fdc614f6eb0b0db20437b9364af82665fee4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 20 Feb 2014 11:33:45 +0100
Subject: [PATCH 103/134] [IMP] Cursor.savepoint

time.time doesn't guarantee sub-second precision.

Use a uuid1 instead (lower anonymity but higher isolation than uuid4
especially in distributed systems, and we don't care about anonimity for
savepoint names from application servers).

Quote name so first character can be a digit.

bzr revid: xmo@openerp.com-20140220103345-xistzxy17r8j87hf
---
 openerp/sql_db.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index fb214fa068b..694ae02b3d9 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -31,6 +31,7 @@ from contextlib import contextmanager
 from functools import wraps
 import logging
 import time
+import uuid
 import psycopg2.extensions
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_REPEATABLE_READ
 from psycopg2.pool import PoolError
@@ -350,13 +351,13 @@ class Cursor(object):
     @check
     def savepoint(self):
         """context manager entering in a new savepoint"""
-        name = hex(int(time.time() * 1000))[1:]
-        self.execute("SAVEPOINT %s" % (name,))
+        name = uuid.uuid1().hex
+        self.execute('SAVEPOINT "%s"' % name)
         try:
             yield
-            self.execute('RELEASE SAVEPOINT %s' % (name,))
-        except Exception:
-            self.execute('ROLLBACK TO SAVEPOINT %s' % (name,))
+            self.execute('RELEASE SAVEPOINT "%s"' % name)
+        except:
+            self.execute('ROLLBACK TO SAVEPOINT "%s"' % name)
             raise
 
     @check

From a1bfa323895a46168ba433275642569092f2bd0c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 20 Feb 2014 11:33:55 +0100
Subject: [PATCH 104/134] [IMP] website ace editor: display more informations
 about errors when the user save views

bzr revid: chm@openerp.com-20140220103355-0us8k76yrrodqs0u
---
 addons/website/static/src/js/website.ace.js | 91 +++++++++++++++++----
 addons/website/static/src/xml/website.xml   |  2 +-
 2 files changed, 77 insertions(+), 16 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 514969fc4c2..ed7037e903c 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -41,12 +41,14 @@
         isWellFormed: function () {
             if (document.implementation.createDocument) {
                 var dom = new DOMParser().parseFromString(this.xml, "text/xml");
-                return dom.getElementsByTagName("parsererror").length === 0;
+                var error = dom.getElementsByTagName("parsererror");
+                return error.length === 0 || error;
             } else if (window.ActiveXObject) {
                 // TODO test in IE
                 var msDom = new ActiveXObject("Microsoft.XMLDOM");
                 msDom.async = false;
-                return !msDom.loadXML(this.xml);
+                msDom.loadXML(this.xml);
+                return !msDom.parseError.errorCode || msDom.parseError.reason + "\nline " + msDom.parseError.line;
             }
             return true;
         },
@@ -256,28 +258,35 @@
             }), function (session) {
                 return session.isDirty;
             });
-            var requests = _.map(toSave, self.saveView);
+            this.clearError();
+            var requests = _.map(toSave, function (session) {
+                return self.saveView(session);
+            });
             $.when.apply($, requests).then(function () {
                 self.reloadPage.call(self);
-            }).fail(function (source, error) {
-                var message = _.isString(error) ? error
-                    : (error && error.data && error.data.arguments && error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
-                    : (error && error.message) ? error.message
-                    : "Unexpected error";
-                self.displayError.call(self, message);
+            }).fail(function (source, session, error) {
+                self.displayError.call(self, source, session, error);
             });
         },
         saveView: function (session) {
+            var self = this;
             var xml = new website.ace.XmlDocument(session.text);
-            if (xml.isWellFormed()) {
-                return openerp.jsonRpc('/web/dataset/call', 'call', {
+            var isWellFormed = xml.isWellFormed();
+            var def = $.Deferred();
+            if (isWellFormed === true) {
+                openerp.jsonRpc('/web/dataset/call', 'call', {
                     model: 'ir.ui.view',
                     method: 'write',
                     args: [[session.id], { 'arch':  xml.xml }, website.get_context()],
+                }).then(function () {
+                    def.resolve();
+                }).fail(function (source, error) {
+                    def.reject("server", session, error);
                 });
             } else {
-                return $.Deferred().reject(null, "Malformed XML document");
+                def.reject(null, session, $(isWellFormed).text());
             }
+            return def;
         },
         updateHash: function () {
             window.location.hash = hash + "?view=" + this.selectedViewId();
@@ -286,9 +295,61 @@
             this.updateHash();
             window.location.reload();
         },
-        displayError: function (error) {
-            // TODO Improve feedback (e.g. update 'Save' button + tooltip)
-            alert(error);
+        clearError: function () {
+            this.$(".ace_layer.ace_text-layer .ace_line").css("background", "");
+        },
+        displayError: function (source, session, error) {
+            var self = this;
+            var line, test;
+            // format error message
+            var message = _.isString(error) ? error
+                : (error && error.data && error.data.arguments && error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
+                : (error && error.data && error.data.message) ? error.data.message
+                : (error && error.message) ? error.message
+                : "Unexpected error";
+            if (source == "server") {
+                message = eval(message.replace(/^\(/g, '([')
+                    .replace(/\)$/g, '])')
+                    .replace(/u'/g, "'")
+                    .replace(/<([^>]+)>/g, '<b style="color:#661100;">&lt;\$1&gt;</b>'))[1];
+                line = -1;
+            } else {
+                line = message.match(/line ([0-9]+)/i);
+                line = line ? parseInt(line[1],10) : -1;
+                test = new RegExp("^\\s*"+line+"\\s*$");
+            }
+
+            function gotoline() {
+                self.aceEditor.gotoLine(line);
+                setTimeout(function () {
+                    var $lines = self.$(".ace_editor .ace_gutter .ace_gutter-cell");
+                    var index = $lines.filter(function () {
+                        return test.test($(this).text());
+                    }).index();
+                    if (index>0) {
+                        self.$(".ace_layer.ace_text-layer .ace_line:eq(" + index + ")").css("background", "#661100");
+                    }
+                },100);
+            }
+            function onchangeSession (e) {
+                self.aceEditor.off('changeSession', onchangeSession);
+                gotoline();
+            }
+
+            var $list = this.$("#ace-view-list");
+            if (+$list.val() == session.id) {
+                if (line>-1) gotoline();
+            } else {
+                if (line) self.aceEditor.on('changeSession', onchangeSession);
+                this.$("#ace-view-list").val(session.id).change();
+            }
+
+            var $dialog = $(openerp.qweb.render('website.error_dialog', {
+                title: session.text.match(/\s+name=['"]([^'"]+)['"]/i)[1],
+                message:"<b>Malformed XML document</b>:<br/>" + message
+            }));
+            $dialog.appendTo("body");
+            $dialog.modal('show');
         },
         open: function () {
             this.$el.removeClass('oe_ace_closed').addClass('oe_ace_open');
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index f25a491a106..4d9c9fcd73d 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -74,7 +74,7 @@
                     </div>
                     <div class="modal-body" t-if="message or backend_url">
                         <section>
-                            <t t-esc="message"/>
+                            <t t-raw="message"/>
                         </section>
                         <section class="mt32" t-if="backend_url">
                             <p>The web site has encountered an error.</p>

From f2677736466d8368c0049fa3011b87379fb613cf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 20 Feb 2014 12:19:51 +0100
Subject: [PATCH 105/134] [FIX] website_blog: manifest: the url is wrong to
 start a freetrial from blog apps in the website. Go to openerp.com, clisk on
 Blog icon (apps), the url is good, now click on free trial button, it is the
 website_sale link

bzr revid: chm@openerp.com-20140220111951-h80w1v1w7hwr3pvl
---
 addons/website_blog/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_blog/static/description/index.html b/addons/website_blog/static/description/index.html
index 7ca5b48ae55..3f44eea9b4d 100644
--- a/addons/website_blog/static/description/index.html
+++ b/addons/website_blog/static/description/index.html
@@ -22,7 +22,7 @@
 				translated in mutiple languages in just a few clicks.
 			</p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start?app=website_sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> online store</a>
+                <a href="http://www.openerp.com/start?app=website_blog" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> online store</a>
             </div>
         </div>
     </div>

From ddf1a51b055b0f44af741b1a3e7a68a5c82ece80 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Feb 2014 13:38:19 +0100
Subject: [PATCH 106/134] [FIX] crm_partner_assign: remove selection widget
 from type_id and channel_id, as the selection widget implies to have read
 access on these models, which is not the case for portal users.

bzr revid: dle@openerp.com-20140220123819-mfxr5sne9s4f0u9d
---
 addons/crm_partner_assign/crm_portal_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
index 2b2b61c8425..dab831dcb4b 100644
--- a/addons/crm_partner_assign/crm_portal_view.xml
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -140,8 +140,8 @@
                       </group>
                       <group col="2">
                          <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection" readonly="1"/>
-                        <field name="channel_id" widget="selection" readonly="1"/>
+                        <field name="type_id" readonly="1"/>
+                        <field name="channel_id" readonly="1"/>
                       </group>
                     </group>
                     <separator string="Details" />

From b0f1e57269f62f57ae97d8e562ee81927257b75c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Feb 2014 14:50:30 +0100
Subject: [PATCH 107/134] [FIX] web: oe_form_uri is not always a link (many2one
 readonly no_open for instance), therefore, apply css only for a.oe_form_uri,
 to add the underline. Color was already added by another rule.

bzr revid: dle@openerp.com-20140220135030-tt6isdwum15zt6i8
---
 addons/web/static/src/css/base.css  | 7 ++-----
 addons/web/static/src/css/base.sass | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 567091708a4..e43a2fb654e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -1219,10 +1219,7 @@
 .openerp .oe_about .oe_bottom a {
   color: #eeeeee;
 }
-.openerp .oe_form_uri {
-  color: #7c7bad;
-}
-.openerp .oe_form_uri:hover {
+.openerp a.oe_form_uri:hover {
   text-decoration: underline;
 }
 .openerp .oe_application {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2844d094599..b19db9e4ebd 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1013,10 +1013,8 @@ $sheet-padding: 16px
                 color: #eee
     // }}}
     // ActionManager {{{
-    .oe_form_uri
-        color: $link-color
-        &:hover
-            text-decoration: underline
+    a.oe_form_uri:hover
+        text-decoration: underline
     .oe_application
         width: 100%
         height: 100%

From 2a4d8bc6d5e1e0efa382beb3381460f49d201dec Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 20 Feb 2014 15:13:02 +0100
Subject: [PATCH 108/134] [ADD] web: add no_create option in view_form,
 allowing to remove create and edit (and quick create)

Before, we used to use selection widget to hide or disable the create and edit of many2one fields, but this is actually an abuse of the selection widget, this is not its purpose

bzr revid: dle@openerp.com-20140220141302-3paib80ixiyi66qg
---
 addons/web/static/src/js/view_form.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 599664d14de..f1fc377fa94 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3092,7 +3092,7 @@ instance.web.form.CompletionFieldMixin = {
             // quick create
             var raw_result = _(data.result).map(function(x) {return x[1];});
             if (search_val.length > 0 && !_.include(raw_result, search_val) &&
-                ! (self.options && self.options.no_quick_create)) {
+                ! (self.options && (self.options.no_create || self.options.no_quick_create))) {
                 values.push({
                     label: _.str.sprintf(_t('Create "<strong>%s</strong>"'),
                         $('<span />').text(search_val).html()),
@@ -3103,13 +3103,15 @@ instance.web.form.CompletionFieldMixin = {
                 });
             }
             // create...
-            values.push({
-                label: _t("Create and Edit..."),
-                action: function() {
-                    self._search_create_popup("form", undefined, self._create_context(search_val));
-                },
-                classname: 'oe_m2o_dropdown_option'
-            });
+            if (!(self.options && self.options.no_create)){
+                values.push({
+                    label: _t("Create and Edit..."),
+                    action: function() {
+                        self._search_create_popup("form", undefined, self._create_context(search_val));
+                    },
+                    classname: 'oe_m2o_dropdown_option'
+                });
+            }
 
             return values;
         });

From 09d73647395bddd30659c1817073a2885f5673c4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 20 Feb 2014 15:21:10 +0100
Subject: [PATCH 109/134] [FIX] website: on DOM elements we must set attribute
 via setAttribute

bzr revid: chs@openerp.com-20140220142110-zwtvvt2bkvbki7oo
---
 addons/website/static/src/js/website.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index b249fb7136f..671dfc14ee9 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -248,13 +248,13 @@
 
     website.form = function (url, method, params) {
         var form = document.createElement('form');
-        form.action = url;
-        form.method = method;
+        form.setAttribute('action', url);
+        form.setAttribute('method', method);
         _.each(params, function (v, k) {
             var param = document.createElement('input');
-            param.type = 'hidden';
-            param.name = k;
-            param.value = v;
+            param.setAttribute('type', 'hidden');
+            param.setAttribute('name', k);
+            param.setAttribute('value', v);
             form.appendChild(param);
         });
         document.body.appendChild(form);

From 960ac4bca851f7ab08be2e9e68e76e08a116c76a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 21 Feb 2014 11:08:53 +0100
Subject: [PATCH 110/134] [FIX] website: ace: client side add a try catch to
 DOMParser for IE

bzr revid: chm@openerp.com-20140221100853-50smr3ii8jrcq178
---
 addons/website/static/src/js/website.ace.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index ed7037e903c..640ed0d0689 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -39,9 +39,15 @@
             this.xml = text;
         },
         isWellFormed: function () {
+            var error;
             if (document.implementation.createDocument) {
-                var dom = new DOMParser().parseFromString(this.xml, "text/xml");
-                var error = dom.getElementsByTagName("parsererror");
+                // use try catch for ie
+                try {
+                    var dom = new DOMParser().parseFromString(this.xml, "text/xml");
+                    error = dom.getElementsByTagName("parsererror");
+                } catch (e) {
+                    error = e;
+                }
                 return error.length === 0 || error;
             } else if (window.ActiveXObject) {
                 // TODO test in IE

From 170f3ef1f91cb9886f12486dc67a979742dd2853 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 20 Feb 2014 18:09:49 +0100
Subject: [PATCH 111/134] [FIX] openerp/addons/base/ir/ir_actions.py: correct
 SyntaxError introduced in last commit

bzr revid: chs@openerp.com-20140220170949-kc4ru12sc5on300c
---
 openerp/addons/base/ir/ir_actions.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index cb8440ddb49..31c170068c8 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -938,10 +938,6 @@ class ir_actions_server(osv.osv):
             'context': context,
         }
 
-        }
-        return eval_context
-
-
     def run(self, cr, uid, ids, context=None):
         """ Runs the server action. For each server action, the condition is
         checked. Note that a void (``False``) condition is considered as always

From 4769ff5e5de8cfe530ffac9e4c4c9e170f31f2e7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 20 Feb 2014 18:29:26 +0100
Subject: [PATCH 112/134] [FIX] mail: fix IndentationError introduced in last
 commit

bzr revid: chs@openerp.com-20140220172926-4fy9x1i1q4wknfqx
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 97abd6050e8..633132583ed 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1583,7 +1583,7 @@ class mail_thread(osv.AbstractModel):
                 if context.get('operation', '') == 'create':
                     self.check_access_rule(cr, uid, ids, 'create')
                 else:
-                self.check_access_rule(cr, uid, ids, 'read')
+                    self.check_access_rule(cr, uid, ids, 'read')
             except (osv.except_osv, orm.except_orm):
                 return False
         else:

From b949cef63c9b125d1e0501741d341479eb221850 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 21 Feb 2014 05:48:43 +0000
Subject: [PATCH 113/134] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140221054843-7g7jwzx085jnes1q
---
 .../analytic_contract_hr_expense/i18n/ja.po   | 72 +++++++++++++++++++
 addons/hr_recruitment/i18n/zh_CN.po           | 30 ++++----
 addons/hr_timesheet_sheet/i18n/zh_CN.po       | 28 ++++----
 3 files changed, 101 insertions(+), 29 deletions(-)
 create mode 100644 addons/analytic_contract_hr_expense/i18n/ja.po

diff --git a/addons/analytic_contract_hr_expense/i18n/ja.po b/addons/analytic_contract_hr_expense/i18n/ja.po
new file mode 100644
index 00000000000..2f2b5c3dd6a
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/ja.po
@@ -0,0 +1,72 @@
+# 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-21 02:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-21 05:48+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "または参照"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "経費"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "分析勘定"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:144
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:136
+#, python-format
+msgid "Expenses of %s"
+msgstr "%sの経費"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "請求対象経費見込"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "経費請求"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ 請求"
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index 9d8dd82a732..d403b334e55 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/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: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-02-11 15:26+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2014-02-20 15:53+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.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-01-28 06:29+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -33,24 +33,24 @@ msgstr "必备条件"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Application Summary"
-msgstr ""
+msgstr "申请摘要"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Start Interview"
-msgstr ""
+msgstr "开始面试"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Mobile:"
-msgstr ""
+msgstr "手机："
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,fold:0
 msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
-msgstr ""
+msgstr "此阶段是不可见的。例如：状态栏或看板视图中，在该阶段中 不存在可显示的记录。"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
@@ -99,7 +99,7 @@ msgstr "暂停的职位"
 #: view:hr.applicant:0
 #: field:hr.applicant,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -157,7 +157,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applications"
-msgstr ""
+msgstr "求职申请"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -167,12 +167,12 @@ msgstr "开启天数"
 #. module: hr_recruitment
 #: field:hr.applicant,emp_id:0
 msgid "employee"
-msgstr ""
+msgstr "雇员"
 
 #. module: hr_recruitment
 #: field:hr.config.settings,fetchmail_applicants:0
 msgid "Create applicants from an incoming email account"
-msgstr ""
+msgstr "从电子邮件帐号接收的邮件创建求职申请"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -184,7 +184,7 @@ msgstr "天数"
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Contact"
-msgstr ""
+msgstr "新建联系人"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -808,7 +808,7 @@ msgstr "生效"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,nbr:0
 msgid "# of Applications"
-msgstr ""
+msgstr "个申请"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
@@ -1251,7 +1251,7 @@ msgstr "开始"
 #. module: hr_recruitment
 #: view:board.board:0
 msgid "Applications to be Processed"
-msgstr ""
+msgstr "待处理的申请"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index a5871aa0fab..532fb4af074 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-11-01 08:13+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
+"PO-Revision-Date: 2014-02-20 15:57+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 06:13+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -33,7 +33,7 @@ msgstr "服务"
 #: field:hr.timesheet.report,quantity:0
 #: field:timesheet.report,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "时间"
 
 #. module: hr_timesheet_sheet
 #: help:hr.config.settings,timesheet_max_difference:0
@@ -92,7 +92,7 @@ msgstr "# 成本"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -133,7 +133,7 @@ msgstr "日期到"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "to"
-msgstr ""
+msgstr "到"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -145,7 +145,7 @@ msgstr "根据计工单"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
-msgstr ""
+msgstr "你不能修改已确认的时间表条目"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -188,13 +188,13 @@ msgstr "拒绝"
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "时间表活动"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Please create an employee and associate it with this user."
-msgstr ""
+msgstr "请创建员工信息并关联到此用户"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402
@@ -202,7 +202,7 @@ msgstr ""
 #, python-format
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates."
-msgstr ""
+msgstr "无法录入当前时间表以外的出勤日期"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
@@ -226,7 +226,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -252,7 +252,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: hr_timesheet_sheet
 #: field:hr.config.settings,timesheet_max_difference:0
@@ -307,7 +307,7 @@ msgstr "员工计工单"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "无效的动作！"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0

From 09c90c3a5309cb1d666818da983d5a91616adb8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 11:28:23 +0100
Subject: [PATCH 114/134] [ADD] mail: mail_message_subtype: add a hidden field,
 to hide some subtypes from the followers widget. This will be used to hide
 the created subtype on the task or issues for example, while still available
 on the related project. The subtype on the task is necessary to trigger the
 various autosubscription and notification mechanisms but its display on
 task/issue is not.

bzr revid: tde@openerp.com-20140221102823-ca1bvw3qi9kf61uq
---
 addons/mail/mail_message_subtype.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index a15cf1a79a7..941011934e8 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -51,8 +51,10 @@ class mail_message_subtype(osv.osv):
         'default': fields.boolean('Default',
             help="Activated by default when subscribing."),
         'sequence': fields.integer('Sequence', help="Used to order subtypes."),
+        'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options")
     }
     _order = 'sequence'
     _defaults = {
         'default': True,
+        'sequence': 1,
     }

From 7e2bf04b4a51f3a3aafbec607ae319afb29ee3e0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 11:47:25 +0100
Subject: [PATCH 115/134] [FIX] website: bootstrap is now in web module

bzr revid: chs@openerp.com-20140221104725-e1w0t9ety5oqjf0y
---
 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 88cb65b9daa..42c0ad46dbb 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -250,7 +250,7 @@
             </div>
         </div>
     </xpath>
-    <xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
+    <xpath expr='//script[@src="/web/static/lib/bootstrap/js/bootstrap.js"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
         <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
         <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>

From 41f91e2bef47d82942f30005413431171182b8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:26:43 +0100
Subject: [PATCH 116/134] [IMP] sale_crm: subtypes: added sequence

bzr revid: tde@openerp.com-20140221112643-thzam5r0db5cfiq6
---
 addons/sale_crm/sale_crm_data.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale_crm/sale_crm_data.xml b/addons/sale_crm/sale_crm_data.xml
index 519af2a976b..1996f367202 100644
--- a/addons/sale_crm/sale_crm_data.xml
+++ b/addons/sale_crm/sale_crm_data.xml
@@ -5,12 +5,14 @@
         <!-- Salesteam-related subtypes for messaging / Chatter -->
         <record id="mt_salesteam_order_sent" model="mail.message.subtype">
             <field name="name">Quotation Send</field>
+            <field name="sequence">20</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('sale.mt_order_sent')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_order_confirmed" model="mail.message.subtype">
             <field name="name">Sales Order Confirmed</field>
+            <field name="sequence">21</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
             <field name="relation_field">section_id</field>

From 3a2d8d1496c50a9d68a418a4670ce37536931b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:27:04 +0100
Subject: [PATCH 117/134] [IMP] project, project_issue: added sequence on
 subtypes

bzr revid: tde@openerp.com-20140221112704-lqd4o5bnljn84yxs
---
 addons/project/project_data.xml             | 5 +++++
 addons/project_issue/project_issue_data.xml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7ddc983bf1c..95a76d8988e 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -78,6 +78,7 @@
             <field name="name">Task Created</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
             <field name="description">Task created</field>
         </record>
         <record id="mt_task_assigned" model="mail.message.subtype">
@@ -101,6 +102,7 @@
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_task_new" model="mail.message.subtype">
             <field name="name">Task Created</field>
+            <field name="sequence">10</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_new')"/>
@@ -108,6 +110,7 @@
         </record>
         <record id="mt_project_task_assigned" model="mail.message.subtype">
             <field name="name">Task Assigned</field>
+            <field name="sequence">11</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_assigned')"/>
@@ -115,12 +118,14 @@
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
+            <field name="sequence">12</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
             <field name="name">Task Stage Changed</field>
+            <field name="sequence">13</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_stage')"/>
             <field name="relation_field">project_id</field>
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 25a336d4094..d60106dffd2 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -33,6 +33,7 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="name">Issue Created</field>
             <field name="res_model">project.issue</field>
             <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
             <field name="description">Issue created</field>
         </record>
         <record id="mt_issue_assigned" model="mail.message.subtype">
@@ -56,6 +57,7 @@ Access all issues from the top Project menu, and access the issues of a specific
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_issue_new" model="mail.message.subtype">
             <field name="name">Issue Created</field>
+            <field name="sequence">20</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_issue_new')"/>
@@ -63,6 +65,7 @@ Access all issues from the top Project menu, and access the issues of a specific
         </record>
         <record id="mt_project_issue_assigned" model="mail.message.subtype">
             <field name="name">Issue Assigned</field>
+            <field name="sequence">21</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_issue_assigned')"/>
@@ -70,12 +73,14 @@ Access all issues from the top Project menu, and access the issues of a specific
         </record>
         <record id="mt_project_issue_blocked" model="mail.message.subtype">
             <field name="name">Issue Blocked</field>
+            <field name="sequence">22</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_issue_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_stage" model="mail.message.subtype">
             <field name="name">Issue Stage Changed</field>
+            <field name="sequence">23</field>
             <field name="res_model">project.project</field>
             <field name="description">Stage changed</field>
             <field name="parent_id" eval="ref('mt_issue_stage')"/>

From e2eb37efe2fd9c352c80ed43cb75fb11a027051d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:28:16 +0100
Subject: [PATCH 118/134] [IMP] mail: do not fetch hidden subtypes in follower
 widgets

bzr revid: tde@openerp.com-20140221112816-xhtc97az72ip355o
---
 addons/mail/mail_thread.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index e8197e52335..55e3ce67579 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -186,8 +186,17 @@ class mail_thread(osv.AbstractModel):
 
         # find current model subtypes, add them to a dictionary
         subtype_obj = self.pool.get('mail.message.subtype')
-        subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
-        subtype_dict = OrderedDict((subtype.name, OrderedDict(default=subtype.default, followed=False, parent_model=subtype.parent_id.res_model, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
+        subtype_ids = subtype_obj.search(
+            cr, uid, [
+                '&', ('hidden', '=', False), '|', ('res_model', '=', self._name), ('res_model', '=', False)
+            ], context=context)
+        subtype_dict = OrderedDict(
+            (subtype.name, {
+                'default': subtype.default,
+                'followed': False,
+                'parent_model': subtype.parent_id and subtype.parent_id.res_model or self._name,
+                'id': subtype.id}
+            ) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 

From 6813592da8981eeb7b1f76503bc341c57a2317fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:29:04 +0100
Subject: [PATCH 119/134] [IMP] mail: subtype model: cleaning + improved form
 view to add the new fields

bzr revid: tde@openerp.com-20140221112904-ijgkqy5zhco5a9i4
---
 addons/mail/mail_message_subtype.py  |  4 +++-
 addons/mail/mail_message_subtype.xml | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index 941011934e8..bae4d941a52 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -29,6 +29,8 @@ class mail_message_subtype(osv.osv):
         on the Wall. """
     _name = 'mail.message.subtype'
     _description = 'Message subtypes'
+    _order = 'sequence, id'
+
     _columns = {
         'name': fields.char('Message Type', required=True, translate=True,
             help='Message subtype gives a more precise type on the message, '\
@@ -53,7 +55,7 @@ class mail_message_subtype(osv.osv):
         'sequence': fields.integer('Sequence', help="Used to order subtypes."),
         'hidden': fields.boolean('Hidden', help="Hide the subtype in the follower options")
     }
-    _order = 'sequence'
+
     _defaults = {
         'default': True,
         'sequence': 1,
diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index a79f5815bd1..efcb81b5794 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -9,6 +9,7 @@
             <field name="arch" type="xml">
                 <tree string="Subtype">
                     <field name="name"/>
+                    <field name="sequence"/>
                     <field name="res_model"/>
                     <field name="default"/>
                 </tree>
@@ -22,12 +23,18 @@
                 <form string="Email message" version="7.0">
                     <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="res_model"/>
-                            <field name="default"/>
-                            <field name="description"/>
-                            <field name="parent_id"/>
-                            <field name="relation_field"/>
+                            <group string='Description'>
+                                <field name="name"/>
+                                <field name="sequence"/>
+                                <field name="res_model"/>
+                                <field name="description"/>
+                                <field name="default"/>
+                                <field name="hidden"/>
+                            </group>
+                            <group string='Auto subscription'>
+                                <field name="parent_id"/>
+                                <field name="relation_field"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>

From d3ea25c0bac0467dcdd4adf91e2a7c906b986054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:29:15 +0100
Subject: [PATCH 120/134] [IMP] crm: added sequence on subtypes

bzr revid: tde@openerp.com-20140221112915-1o9pk3gjohtl558w
---
 addons/crm/crm_lead_data.xml   | 5 +++++
 addons/mail/data/mail_data.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 6bb8e2700d4..1abcdac9712 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -146,6 +146,7 @@
         <!-- CRM-related subtypes for messaging / Chatter -->
         <record id="mt_lead_create" model="mail.message.subtype">
             <field name="name">Lead Created</field>
+            <field name="hidden" eval="True"/>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
             <field name="description">Lead created</field>
@@ -171,6 +172,7 @@
         <!-- Salesteam-related subtypes for messaging / Chatter -->
         <record id="mt_salesteam_lead" model="mail.message.subtype">
             <field name="name">Lead Created</field>
+            <field name="sequence">10</field>
             <field name="res_model">crm.case.section</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_lead_create')"/>
@@ -178,18 +180,21 @@
         </record>
         <record id="mt_salesteam_lead_stage" model="mail.message.subtype">
             <field name="name">Opportunity Stage Changed</field>
+            <field name="sequence">11</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('mt_lead_stage')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_lead_won" model="mail.message.subtype">
             <field name="name">Opportunity Won</field>
+            <field name="sequence">12</field>
             <field name="res_model">crm.case.section</field>
             <field name="parent_id" eval="ref('mt_lead_won')"/>
             <field name="relation_field">section_id</field>
         </record>
         <record id="mt_salesteam_lead_lost" model="mail.message.subtype">
             <field name="name">Opportunity Lost</field>
+            <field name="sequence">13</field>
             <field name="res_model">crm.case.section</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_lead_lost')"/>
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index e1ca797670b..4a2dc6d06f0 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -54,6 +54,7 @@
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
+            <field name="sequence" eval="0"/>
         </record>
     </data>
 </openerp>

From 587c8474b03075a05413b39c990b09d14d746a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:39:19 +0100
Subject: [PATCH 121/134] [FIX] mail: fixed regression caused by
 forward-porting saas-3: re-removed the hack in mail_thread about subscription
 in create mode.

bzr revid: tde@openerp.com-20140221113919-3b51stz2u9rj4kcz
---
 addons/mail/mail_thread.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 633132583ed..063b45c8c64 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1580,10 +1580,7 @@ class mail_thread(osv.AbstractModel):
         if set(partner_ids) == set([user_pid]):
             try:
                 self.check_access_rights(cr, uid, 'read')
-                if context.get('operation', '') == 'create':
-                    self.check_access_rule(cr, uid, ids, 'create')
-                else:
-                    self.check_access_rule(cr, uid, ids, 'read')
+                self.check_access_rule(cr, uid, ids, 'read')
             except (osv.except_osv, orm.except_orm):
                 return False
         else:

From 6709242bb8a6d653c6a9ae274d2b621537452418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 21 Feb 2014 12:40:04 +0100
Subject: [PATCH 122/134] [CLEAN] gamification: removed .moved folder, added
 when forward porting saas-3 into trunk.

bzr revid: tde@openerp.com-20140221114004-9ee33tn3ilk6rekf
---
 .../gamification/i18n.moved/gamification.pot  | 1733 -----------------
 1 file changed, 1733 deletions(-)
 delete mode 100644 addons/gamification/i18n.moved/gamification.pot

diff --git a/addons/gamification/i18n.moved/gamification.pot b/addons/gamification/i18n.moved/gamification.pot
deleted file mode 100644
index 0ef4cdbea64..00000000000
--- a/addons/gamification/i18n.moved/gamification.pot
+++ /dev/null
@@ -1,1733 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* gamification
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 8.0alpha1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 15:08+0000\n"
-"PO-Revision-Date: 2014-02-13 15:08+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Search Goals"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_company_data
-msgid "Set your Company Data"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Never"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,computation_mode:0
-msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal:0
-#: field:gamification.goal.wizard,goal_id:0
-msgid "Goal"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-msgid "Non recurring"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,next_report_date:0
-msgid "Next Report Date"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,monetary:0
-msgid "Monetary Value"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "My Goals"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,condition:0
-msgid "The lower the better"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: view:gamification.goal.wizard:0
-msgid "Grant Badge To"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_count_distinct:0
-msgid "The number of time this badge has been received by unique users."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,unique_owner_ids:0
-msgid "The list of unique users having received this badge."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal:0
-#: view:gamification.goal.definition:0
-msgid "Group By..."
-msgstr ""
-
-#. module: gamification
-#: model:gamification.challenge,name:gamification.challenge_base_configure
-msgid "Setup your Company"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "/∞"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/wizard/grant_badge.py:44
-#, python-format
-msgid "You can not grant a badge to yourself"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,completeness:0
-msgid "Completeness"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,field_date_id:0
-msgid "Date Field"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_my_this_month:0
-msgid "The number of time the current user has received this badge this month."
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge.line,condition:0
-msgid ">="
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.challenge_wizard
-msgid "Challenge Description"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_badge_user_wizard
-msgid "gamification.badge.user.wizard"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Reward"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,message_ids:0
-#: help:gamification.challenge,message_ids:0
-#: help:gamification.goal,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,category:0
-msgid "Define the visibility of the challenge through menus"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Refresh Challenge"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_challenge_line
-msgid "Gamification generic goal for challenge"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_monetary:0
-msgid "Monetary"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "In progress (to update)"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_goal_definition
-msgid "Gamification goal definition"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,remaining_sending:0
-msgid "If a maxium is set"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,invited_user_ids:0
-msgid "Suggest to users"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: model:ir.actions.act_window,name:gamification.goal_list_action
-#: model:ir.ui.menu,name:gamification.gamification_goal_menu
-msgid "Goals"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Badge Description"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "than the target."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Badges are granted when a challenge is finished. This is either at the end of a running period (eg: end of the month for a monthly challenge), at the end date of a challenge (if no periodicity is set) or when the challenge is manually closed."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,manager_id:0
-msgid "The user responsible for the challenge."
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:385
-#, python-format
-msgid "Update %s"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,description:0
-msgid "Goal Description"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "this month"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,owner_ids:0
-msgid "Owners"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,sender_id:0
-msgid "Sender"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_my_this_month:0
-msgid "My Monthly Total"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,remind_update_delay:0
-msgid "Never reminded if no value or zero is specified."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: field:gamification.challenge.line,challenge_id:0
-#: field:gamification.goal,challenge_id:0
-msgid "Challenge"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,condition:0
-msgid "Goal Performance"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_ids:0
-#: field:gamification.challenge,message_ids:0
-#: field:gamification.goal,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "badges this month"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:517
-#: code:addons/gamification/models/goal.py:351
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,line_ids:0
-msgid "Lines"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user:0
-msgid "Granted by"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_count_distinct:0
-msgid "Number of users"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,message_unread:0
-#: help:gamification.challenge,message_unread:0
-#: help:gamification.goal,message_unread:0
-msgid "If checked new messages require your attention."
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
-msgid "Create User"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Yearly"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "People having some badges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "granted,"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_full_suffix:0
-#: field:gamification.goal,definition_suffix:0
-#: field:gamification.goal.definition,suffix:0
-msgid "Suffix"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Reference"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,autojoin_group_id:0
-msgid "Auto-subscription Group"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "refresh"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Even if the challenge is failed, best challengers will be rewarded"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_id:0
-msgid "For Every Succeding User"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,target_goal:0
-msgid "Target Value to Reach"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,start_date:0
-msgid "The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Notification Messages"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,manager_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:108
-#, python-format
-msgid "more details..."
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,name:gamification.badge_list_action
-#: model:ir.ui.menu,name:gamification.gamification_badge_menu
-msgid "Badges"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_auth_badge_ids:0
-msgid "Only the people having these badges can give this badge"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Recorded manually"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Statistics"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "From"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Granting"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Grant"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "e.g. days"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_id:0
-#: view:gamification.goal:0
-#: field:gamification.goal,definition_id:0
-#: field:gamification.goal.definition,name:0
-msgid "Goal Definition"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "Failed"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: field:gamification.challenge,state:0
-#: view:gamification.goal:0
-#: field:gamification.goal,state:0
-msgid "State"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_follower_ids:0
-#: field:gamification.challenge,message_follower_ids:0
-#: field:gamification.goal,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_first_id:0
-msgid "For 1st user"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Can not grant"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_unread:0
-#: field:gamification.challenge,message_unread:0
-#: field:gamification.goal,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,display_mode:0
-msgid "Displayed as"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-#: field:gamification.badge,name:0
-#: field:gamification.badge.user,badge_id:0
-#: field:gamification.badge.user.wizard,badge_id:0
-msgid "Badge"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,suffix:0
-msgid "The unit of the target and current values"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
-msgid "Related Goals"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Subscriptions"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: model:ir.actions.act_window,name:gamification.action_grant_wizard
-msgid "Grant Badge"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:683
-#, python-format
-msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,message_summary:0
-#: help:gamification.challenge,message_summary:0
-#: help:gamification.goal,message_summary:0
-msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,report_message_group_id:0
-msgid "Send a copy to"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.challenge_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a challenge. \n"
-"                </p>\n"
-"                <p>\n"
-"                    Assign a list of goals to chosen users to evaluate them.\n"
-"                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
-"                    The goals are created for the specified users or member of the group.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:695
-#, python-format
-msgid "Nobody reached the required conditions to receive special badges."
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:35
-#: code:addons/gamification/static/src/xml/gamification.xml:57
-#, python-format
-msgid "Target: <="
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Reminders for Manual Goals"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:265
-#, python-format
-msgid "Invalid return content from the evaluation of %s"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-#: field:gamification.goal.definition,computation_mode:0
-msgid "Computation Mode"
-msgstr ""
-
-#. module: gamification
-#: model:email.template,body_html:gamification.simple_report_template
-msgid "<header><strong>${object.name}</strong>\n"
-"</header><p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
-"\n"
-"% if object.visibility_mode == 'personal':\n"
-"    <table width=\"100%\" border=\"1\"><tr><th>Goal</th>\n"
-"        <th>Target</th>\n"
-"        <th>Current</th>\n"
-"        <th>Completeness</th>\n"
-"    </tr>\n"
-"    % for line in ctx[\"challenge_lines\"]:\n"
-"        <tr if line>= 100:\n"
-"                style=\"font-weight:bold;\"\n"
-"            % endif\n"
-"            &gt;\n"
-"            <td>${line['name']}</td>\n"
-"            <td>${line['target']}\n"
-"            % if line['suffix']:\n"
-"                ${line['suffix']}\n"
-"            % endif\n"
-"            </td>\n"
-"            <td>${line['current']}\n"
-"            % if line['suffix']:\n"
-"                ${line['suffix']}\n"
-"            % endif\n"
-"            </td>\n"
-"            <td>${line['completeness']} %</td>\n"
-"        </tr>\n"
-"    % endfor\n"
-"    </table>\n"
-"% else:\n"
-"    % for line in ctx[\"challenge_lines\"]:\n"
-"        <table width=\"100%\" border=\"1\"><tr><th colspan=\"4\">${line['name']}</th>\n"
-"            </tr><tr><th>#</th>\n"
-"                <th>Person</th>\n"
-"                <th>Completeness</th>\n"
-"                <th>Current</th>\n"
-"            </tr>\n"
-"            % for goal in line['goals']:\n"
-"                <tr if goal.completeness>= 100:\n"
-"                        style=\"font-weight:bold;\"\n"
-"                    % endif\n"
-"                    &gt;\n"
-"                    <td>${goal['rank']}</td>\n"
-"                    <td>${goal['name']}</td>\n"
-"                    <td>${goal['completeness']}%</td>\n"
-"                    <td>${goal['current']}/${line['target']}\n"
-"                    % if line['suffix']:\n"
-"                        ${line['suffix']}\n"
-"                    % endif\n"
-"                    </td>\n"
-"                </tr>\n"
-"            % endfor\n"
-"        </table><br><br>\n"
-"\n"
-"    % endfor\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,condition:0
-msgid "A goal is considered as completed when the current value is compared to the value to reach"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,remind_update_delay:0
-msgid "Non-updated manual goals will be reminded after"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,full_suffix:0
-msgid "The currency and suffix field"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,display_mode:0
-msgid "Exclusive (done or not-done)"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:223
-#: code:addons/gamification/models/badge.py:225
-#: code:addons/gamification/models/badge.py:227
-#: code:addons/gamification/models/badge.py:229
-#: code:addons/gamification/wizard/grant_badge.py:44
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,last_update:0
-msgid "Last Update"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,report_message_frequency:0
-msgid "Report Frequency"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,field_id:0
-msgid "The field containing the value to evaluate"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,end_date:0
-msgid "The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,create_date:0
-msgid "Created"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_idea
-msgid "Brilliant"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,visibility_mode:0
-msgid "Individual Goals"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Invited"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "On change"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Daily"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal.definition:0
-msgid "Goal definitions"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Participating"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_auth:0
-msgid "Who can grant this badge"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,last_report_date:0
-msgid "Last Report Date"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Automatic: execute a specific Python code"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_goal_wizard
-msgid "gamification.goal.wizard"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_badge_user
-msgid "Gamification user badge"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Describe the challenge: what is does, who it targets, why it matters..."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Goal List"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,comment:0
-#: field:gamification.badge.user.wizard,comment:0
-msgid "Comment"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "In progress"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Search Challenges"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "No one, assigned through challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_my:0
-msgid "My Total"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "reply later"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,image:0
-msgid "Image"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Running Challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,category:0
-msgid "Appears in"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Passed"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "Clickable Goals"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "Canceled"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,badge_name:0
-msgid "Badge Name"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,definition_suffix:0
-msgid "Unit"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:229
-#, python-format
-msgid "You have already sent this badge too many time this month."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_my_monthly_sending:0
-msgid "My Monthly Sending Total"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Check Badge"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Weekly"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Assign Challenge To"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: view:gamification.challenge:0
-#: view:gamification.goal.wizard:0
-msgid "or"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge.line,sequence:0
-msgid "Sequence number for ordering"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Category"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,current:0
-msgid "Current Value"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,field_date_id:0
-msgid "The date to use for the time period evaluated"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
-msgid "<p>\n"
-"                There is no goals associated to this challenge matching your search.\n"
-"                Make sure that your challenge is active and assigned to at least one user.\n"
-"              </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.badge_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a badge. \n"
-"                </p>\n"
-"                <p>\n"
-"                    A badge is a symbolic token granted to a user as a sign of reward.\n"
-"                    It can be deserved automatically when some conditions are met or manually by users.\n"
-"                    Some badges are harder than others to get with specific conditions.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_auth_badge_ids:0
-msgid "Required Badges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Line List"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_max:0
-msgid "Monthly Limited Sending"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:517
-#, python-format
-msgid "Retrieving progress for personal challenge without user information"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_timezone
-msgid "Set your Timezone"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,goal_definition_ids:0
-msgid "The users that have succeeded theses goals will receive automatically the badge."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,image:0
-msgid "This field holds the image used for the badge, limited to 256x256"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.wizard:0
-msgid "Update"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,line_id:0
-msgid "Goal Line"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_max_number:0
-msgid "Limitation Number"
-msgstr ""
-
-#. module: gamification
-#: model:ir.module.category,name:gamification.module_goal_category
-msgid "Gamification"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,state:0
-#: view:gamification.goal:0
-#: selection:gamification.goal,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Reject"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,model_id:0
-msgid "The model object for the field to evaluate"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.goal_definition_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a goal definition. \n"
-"                </p>\n"
-"                <p>\n"
-"                    A goal definition is a technical model of goal defining a condition to reach.\n"
-"                    The dates, values to reach or users are defined in goal instance.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge.user,sender_id:0
-msgid "The user who has send the badge"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_count:0
-msgid "The number of time this badge has been received."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-#: field:gamification.goal.definition,model_id:0
-msgid "Model"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_challenge
-msgid "Gamification challenge"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_max:0
-msgid "Check to set a monthly limit per person of sending this badge"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_badge
-msgid "Gamification badge"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.action_new_simplified_res_users
-msgid "Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Security rules to define who is allowed to manually grant badges. Not enforced for administrator."
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,display_mode:0
-msgid "Progressive (using numerical values)"
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_gamification_goal
-msgid "Gamification goal instance"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:685
-#, python-format
-msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_is_follower:0
-#: field:gamification.challenge,message_is_follower:0
-#: field:gamification.goal,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,full_suffix:0
-msgid "Full Suffix"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Advanced Options"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,start_date:0
-#: field:gamification.goal,start_date:0
-msgid "Start Date"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_second_id:0
-msgid "For 2nd user"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Data"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,user_id:0
-#: field:gamification.badge.user.wizard,user_id:0
-#: view:gamification.goal:0
-#: field:gamification.goal,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,domain:0
-msgid "Filter Domain"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Schedule"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Automatic: number of records"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_max_number:0
-msgid "The maximum number of time this badge can be sent per month per person."
-msgstr ""
-
-#. module: gamification
-#: model:ir.model,name:gamification.model_res_groups
-msgid "Access Groups"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "Formating Options"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,compute_code:0
-msgid "Python code to be executed for each user. 'result' should contains the new current value. Evaluated user can be access through object.user_id."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,user_ids:0
-#: model:ir.model,name:gamification.model_res_users
-msgid "Users"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "A selected list of users"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.challenge.line:0
-msgid "Challenge Lines"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,rule_auth_user_ids:0
-msgid "Only these people can give this badge"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,active:0
-msgid "Active"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,action_id:0
-msgid "The action that will be called to update the goal value."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "You can still grant"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,computation_mode:0
-msgid "Computation mode"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,action_id:0
-msgid "Action"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_invite
-msgid "Invite new Users"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,definition_description:0
-msgid "Definition Description"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_problem_solver
-msgid "Problem Solver"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Target: less than"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_this_month:0
-msgid "The number of time this badge has been received this month."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal,last_update:0
-msgid "In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in challenge). Ignored in case of non-manual goal or goal not linked to a challenge."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Depending on the Display mode, reports will be individual or shared."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Start goal"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,period:0
-msgid "Periodicity"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge.user,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:692
-#, python-format
-msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,compute_code:0
-msgid "Python Code"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Rewards for challenges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Send Report"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Period"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,name:0
-msgid "Challenge Name"
-msgstr ""
-
-#. module: gamification
-#: model:ir.ui.menu,name:gamification.gamification_menu
-msgid "Gamification Tools"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,goal_definition_ids:0
-msgid "Rewarded by"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,remaining_sending:0
-msgid "Remaining Sending Allowed"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,state:0
-msgid "Done"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,visibility_mode:0
-#: field:gamification.goal,definition_display:0
-msgid "Display Mode"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-#: view:gamification.goal.wizard:0
-msgid "Cancel"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "There is no reward upon completion of this challenge."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,monetary:0
-msgid "The target and current value are defined in the company currency."
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,condition:0
-msgid "The higher the better"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_base_company_logo
-msgid "Set your Company Logo"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Goal Reached"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_my:0
-msgid "The number of time the current user has received this badge."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,report_message_group_id:0
-msgid "Group that will receive a copy of the report in addition to the user"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,target_goal:0
-msgid "To Reach"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,res_id_field:0
-msgid "The field name on the user profile (res.users) containing the value for res_id for action."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal,remind_update_delay:0
-msgid "The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-msgid "Who would you like to reward?"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge.line,condition:0
-msgid "<="
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Configure Challenge"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,period:0
-#: selection:gamification.challenge,report_message_frequency:0
-msgid "Monthly"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,user_ids:0
-msgid "List of users participating to the challenge"
-msgstr ""
-
-#. module: gamification
-#: model:email.template,body_html:gamification.email_template_goal_reminder
-msgid "<header><strong>Reminder ${object.name}</strong>\n"
-"    </header><p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
-"\n"
-"    <p>If you have not changed your score yet, you can use the button \"The current value is up to date\" to indicate so.</p>"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-#: field:gamification.goal.wizard,current:0
-msgid "Current"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "To"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:225
-#, python-format
-msgid "You are not in the user allowed list."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "í"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,challenge_ids:0
-msgid "Reward of Challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,definition_condition:0
-msgid "Definition Condition"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,autojoin_group_id:0
-msgid "Group of users whose members will be automatically added to user_ids once the challenge is started"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-#: model:ir.actions.act_window,name:gamification.goal_definition_list_action
-#: model:ir.ui.menu,name:gamification.gamification_definition_menu
-msgid "Goal Definitions"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_hidden
-msgid "Hidden"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: view:gamification.goal:0
-msgid "days"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,report_template_id:0
-msgid "Report Template"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_auth:0
-msgid "Allowance to Grant"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal.definition,computation_mode:0
-msgid "Automatic: sum on a field"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.challenge,name:gamification.challenge_base_discover
-msgid "Complete your Profile"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,description:0
-#: field:gamification.challenge,description:0
-msgid "Description"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:223
-#, python-format
-msgid "This badge can not be sent by users."
-msgstr ""
-
-#. module: gamification
-#: model:email.template,body_html:gamification.email_template_badge_received
-msgid "<p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
-"            % if object.sender_id\n"
-"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
-"            % endif\n"
-"        </p>\n"
-"\n"
-"        % if object.comment\n"
-"            <p><em>${object.comment}</em></p>\n"
-"        % endif\n"
-"        "
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_this_month:0
-msgid "Monthly total"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_third_id:0
-msgid "For 3rd user"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user.wizard:0
-msgid "Describe what they did and why it matters (will be public)"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/badge.py:227
-#, python-format
-msgid "You do not have the required badges."
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "e.g. Monthly Sales Objectives"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,line_ids:0
-msgid "List of goals that will be set"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Badge List"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.challenge,visibility_mode:0
-msgid "Leader Board (Group Ranking)"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Reached when current value is"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/goal.py:351
-#, python-format
-msgid "Can not modify the configuration of a started goal"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,unique_owner_ids:0
-msgid "Unique Owners"
-msgstr ""
-
-#. module: gamification
-#: code:addons/gamification/models/challenge.py:665
-#, python-format
-msgid "The challenge %s is finished."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,end_date:0
-#: view:gamification.goal:0
-#: field:gamification.goal,end_date:0
-msgid "End Date"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,owner_ids:0
-msgid "The list of instances of this badge granted to users"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Goal Failed"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,res_id_field:0
-msgid "ID Field of user"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge.line,name:0
-msgid "Name"
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:105
-#, python-format
-msgid "Invited Challenges"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal:0
-msgid "Reset Completion"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal.definition,domain:0
-msgid "Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)]."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.badge,stat_my_monthly_sending:0
-msgid "The number of time the current user has sent this badge this month."
-msgstr ""
-
-#. module: gamification
-#: help:gamification.goal,challenge_id:0
-msgid "Challenge that generated the goal, assign challenge to users to generate goals with a value in this field."
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,rule_auth_user_ids:0
-msgid "Authorized Users"
-msgstr ""
-
-#. module: gamification
-#: model:ir.actions.act_window,help:gamification.goal_list_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"                    Click to create a goal. \n"
-"                </p>\n"
-"                <p>\n"
-"                    A goal is defined by a user and a goal definition.\n"
-"                    Goals can be created automatically by using challenges.\n"
-"                </p>\n"
-"            "
-msgstr ""
-
-#. module: gamification
-#: field:gamification.challenge,reward_failure:0
-msgid "Reward Bests if not Succeeded?"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal.definition,field_id:0
-msgid "Field to Sum"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,message_summary:0
-#: field:gamification.challenge,message_summary:0
-#: field:gamification.goal,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.badge,name:gamification.badge_good_job
-msgid "Good Job"
-msgstr ""
-
-#. module: gamification
-#. openerp-web
-#: code:addons/gamification/static/src/xml/gamification.xml:32
-#: code:addons/gamification/static/src/xml/gamification.xml:54
-#, python-format
-msgid "Target:"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.wizard:0
-msgid "Set the current value you have reached for this goal"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.badge,rule_auth:0
-msgid "Everyone"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "How to compute the goal?"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.goal.definition:0
-msgid "Search Goal Definitions"
-msgstr ""
-
-#. module: gamification
-#: model:gamification.goal.definition,name:gamification.definition_nbr_following
-msgid "Mail Group Following"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "Accept"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "Grant this Badge"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-#: model:ir.actions.act_window,name:gamification.challenge_list_action
-#: model:ir.ui.menu,name:gamification.gamification_challenge_menu
-msgid "Challenges"
-msgstr ""
-
-#. module: gamification
-#: model:res.groups,name:gamification.group_goal_manager
-msgid "Manager"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.challenge:0
-msgid "HR Challenges"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.goal,remind_update_delay:0
-msgid "Remind delay"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge:0
-msgid "No monthly sending limit"
-msgstr ""
-
-#. module: gamification
-#: selection:gamification.goal,state:0
-msgid "Reached"
-msgstr ""
-
-#. module: gamification
-#: view:gamification.badge.user:0
-msgid "the"
-msgstr ""
-
-#. module: gamification
-#: field:gamification.badge,stat_count:0
-msgid "Total"
-msgstr ""
-
-#. module: gamification
-#: help:gamification.challenge,period:0
-msgid "Period of automatic goal assigment. If none is selected, should be launched manually."
-msgstr ""
-

From 6b40002f987bbe30fc30f5e72ca744ef79b4c658 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 21 Feb 2014 12:53:47 +0100
Subject: [PATCH 123/134] [ADD] Enable access to workflow engine in server
 actions that run arbitrary python code (a workflow variable gives now access
 to trg_* methods of the workflow engine)

bzr revid: rim@openerp.com-20140221115347-rpar6uyiwx1z9deu
---
 openerp/addons/base/ir/ir_actions.py  | 2 ++
 openerp/addons/base/ir/ir_actions.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 31c170068c8..9adbf2c608f 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -552,6 +552,7 @@ class ir_actions_server(osv.osv):
 #  - uid: current user id
 #  - context: current context
 #  - time: Python time module
+#  - workflow: Workflow engine
 # If you plan to return an action, assign: action = {...}""",
         'use_relational_model': 'base',
         'use_create': 'new',
@@ -936,6 +937,7 @@ class ir_actions_server(osv.osv):
             'uid': uid,
             'user': user,
             'context': context,
+            'workflow': workflow
         }
 
     def run(self, cr, uid, ids, context=None):
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 7ac0252da80..26c08d4f1b0 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -412,6 +412,7 @@
                                             <li>cr: database cursor</li>
                                             <li>uid: current user id</li>
                                             <li>context: current context</li>
+                                            <li>workflow: Workflow engine</li>
                                         </ul>
                                         <div>
                                             <p>Example of condition expression using Python</p>

From 13194a10f732540eb38691eef7d7e2ae275c9d4e Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 21 Feb 2014 13:57:08 +0100
Subject: [PATCH 124/134] [ADD] Test that the variable 'workflow' is correctly
 assigned in Python server actions (if not, the code will crash)

bzr revid: rim@openerp.com-20140221125708-6vt2ucp5sjtvl02q
---
 openerp/addons/base/tests/test_ir_actions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/tests/test_ir_actions.py b/openerp/addons/base/tests/test_ir_actions.py
index 04f67617ad6..baea8299f9e 100644
--- a/openerp/addons/base/tests/test_ir_actions.py
+++ b/openerp/addons/base/tests/test_ir_actions.py
@@ -97,7 +97,8 @@ class TestServerActions(TestServerActionsBase):
         self.ir_actions_server.write(cr, uid, self.act_id, {
             'state': 'code',
             'code': """partner_name = obj.name + '_code'
-self.pool["res.partner"].create(cr, uid, {"name": partner_name}, context=context)"""
+self.pool["res.partner"].create(cr, uid, {"name": partner_name}, context=context)
+workflow"""
         })
         run_res = self.ir_actions_server.run(cr, uid, [self.act_id], context=self.context)
         self.assertFalse(run_res, 'ir_actions_server: code server action correctly finished should return False')

From 013d27b85026880c2e8f53c9c8bea94cd009fc94 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 21 Feb 2014 15:34:48 +0100
Subject: [PATCH 125/134] [IMP] filter out phantomjs warning on OSX

bzr revid: xmo@openerp.com-20140221143448-tpx62ua785kc8gfx
---
 openerp/tests/common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 2f10371a8f0..b68bbfe20df 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -216,6 +216,8 @@ class HttpCase(TransactionCase):
                 line, buf = buf.split('\n', 1)
 
                 line = str(line)
+                if 'CoreText' in line:
+                    continue
                 if line == "ok":
                     break
                 if line.startswith("error"):

From 186bb976380bda95d981ce5522854af0c31b4316 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 22:57:09 +0100
Subject: [PATCH 126/134] [FIX] httpd thread must be a daemon threaded

bzr revid: chs@openerp.com-20140221215709-codb7b9r9n77ln7k
---
 openerp/service/server.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 5372459cd41..8d6e2c3246d 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -263,7 +263,9 @@ class ThreadedServer(CommonServer):
         self.httpd.serve_forever()
 
     def http_spawn(self):
-        threading.Thread(target=self.http_thread).start()
+        t = threading.Thread(target=self.http_thread, name="openerp.service.httpd")
+        t.setDaemon(True)
+        t.start()
         _logger.info('HTTP service (werkzeug) running on %s:%s', self.interface, self.port)
 
     def start(self):

From 40f7df4fd80d88cbb29044584510a87e2670f511 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 23:03:48 +0100
Subject: [PATCH 127/134] [FIX] return code is non-zero if any preloaded
 database failed to load

bzr revid: chs@openerp.com-20140221220348-vw3mll25dti1n23u
---
 openerp/service/server.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 8d6e2c3246d..9eb29097a31 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -318,11 +318,11 @@ class ThreadedServer(CommonServer):
         """
         self.start()
 
-        preload_registries(preload)
+        rc = preload_registries(preload)
 
         if stop:
             self.stop()
-            return
+            return rc
 
 
         # Wait for a first signal to be handled. (time.sleep will be interrupted
@@ -583,11 +583,11 @@ class PreforkServer(CommonServer):
     def run(self, preload, stop):
         self.start()
 
-        preload_registries(preload)
+        rc = preload_registries(preload)
 
         if stop:
             self.stop()
-            return
+            return rc
 
         _logger.debug("Multiprocess starting")
         while 1:
@@ -855,6 +855,7 @@ def preload_registries(dbnames):
     config = openerp.tools.config
     test_file = config['test_file']
     dbnames = dbnames or []
+    rc = 0
     for dbname in dbnames:
         try:
             update_module = config['init'] or config['update']
@@ -866,9 +867,13 @@ def preload_registries(dbnames):
                     load_test_file_yml(test_file)
                 elif test_file.endswith('py'):
                     load_test_file_py(test_file)
+
+            if registry._assertion_report.failures:
+                rc += 1
         except Exception:
-            _logger.exception('Failed to initialize database `%s`.', dbname)
-            return
+            _logger.critical('Failed to initialize database `%s`.', dbname, exc_info=True)
+            return -1
+    return rc
 
 def start(preload=None, stop=False):
     """ Start the openerp http server and cron processor.

From 9f3417080cf73c88eb2edbe8cdc9d80502bdb4de Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 23:15:51 +0100
Subject: [PATCH 128/134] [FIX] correct run of test-file via command line

bzr revid: chs@openerp.com-20140221221551-y168fe003k45229m
---
 openerp/service/server.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 9eb29097a31..699c7b25ed1 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -827,13 +827,12 @@ def _reexec(updated_modules=None):
         args.insert(0, exe)
     os.execv(sys.executable, args)
 
-def load_test_file_yml(test_file):
-    cr = registry.db.cursor()
-    openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
-    cr.rollback()
-    cr.close()
+def load_test_file_yml(registry, test_file):
+    with registry.cursor() as cr:
+        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
+        cr.rollback()
 
-def load_test_file_py(test_file):
+def load_test_file_py(registry, test_file):
     # Locate python module based on its filename and run the tests
     test_path, _ = os.path.splitext(os.path.abspath(test_file))
     for mod_name, mod_mod in sys.modules.items():
@@ -845,8 +844,9 @@ def load_test_file_py(test_file):
                     suite.addTest(t)
                 _logger.log(logging.INFO, 'running tests %s.', mod_mod.__name__)
                 result = unittest2.TextTestRunner(verbosity=2, stream=openerp.modules.module.TestStream()).run(suite)
-                if not result.wasSuccessful():
-                    r = False
+                success = result.wasSuccessful()
+                registry._assertion_report.report_result(success)
+                if not success:
                     _logger.error('%s: at least one error occurred in a test', test_file)
 
 def preload_registries(dbnames):
@@ -864,9 +864,9 @@ def preload_registries(dbnames):
             if test_file:
                 _logger.info('loading test file %s', test_file)
                 if test_file.endswith('yml'):
-                    load_test_file_yml(test_file)
+                    load_test_file_yml(registry, test_file)
                 elif test_file.endswith('py'):
-                    load_test_file_py(test_file)
+                    load_test_file_py(registry, test_file)
 
             if registry._assertion_report.failures:
                 rc += 1

From f511109440e0e5cd43bd2e095182ef2f47d5e692 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 23:17:02 +0100
Subject: [PATCH 129/134] [FIX] correct signal handler on nt

bzr revid: chs@openerp.com-20140221221702-5sa98qfkfh0fimct
---
 openerp/service/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 699c7b25ed1..8df92ac8606 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -278,7 +278,7 @@ class ThreadedServer(CommonServer):
             signal.signal(signal.SIGQUIT, dumpstacks)
         elif os.name == 'nt':
             import win32api
-            win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1)
+            win32api.SetConsoleCtrlHandler(lambda sig: self.signal_handler(sig, None), 1)
         self.cron_spawn()
         self.http_spawn()
 

From d81e9debbe93db70de75d15b14b1e17067f9811a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 21 Feb 2014 23:35:44 +0100
Subject: [PATCH 130/134] [IMP] openerp/service/server.py: lint file

bzr revid: chs@openerp.com-20140221223544-q309ioxit8tzlaki
---
 openerp/service/server.py | 73 ++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 8df92ac8606..339f4c35101 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -9,7 +9,6 @@ import os.path
 import platform
 import psutil
 import random
-import re
 import resource
 import select
 import signal
@@ -32,15 +31,14 @@ except ImportError:
     setproctitle = lambda x: None
 
 import openerp
-import openerp.tools.config as config
+from openerp.module.registry import RegistryManager
 from openerp.release import nt_service_name
+import openerp.tools.config as config
 from openerp.tools.misc import stripped_sys_argv, dumpstacks
 
-import wsgi_server
-
 _logger = logging.getLogger(__name__)
 
-SLEEP_INTERVAL = 60 # 1 min
+SLEEP_INTERVAL = 60     # 1 min
 
 #----------------------------------------------------------
 # Werkzeug WSGI servers patched
@@ -126,7 +124,7 @@ class AutoReload(object):
                     if len(right) < 2:
                         continue
                     module = right[0]
-                    self.modules[module]=1
+                    self.modules[module] = 1
         if self.modules:
             _logger.info('autoreload: xml change detected, autoreload activated')
             restart()
@@ -146,7 +144,7 @@ class AutoReload(object):
             if py_errors:
                 _logger.info('autoreload: python code change detected, errors found')
                 for i in py_errors:
-                    _logger.info('autoreload: SyntaxError %s',i)
+                    _logger.info('autoreload: SyntaxError %s', i)
             else:
                 _logger.info('autoreload: python code updated, autoreload activated')
                 restart()
@@ -213,7 +211,7 @@ class ThreadedServer(CommonServer):
         self.httpd = None
 
     def signal_handler(self, sig, frame):
-        if sig in [signal.SIGINT,signal.SIGTERM]:
+        if sig in [signal.SIGINT, signal.SIGTERM]:
             # shutdown on kill -INT or -TERM
             self.quit_signals_received += 1
             if self.quit_signals_received > 1:
@@ -227,7 +225,7 @@ class ThreadedServer(CommonServer):
 
     def cron_thread(self, number):
         while True:
-            time.sleep(SLEEP_INTERVAL + number) # Steve Reich timing style
+            time.sleep(SLEEP_INTERVAL + number)     # Steve Reich timing style
             registries = openerp.modules.registry.RegistryManager.registries
             _logger.debug('cron%d polling for jobs', number)
             for db_name, registry in registries.items():
@@ -257,8 +255,8 @@ class ThreadedServer(CommonServer):
             _logger.debug("cron%d started!" % i)
 
     def http_thread(self):
-        def app(e,s):
-            return self.app(e,s)
+        def app(e, s):
+            return self.app(e, s)
         self.httpd = ThreadedWSGIServerReloadable(self.interface, self.port, app)
         self.httpd.serve_forever()
 
@@ -324,7 +322,6 @@ class ThreadedServer(CommonServer):
             self.stop()
             return rc
 
-
         # Wait for a first signal to be handled. (time.sleep will be interrupted
         # by the signal handler.) The try/except is for the win32 case.
         try:
@@ -440,7 +437,7 @@ class PreforkServer(CommonServer):
             sys.exit(0)
 
     def long_polling_spawn(self):
-        nargs = stripped_sys_argv('--pidfile','--workers')
+        nargs = stripped_sys_argv('--pidfile', '--workers')
         cmd = nargs[0]
         cmd = os.path.join(os.path.dirname(cmd), "openerp-gevent")
         nargs[0] = cmd
@@ -449,10 +446,10 @@ class PreforkServer(CommonServer):
 
     def worker_pop(self, pid):
         if pid in self.workers:
-            _logger.debug("Worker (%s) unregistered",pid)
+            _logger.debug("Worker (%s) unregistered", pid)
             try:
-                self.workers_http.pop(pid,None)
-                self.workers_cron.pop(pid,None)
+                self.workers_http.pop(pid, None)
+                self.workers_cron.pop(pid, None)
                 u = self.workers.pop(pid)
                 u.close()
             except OSError:
@@ -468,7 +465,7 @@ class PreforkServer(CommonServer):
     def process_signals(self):
         while len(self.queue):
             sig = self.queue.pop(0)
-            if sig in [signal.SIGINT,signal.SIGTERM]:
+            if sig in [signal.SIGINT, signal.SIGTERM]:
                 raise KeyboardInterrupt
             elif sig == signal.SIGHUP:
                 # restart on kill -HUP
@@ -504,8 +501,8 @@ class PreforkServer(CommonServer):
     def process_timeout(self):
         now = time.time()
         for (pid, worker) in self.workers.items():
-            if (worker.watchdog_timeout is not None) and \
-                (now - worker.watchdog_time >= worker.watchdog_timeout):
+            if worker.watchdog_timeout is not None and \
+                    (now - worker.watchdog_time) >= worker.watchdog_timeout:
                 _logger.error("Worker (%s) timeout", pid)
                 self.worker_kill(pid, signal.SIGKILL)
 
@@ -520,7 +517,7 @@ class PreforkServer(CommonServer):
     def sleep(self):
         try:
             # map of fd -> worker
-            fds = dict([(w.watchdog_pipe[0],w) for k,w in self.workers.items()])
+            fds = dict([(w.watchdog_pipe[0], w) for k, w in self.workers.items()])
             fd_in = fds.keys() + [self.pipe[0]]
             # check for ping or internal wakeups
             ready = select.select(fd_in, [], [], self.beat)
@@ -560,11 +557,12 @@ class PreforkServer(CommonServer):
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.setblocking(0)
         self.socket.bind(self.address)
-        self.socket.listen(8*self.population)
+        self.socket.listen(8 * self.population)
 
     def stop(self, graceful=True):
         if self.long_polling_pid is not None:
-            self.worker_kill(self.long_polling_pid, signal.SIGKILL)     # FIXME make longpolling process handle SIGTERM correctly
+            # FIXME make longpolling process handle SIGTERM correctly
+            self.worker_kill(self.long_polling_pid, signal.SIGKILL)
             self.long_polling_pid = None
         if graceful:
             _logger.info("Stopping gracefully")
@@ -602,7 +600,7 @@ class PreforkServer(CommonServer):
                 _logger.debug("Multiprocess clean stop")
                 self.stop()
                 break
-            except Exception,e:
+            except Exception, e:
                 _logger.exception(e)
                 self.stop(False)
                 return -1
@@ -634,7 +632,7 @@ class Worker(object):
 
     def sleep(self):
         try:
-            ret = select.select([self.multi.socket], [], [], self.multi.beat)
+            select.select([self.multi.socket], [], [], self.multi.beat)
         except select.error, e:
             if e[0] not in [errno.EINTR]:
                 raise
@@ -652,7 +650,7 @@ class Worker(object):
         rss, vms = psutil.Process(os.getpid()).get_memory_info()
         if vms > config['limit_memory_soft']:
             _logger.info('Worker (%d) virtual memory limit (%s) reached.', self.pid, vms)
-            self.alive = False # Commit suicide after the request.
+            self.alive = False      # Commit suicide after the request.
 
         # VMS and RLIMIT_AS are the same thing: virtual memory, a.k.a. address space
         soft, hard = resource.getrlimit(resource.RLIMIT_AS)
@@ -700,7 +698,7 @@ class Worker(object):
                 self.process_work()
             _logger.info("Worker (%s) exiting. request_count: %s.", self.pid, self.request_count)
             self.stop()
-        except Exception,e:
+        except Exception:
             _logger.exception("Worker (%s) Exception occured, exiting..." % self.pid)
             # should we use 3 to abort everything ?
             sys.exit(1)
@@ -718,7 +716,7 @@ class WorkerHTTP(Worker):
         # tolerate broken pipe when the http client closes the socket before
         # receiving the full reply
         try:
-            self.server.process_request(client,addr)
+            self.server.process_request(client, addr)
         except IOError, e:
             if e.errno != errno.EPIPE:
                 raise
@@ -749,7 +747,7 @@ class WorkerCron(Worker):
     def sleep(self):
         # Really sleep once all the databases have been processed.
         if self.db_index == 0:
-            interval = SLEEP_INTERVAL + self.pid % 10 # chorus effect
+            interval = SLEEP_INTERVAL + self.pid % 10   # chorus effect
             time.sleep(interval)
 
     def _db_list(self):
@@ -771,7 +769,7 @@ class WorkerCron(Worker):
             if rpc_request_flag:
                 start_time = time.time()
                 start_rss, start_vms = psutil.Process(os.getpid()).get_memory_info()
-            
+
             import openerp.addons.base as base
             base.ir.ir_cron.ir_cron._acquire_job(db_name)
             openerp.modules.registry.RegistryManager.delete(db_name)
@@ -780,16 +778,18 @@ class WorkerCron(Worker):
             if len(db_names) > 1:
                 openerp.sql_db.close_db(db_name)
             if rpc_request_flag:
-                end_time = time.time()
+                run_time = time.time() - start_time
                 end_rss, end_vms = psutil.Process(os.getpid()).get_memory_info()
-                logline = '%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % (db_name, end_time - start_time, start_vms / 1024, end_vms / 1024, (end_vms - start_vms)/1024)
+                vms_diff = (end_vms - start_vms) / 1024
+                logline = '%s time:%.3fs mem: %sk -> %sk (diff: %sk)' % \
+                    (db_name, run_time, start_vms / 1024, end_vms / 1024, vms_diff)
                 _logger.debug("WorkerCron (%s) %s", self.pid, logline)
 
             self.request_count += 1
             if self.request_count >= self.request_max and self.request_max < len(db_names):
                 _logger.error("There are more dabatases to process than allowed "
-                    "by the `limit_request` configuration variable: %s more.",
-                    len(db_names) - self.request_max)
+                              "by the `limit_request` configuration variable: %s more.",
+                              len(db_names) - self.request_max)
         else:
             self.db_index = 0
 
@@ -822,7 +822,7 @@ def _reexec(updated_modules=None):
         subprocess.call('net stop {0} && net start {0}'.format(nt_service_name), shell=True)
     exe = os.path.basename(sys.executable)
     args = stripped_sys_argv()
-    args +=  ["-u", ','.join(updated_modules)]
+    args += ["-u", ','.join(updated_modules)]
     if not args or args[0] != exe:
         args.insert(0, exe)
     os.execv(sys.executable, args)
@@ -843,7 +843,8 @@ def load_test_file_py(registry, test_file):
                 for t in unittest2.TestLoader().loadTestsFromModule(mod_mod):
                     suite.addTest(t)
                 _logger.log(logging.INFO, 'running tests %s.', mod_mod.__name__)
-                result = unittest2.TextTestRunner(verbosity=2, stream=openerp.modules.module.TestStream()).run(suite)
+                stream = openerp.modules.module.TestStream()
+                result = unittest2.TextTestRunner(verbosity=2, stream=stream).run(suite)
                 success = result.wasSuccessful()
                 registry._assertion_report.report_result(success)
                 if not success:
@@ -859,7 +860,7 @@ def preload_registries(dbnames):
     for dbname in dbnames:
         try:
             update_module = config['init'] or config['update']
-            registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
+            registry = RegistryManager.new(dbname, update_module=update_module)
             # run test_file if provided
             if test_file:
                 _logger.info('loading test file %s', test_file)

From e027b3b44758079d78d9dcd7a98d35c0b017438d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Sat, 22 Feb 2014 00:10:10 +0100
Subject: [PATCH 131/134] [FIX] damn! correct import

bzr revid: chs@openerp.com-20140221231010-nxwqfgtn6477ewvg
---
 openerp/service/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 339f4c35101..ec78aac86a9 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -31,7 +31,7 @@ except ImportError:
     setproctitle = lambda x: None
 
 import openerp
-from openerp.module.registry import RegistryManager
+from openerp.modules.registry import RegistryManager
 from openerp.release import nt_service_name
 import openerp.tools.config as config
 from openerp.tools.misc import stripped_sys_argv, dumpstacks

From 5580324bbf830734cf844f9b0553ec6541bf0c04 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 23 Feb 2014 07:07:06 +0000
Subject: [PATCH 132/134] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140222063856-jg0p4f82hy0yw5f0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222063912-upicgao9ly9iu2wf
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223070706-qx82kgcpxvuqfmod
---
 .../analytic_contract_hr_expense/i18n/ja.po   |   4 +-
 addons/portal_project/i18n/fi.po              |  37 +++++
 addons/portal_project_issue/i18n/fi.po        |  47 ++++++
 addons/product_expiry/i18n/am.po              | 149 ++++++++++++++++++
 openerp/addons/base/i18n/ab.po                |   4 +-
 openerp/addons/base/i18n/af.po                |   4 +-
 openerp/addons/base/i18n/am.po                |   4 +-
 openerp/addons/base/i18n/ar.po                |   4 +-
 openerp/addons/base/i18n/bg.po                |   4 +-
 openerp/addons/base/i18n/bn.po                |   4 +-
 openerp/addons/base/i18n/bs.po                |   4 +-
 openerp/addons/base/i18n/ca.po                |   4 +-
 openerp/addons/base/i18n/cs.po                |   4 +-
 openerp/addons/base/i18n/da.po                |   4 +-
 openerp/addons/base/i18n/de.po                |   4 +-
 openerp/addons/base/i18n/el.po                |   4 +-
 openerp/addons/base/i18n/en_GB.po             |   4 +-
 openerp/addons/base/i18n/es.po                |   4 +-
 openerp/addons/base/i18n/es_AR.po             |   4 +-
 openerp/addons/base/i18n/es_BO.po             |   4 +-
 openerp/addons/base/i18n/es_CL.po             |   4 +-
 openerp/addons/base/i18n/es_CR.po             |   4 +-
 openerp/addons/base/i18n/es_DO.po             |   4 +-
 openerp/addons/base/i18n/es_EC.po             |   4 +-
 openerp/addons/base/i18n/es_MX.po             |   4 +-
 openerp/addons/base/i18n/es_PE.po             |   4 +-
 openerp/addons/base/i18n/es_VE.po             |   4 +-
 openerp/addons/base/i18n/et.po                |   4 +-
 openerp/addons/base/i18n/eu.po                |   4 +-
 openerp/addons/base/i18n/fa.po                |   4 +-
 openerp/addons/base/i18n/fa_AF.po             |   4 +-
 openerp/addons/base/i18n/fi.po                |  18 +--
 openerp/addons/base/i18n/fr.po                |   4 +-
 openerp/addons/base/i18n/fr_CA.po             |   4 +-
 openerp/addons/base/i18n/gl.po                |   4 +-
 openerp/addons/base/i18n/gu.po                |   4 +-
 openerp/addons/base/i18n/he.po                |   4 +-
 openerp/addons/base/i18n/hi.po                |   4 +-
 openerp/addons/base/i18n/hr.po                |   4 +-
 openerp/addons/base/i18n/hu.po                |   4 +-
 openerp/addons/base/i18n/hy.po                |   4 +-
 openerp/addons/base/i18n/id.po                |   4 +-
 openerp/addons/base/i18n/is.po                |   4 +-
 openerp/addons/base/i18n/it.po                |   4 +-
 openerp/addons/base/i18n/ja.po                |  26 ++-
 openerp/addons/base/i18n/ka.po                |   4 +-
 openerp/addons/base/i18n/kk.po                |   4 +-
 openerp/addons/base/i18n/ko.po                |   4 +-
 openerp/addons/base/i18n/lt.po                |   4 +-
 openerp/addons/base/i18n/lv.po                |   4 +-
 openerp/addons/base/i18n/mk.po                |   4 +-
 openerp/addons/base/i18n/mn.po                |   4 +-
 openerp/addons/base/i18n/nb.po                |   4 +-
 openerp/addons/base/i18n/nl.po                |   4 +-
 openerp/addons/base/i18n/nl_BE.po             |   4 +-
 openerp/addons/base/i18n/pl.po                |   4 +-
 openerp/addons/base/i18n/pt.po                |   4 +-
 openerp/addons/base/i18n/pt_BR.po             |   4 +-
 openerp/addons/base/i18n/ro.po                |   4 +-
 openerp/addons/base/i18n/ru.po                |   4 +-
 openerp/addons/base/i18n/sk.po                |   4 +-
 openerp/addons/base/i18n/sl.po                |   4 +-
 openerp/addons/base/i18n/sq.po                |   4 +-
 openerp/addons/base/i18n/sr.po                |   4 +-
 openerp/addons/base/i18n/sr@latin.po          |   4 +-
 openerp/addons/base/i18n/sv.po                |   4 +-
 openerp/addons/base/i18n/th.po                |   4 +-
 openerp/addons/base/i18n/tlh.po               |   4 +-
 openerp/addons/base/i18n/tr.po                |   4 +-
 openerp/addons/base/i18n/uk.po                |   4 +-
 openerp/addons/base/i18n/ur.po                |   4 +-
 openerp/addons/base/i18n/vi.po                |   4 +-
 openerp/addons/base/i18n/zh_CN.po             |   4 +-
 openerp/addons/base/i18n/zh_HK.po             |   4 +-
 openerp/addons/base/i18n/zh_TW.po             |   4 +-
 75 files changed, 404 insertions(+), 153 deletions(-)
 create mode 100644 addons/portal_project/i18n/fi.po
 create mode 100644 addons/portal_project_issue/i18n/fi.po
 create mode 100644 addons/product_expiry/i18n/am.po

diff --git a/addons/analytic_contract_hr_expense/i18n/ja.po b/addons/analytic_contract_hr_expense/i18n/ja.po
index 2f2b5c3dd6a..3be80b97079 100644
--- a/addons/analytic_contract_hr_expense/i18n/ja.po
+++ b/addons/analytic_contract_hr_expense/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-21 05:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:39+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
diff --git a/addons/portal_project/i18n/fi.po b/addons/portal_project/i18n/fi.po
new file mode 100644
index 00000000000..3d84cb911de
--- /dev/null
+++ b/addons/portal_project/i18n/fi.po
@@ -0,0 +1,37 @@
+# Finnish 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: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2014-02-22 20:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@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:07+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: portal_project
+#: model:ir.actions.act_window,help:portal_project.open_view_project
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Klikkaa aloittaaksesi uuden projektin.\n"
+"                </p>\n"
+"            "
+
+#. module: portal_project
+#: model:ir.actions.act_window,name:portal_project.open_view_project
+#: model:ir.ui.menu,name:portal_project.portal_services_projects
+msgid "Projects"
+msgstr "Projektit"
diff --git a/addons/portal_project_issue/i18n/fi.po b/addons/portal_project_issue/i18n/fi.po
new file mode 100644
index 00000000000..d18d7c113b2
--- /dev/null
+++ b/addons/portal_project_issue/i18n/fi.po
@@ -0,0 +1,47 @@
+# Finnish 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2014-02-22 20:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@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:07+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr "Luonti:"
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klikkaa luodaksesi palautteen.\n"
+"              </p><p>\n"
+"                Voit seurata palautteitasi ja niiden\n"
+"                etenemistä tästä valikosta.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr "Ilmoitukset"
diff --git a/addons/product_expiry/i18n/am.po b/addons/product_expiry/i18n/am.po
new file mode 100644
index 00000000000..d165d4ba279
--- /dev/null
+++ b/addons/product_expiry/i18n/am.po
@@ -0,0 +1,149 @@
+# Amharic 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2014-02-21 11:53+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Amharic <am@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 06:39+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "የእቃው የመቆያ ግዜ"
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number should be "
+"removed from the stock."
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods should be removed from the stock."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "የእቃው መጠቀምያ ግዜ"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "እቃ"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods starts deteriorating, without being dangerous yet."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "የእቃው የሚወገድበት ግዜ"
+
+#. module: product_expiry
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"This is the date on which an alert should be notified about the goods with "
+"this Serial Number."
+msgstr ""
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Serial Number"
+msgstr "መለያ ቁጥር"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before an "
+"alert should be notified."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "የሚወገድበት ቀን"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+msgid "Dates"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "የመጨረሻው ቀን"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "ያለፍ ጥሩ ቀናቶች"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods may become dangerous and must not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "ማሳወቅያ ቀን"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number start "
+"deteriorating, without being dangerous yet."
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number may become "
+"dangerous and must not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "እቃውን የማሳወቅያ ግዜ"
diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index 7dfa69f0083..1ba79c773ab 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:21+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 5b295dc2bcd..bd878c88ab3 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:32+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index e3894d9bc14..4ace71b27a2 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index 3c37c5afe93..f2b1d19a845 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -13,8 +13,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-02-14 06:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index 05e12422635..fb924a71ee6 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -13,8 +13,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-02-14 06:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index 6d91016de62..dcf88ca7472 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index 0e806d0408b..8bed1953e5e 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -13,8 +13,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-02-14 06:34+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index f262fe3ed8d..f2ebada45af 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -13,8 +13,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-02-14 06:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index 74fb7b939dc..b5287f5e5cf 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -13,8 +13,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-02-14 06:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index fdd4121f77b..c6896676db7 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 4c9d52d776b..b7edb6538d3 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.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-02-14 06:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 3235391d7a1..4e3ca231f5a 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -12,8 +12,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-02-14 06:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 19199e3984f..2d994f939da 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 94dd68dd4fb..1742dcd47b4 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -13,8 +13,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-02-14 06:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index 5dc6f4ff6f1..566df655074 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 01752c54c0c..31a6b94f4a3 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 92f2f2fb43e..f9fcdca13d4 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -13,8 +13,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-02-14 06:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 5a6c3036f2c..11a0d4a251e 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.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-02-14 06:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 "Language: \n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index 66c6c7dec57..ea34722c84f 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index ee6e0f006bd..186faa9b581 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -13,8 +13,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-02-14 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index 6dbee6f72f5..d89de25fdd9 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index 5c582182184..a6f2ee68a72 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index c77bb1d8597..d7e904151fb 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 2d49cc78eda..4c01f795065 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -13,8 +13,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-02-14 06:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index f2e9b88d7f1..0be7283054d 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:23+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index b322c074c5f..8e74b1763f3 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -9,8 +9,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-02-14 06:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:30+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-Language: Persian\n"
 
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 06d57f17ed5..71f3a3149b4 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:49+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index 9884ef8b1ff..baf411092bc 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -13,8 +13,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-02-14 06:36+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,7 +25,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Moduuli Šekkien kirjoittamisen ja tulostamiseen.\n"
+"Moduuli Shekkien kirjoittamisen ja tulostamiseen.\n"
 "===========================================\n"
 "    "
 
@@ -129,7 +129,7 @@ msgstr ""
 "Moduuli joka lisää valmistajat ja ominaisuudet tuotelomakkeelle.\n"
 "=========================================================\n"
 "\n"
-"Voit net määritellä tuotteelle seuraavat tiedot:\n"
+"Voit nyt määritellä tuotteelle seuraavat tiedot:\n"
 "---------------------------------------------------------\n"
 "    * Valmistaja\n"
 "    * Valmistajan tuotenimi\n"
@@ -688,7 +688,7 @@ msgstr "Palau"
 #. module: base
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Myynti ja hankinta"
+msgstr "Myynnit & Ostot"
 
 #. module: base
 #: view:ir.translation:0
@@ -3836,7 +3836,7 @@ msgstr "Raportointi"
 #: field:res.partner,title:0
 #: field:res.partner.title,name:0
 msgid "Title"
-msgstr "Yhtiömuoto"
+msgstr "Titteli"
 
 #. module: base
 #: help:ir.property,res_id:0
@@ -10138,7 +10138,7 @@ msgstr ""
 #: view:res.groups:0
 #: field:res.partner,comment:0
 msgid "Notes"
-msgstr "Huomautukset"
+msgstr "Muistiinpanot"
 
 #. module: base
 #: field:ir.config_parameter,value:0
@@ -15482,7 +15482,7 @@ msgstr "Matkapuhelinnumero"
 #: model:ir.model,name:base.model_res_partner_category
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr "Kumppanien ryhmät"
+msgstr "Kumppaniryhmät"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -15690,7 +15690,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Internal Notes"
-msgstr "Sisäiset huomautukset"
+msgstr "Sisäiset muistiinpanot"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 7b2512d903e..5c779ab7aa9 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -13,8 +13,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-02-14 06:36+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index 780bc801f39..73af473040b 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:46+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index f0708a9968f..deab7d8a675 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index a663cc2336f..c12e8215468 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 546bd34144e..3b59cc71343 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:37+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:26+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index fdb6f8a7733..854c1445870 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.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-02-14 06:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index 0b634c571a8..5879a1a5096 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -13,8 +13,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-02-14 06:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:32+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 "Language: hr\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 91c34ae6657..a2b2b32d75b 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -13,8 +13,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-02-14 06:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index b7cd2bb6b60..6a2b22db2f4 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -9,8 +9,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-02-14 06:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index dc136feb360..92763eb1b10 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 8f82dae30ee..693c2c845ef 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:38+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:27+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index af28660269a..f99d805b221 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -13,8 +13,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-02-14 06:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index abca6dce0dd..7acfaa75b85 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -2295,7 +2295,7 @@ msgstr "メソッド"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_crypt
 msgid "Password Encryption"
-msgstr ""
+msgstr "パスワード暗号化"
 
 #. module: base
 #: view:workflow.activity:0
@@ -8016,6 +8016,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                クリックしてアドレス帳に連絡先を追加してください。\n"
+"              </p><p>\n"
+"                OpenERPは顧客、ディスカッション、商機の履歴、文書など関連するすべての活動の追跡を容易にします。\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
@@ -9789,7 +9795,7 @@ msgstr "ドイツ"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_oauth
 msgid "OAuth2 Authentication"
-msgstr ""
+msgstr "OAuth2認証"
 
 #. module: base
 #: view:workflow:0
@@ -10032,6 +10038,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                クリックしてアドレス帳に連絡先を追加してください。\n"
+"              </p><p>\n"
+"                OpenERPは仕入先、ディスカッション、購入の履歴、文書など関連するすべての活動の追跡を容易にします。\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:res.country,name:base.lr
@@ -15563,6 +15575,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                クリックしてアドレス帳に連絡先を追加してください。\n"
+"              </p><p>\n"
+"                OpenERPは顧客、ディスカッション、商機の履歴、文書など関連するすべての活動の追跡を容易にします。\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_2
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index 23febc50180..a07e569fc58 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:36+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:25+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index be14353dbbb..fd1401f3b2f 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 7f8a6294d67..68a67e8dd50 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:28+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index 41bf6184d54..860fd218a82 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -13,8 +13,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-02-14 06:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 2dffa10010b..7267dd928f4 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:39+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 959625eb326..ca43ebc0830 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.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-02-14 06:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 0a7fdda48bb..2399a1f42fb 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -13,8 +13,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-02-14 06:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index fa284c499cc..24238f3930a 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:29+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 437b1573219..262497dc979 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -13,8 +13,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-02-14 06:35+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:24+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index 68516ab59e0..f8fd7bf1233 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:36+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index 153b4e2d6e4..743a7aa0584 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -13,8 +13,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-02-14 06:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:30+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index ccc2c104bda..0b8bb5e0298 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -13,8 +13,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-02-14 06:41+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:30+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index cb4d741324a..005ec2713fe 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:45+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index e7e599f738f..e9a77c2cb6a 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -13,8 +13,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-02-14 06:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index 78a9fc009d3..59cab185b27 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -13,8 +13,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-02-14 06:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index cf4d85d449d..a4cb967cdbb 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:32+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index a8875055ba1..f86dbc72f64 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -13,8 +13,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-02-14 06:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:32+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index 1944d14c787..9fb318a5422 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -13,8 +13,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-02-14 06:33+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:22+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 64353f30337..7bae2e9c48a 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:42+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:31+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index f816a58a2f4..f307be9e8b0 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:49+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:38+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 901f0879025..765f5a23578 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -13,8 +13,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-02-14 06:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 9bfa5e24012..afd43cf2210 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index a5ec6474b4a..877e3c9c0ce 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -13,8 +13,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-02-14 06:43+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:33+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 49f4b9beda2..e18e16a8b2e 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -13,8 +13,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-02-14 06:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index 9820330aa71..a4c380e217e 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -13,8 +13,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-02-14 06:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 56aeeaac51e..0907705cd6c 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 0d0344feb28..a88ebdc9981 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:34+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 8ae359ba3ae..e6dc69d2355 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -13,8 +13,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-02-14 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 37770edda37..0d10f810bb9 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 06:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:35+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 47f285186dc..0b50ad3e1d8 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -13,8 +13,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-02-14 06:47+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-02-22 06:37+0000\n"
+"X-Generator: Launchpad (build 16926)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

From 3e31d2cb03df69a92b90a7b2b717eaef0f92387e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 24 Feb 2014 10:55:53 +0100
Subject: [PATCH 133/134] [IMP] Allow to press select where you want the new
 line

bzr revid: fp@tinyerp.com-20140224095553-qc4lhnpetczl1t7v
---
 addons/website/views/snippets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 50d5d8e616c..968d4683449 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -688,22 +688,22 @@
                     <div class="col-md-3 text-center">
                         <span class="fa fa-suitcase fa-5x"></span>
                         <h3 class="mt8 mb0">First Feature</h3>
-                        <p class="text-muted">Tell what's the value for the customer for this feature.</p>
+                        <div class="text-muted">Tell what's the value for the customer for this feature.</div>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-lock fa-5x"></span>
                         <h3 class="mt8 mb0">Second Feature</h3>
-                        <p class="text-muted">Write what the customer would like to know, not what you want to show.</p>
+                        <div class="text-muted">Write what the customer would like to know, not what you want to show.</div>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-heart fa-5x"></span>
                         <h3 class="mt8 mb0">Third Feature</h3>
-                        <p class="text-muted">A small explanation of this great feature, in clear words.</p>
+                        <div class="text-muted">A small explanation of this great feature, in clear words.</div>
                     </div>
                     <div class="col-md-3 text-center">
                         <span class="fa fa-credit-card fa-5x"></span>
                         <h3 class="mt8 mb0">Fourth Feature</h3>
-                        <p class="text-muted">A small explanation of this great feature on two lines.</p>
+                        <div class="text-muted">A small explanation of this great feature on two lines.</div>
                     </div>
                 </div>
             </div>

From 6df317c54629e5c222e8db511b38ada767ec60af Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 24 Feb 2014 11:32:35 +0100
Subject: [PATCH 134/134] [FIX] website's translation problems on multiple
 inheritance

bzr revid: fme@openerp.com-20140224103235-2s9de5k71xfa2qko
---
 openerp/addons/base/ir/ir_ui_view.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index aafce29b7eb..d4655bf8b9c 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -316,14 +316,14 @@ class view(osv.osv):
                 return node
         return None
 
-    def inherit_branding(self, specs_tree, view_id, source_id):
+    def inherit_branding(self, specs_tree, view_id, root_id):
         for node in specs_tree.iterchildren(tag=etree.Element):
             xpath = node.getroottree().getpath(node)
             if node.tag == 'data' or node.tag == 'xpath':
-                self.inherit_branding(node, view_id, source_id)
+                self.inherit_branding(node, view_id, root_id)
             else:
                 node.set('data-oe-id', str(view_id))
-                node.set('data-oe-source-id', str(source_id))
+                node.set('data-oe-source-id', str(root_id))
                 node.set('data-oe-xpath', xpath)
                 node.set('data-oe-model', 'ir.ui.view')
                 node.set('data-oe-field', 'arch')
@@ -397,7 +397,7 @@ class view(osv.osv):
 
         return source
 
-    def apply_view_inheritance(self, cr, uid, source, source_id, model, context=None):
+    def apply_view_inheritance(self, cr, uid, source, source_id, model, root_id=None, context=None):
         """ Apply all the (directly and indirectly) inheriting views.
 
         :param source: a parent architecture to modify (with parent modifications already applied)
@@ -408,13 +408,15 @@ class view(osv.osv):
         :return: a modified source where all the modifying architecture are applied
         """
         if context is None: context = {}
+        if root_id is None:
+            root_id = source_id
         sql_inherit = self.pool.get('ir.ui.view').get_inheriting_views_arch(cr, uid, source_id, model, context=context)
         for (specs, view_id) in sql_inherit:
             specs_tree = etree.fromstring(specs.encode('utf-8'))
             if context.get('inherit_branding'):
-                self.inherit_branding(specs_tree, view_id, source_id)
+                self.inherit_branding(specs_tree, view_id, root_id)
             source = self.apply_inheritance_specs(cr, uid, source, specs_tree, view_id, context=context)
-            source = self.apply_view_inheritance(cr, uid, source, view_id, model, context=context)
+            source = self.apply_view_inheritance(cr, uid, source, view_id, model, root_id=root_id, context=context)
         return source
 
     def read_combined(self, cr, uid, view_id, fields=None, context=None):