From 12bd173f74cc267e3b0fc86c859e3cdc2930e79e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 14 Dec 2012 11:51:09 +0530
Subject: [PATCH 001/197] [IMP]Improved code for Broken icons on list view of
 Scheduled Calls.

bzr revid: psa@tinyerp.com-20121214062109-wandtyzn87fgg71t
---
 addons/crm/crm_phonecall_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index e070f8fd8d3..74b2ecd5069 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -36,11 +36,13 @@
                 <button string="Meeting"
                     states="open,pending"
                     name="action_make_meeting"
+                    icon="gtk-redo"
                     type="object"/>
                 <button string="Convert to Opportunity"
                     type="object"
                     name="action_button_convert2opportunity"
                     states="open,pending"
+                    icon="gtk-index"
                     attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                 <field name="partner_phone"/>
                 <field name="user_id"/>

From 01c995027f3ccee1561c14dca24bdbeee48a399e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 14 Dec 2012 12:54:11 +0530
Subject: [PATCH 002/197] [IMP] Improved code for Default value for 'Based on'
 in pricelist items should be 'Public Price'.

bzr revid: psa@tinyerp.com-20121214072411-3knexu4ppkq611ca
---
 addons/product/pricelist.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 60736323054..a95b3a26ef8 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -379,7 +379,7 @@ class product_pricelist_item(osv.osv):
     _description = "Pricelist item"
     _order = "sequence, min_quantity desc"
     _defaults = {
-        'base': lambda *a: -1,
+        'base': lambda *a: 1,
         'min_quantity': lambda *a: 0,
         'sequence': lambda *a: 5,
         'price_discount': lambda *a: 0,

From 794de5d30e3572491fd1b7654487f6c6fd06799c Mon Sep 17 00:00:00 2001
From: "Anand Patel (OpenERP)" <pan@tinyerp.com>
Date: Fri, 14 Dec 2012 14:36:04 +0530
Subject: [PATCH 003/197] [IMP]Improved code for sale settings in that user
 access rights view

bzr revid: pan@tinyerp.com-20121214090604-8g5frp8mk55xm1et
---
 .../security/account_analytic_analysis_security.xml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
index 948c390e039..db9581e2444 100644
--- a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
+++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
@@ -8,7 +8,7 @@
 
     <record id="group_template_required" model="res.groups">
         <field name="name">Mandatory use of templates in contracts</field>
-        <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="category_id" ref="base.module_category_hidden"/>
         <field name="comment">the field template of the analytic accounts and contracts will be required.</field>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>

From e801fd546a4b8fb3c602dae89175dd06f8b0dab9 Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Fri, 14 Dec 2012 14:43:00 +0530
Subject: [PATCH 004/197] [IMP] Improved HR module Employee tags

bzr revid: ggh@tinyerp.com-20121214091300-4cz6wbaub022damr
---
 addons/hr/hr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 21c2e0fc6da..7062f053b5e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -46,9 +46,9 @@ class hr_employee_category(osv.osv):
     _name = "hr.employee.category"
     _description = "Employee Category"
     _columns = {
-        'name': fields.char("Category", size=64, required=True),
+        'name': fields.char("Employee Tag", size=64, required=True),
         'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
-        'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
+        'parent_id': fields.many2one('hr.employee.category', 'Parent Employee Tag', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'),
         'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'),
     }

From 3d3e08913d5d9a85aae58b135ff4da83a2e27b29 Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Fri, 14 Dec 2012 16:07:01 +0530
Subject: [PATCH 005/197] [IMP] Improve hr_holidays tooltip

bzr revid: ggh@tinyerp.com-20121214103701-h9i7s9si1lwzqtdc
---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 23e23dd33b5..fdd4f1babe5 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -79,7 +79,7 @@ class hr_holidays_status(osv.osv):
         'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
             help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and will not take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),

From c6ff1f2fb57b8ba0d0eaca734a03de9b800743ee Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Fri, 14 Dec 2012 18:02:47 +0530
Subject: [PATCH 006/197] [IMP] Improved sql_constraint in hr Job Positions

bzr revid: ggh@tinyerp.com-20121214123247-mr9xz5f6pnos84pd
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7062f053b5e..b8702a50b8c 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -121,7 +121,7 @@ class hr_job(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_company_uniq', 'unique(name, company_id)', 'The name of the job position must be unique per company!'),
+        ('name_company_uniq', 'unique(name, company_id, department_id)', 'The name of the job position must be unique per company!'),
     ]
 
 

From 6e8c9b9d686f954a9d0d12793013a8dbddb7455c Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Fri, 14 Dec 2012 18:56:56 +0530
Subject: [PATCH 007/197] [IMP]Improved Constraint Error message in job
 positions

bzr revid: ggh@tinyerp.com-20121214132656-opjfm3ruu0vloaqx
---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index b8702a50b8c..8185c906582 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -121,7 +121,7 @@ class hr_job(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_company_uniq', 'unique(name, company_id, department_id)', 'The name of the job position must be unique per company!'),
+        ('name_company_uniq', 'unique(name, company_id, department_id)', 'The name of the job position must be unique per department in company!'),
     ]
 
 

From 1165b5122b2b76792bf23685712a14d747956cad Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Mon, 17 Dec 2012 18:37:06 +0530
Subject: [PATCH 008/197] [IMP]Improve Code

bzr revid: vja@tinyerp.com-20121217130706-0xkms3vltsdzd9nq
---
 addons/mrp/mrp_view.xml         | 1 +
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d5bc6d94507..a122d1317b2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -545,6 +545,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="domain">[('bom_id', '=',active_ids)]</field>
+            <field name="view_type">tree</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
diff --git a/addons/project/project.py b/addons/project/project.py
index 2e5a990bc5c..ee9e21dc2bc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -939,7 +939,7 @@ class task(base_stage, osv.osv):
             if task.child_ids:
                 for child in task.child_ids:
                     if child.state in ['draft', 'open', 'pending']:
-                        raise osv.except_osv(_("Warning !"), _("Child task still open.\nPlease cancel or complete child task first."))
+                        raise osv.except_osv(_("Warning !"), _("One or more delegated tasks are still open.\nPlease cancel or complete delegated tasks first."))
         return True
 
     def action_close(self, cr, uid, ids, context=None):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 499ebc3e2c5..712d1ba558c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -75,6 +75,7 @@
                                             <div style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                     <div class="oe_module_desc">
                                                         <field name="name"/>
                                                     </div>

From 43b5f538499432b2a92591c38e5f5b2251927cfa Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 18 Dec 2012 12:17:39 +0530
Subject: [PATCH 009/197] [IMP] Improved code for 1) PO form view, 'Reset to
 draft' button is not needed, it should appear in cancel state only. 2) PO
 having 'RFQ sent' must be listed in Quotations by default, not in sales
 order.

bzr revid: psa@tinyerp.com-20121218064739-cqn3v3p3y56fck8g
---
 addons/purchase/purchase_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4cfad9cfb6f..26197666c69 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -174,7 +174,7 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
+                    <button name="action_cancel_draft" states="cancel,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
                 </header>
@@ -292,7 +292,7 @@
                     <field name="name" string="Reference"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','in',('draft','sent'))]" help="Purchase orders that haven't yet been confirmed"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>

From 1e1a1a330ac03718b6d771c65d30ef7d7cb34de4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 18 Dec 2012 12:59:30 +0530
Subject: [PATCH 010/197] [IMP] Improved code for Create a quotation, then
 print it:- problems in the pdf report (quantity unit of measure + quantity
 number blending)

bzr revid: psa@tinyerp.com-20121218072930-l1d2kb9v2hw215uo
---
 addons/purchase/report/request_quotation.rml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 8e5e73ee588..d97553601a2 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<document filename="requestforquotation.pdf">
+<document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
@@ -118,7 +118,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
+    <blockTable colWidths="349.0,90.0,92.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -133,7 +133,7 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
-      <blockTable colWidths="371.0,98.0,61.0" style="Table_Product_Line">
+      <blockTable colWidths="349.0,89.0,49.0,43.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
@@ -142,10 +142,10 @@
             <para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
-                [[ formatLang(order_line.product_qty )]]
-                <i>[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</i>
-            </para>
+            <para style="terp_default_Right_9">[[ formatLang(order_line.product_qty )]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>

From ca1f1732d6555d20bba8bdb1e698cf9ecb9e4122 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Tue, 18 Dec 2012 13:35:34 +0530
Subject: [PATCH 011/197] [IMP]In HR > Applications,when change department it
 shouldn't change stage

bzr revid: vja@tinyerp.com-20121218080534-tu8tlrjvoby38ydk
---
 addons/hr_recruitment/hr_recruitment.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index de1539da55a..786b6d06125 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -253,9 +253,8 @@ class hr_applicant(base_stage, osv.Model):
         return {'value': {'department_id': False}}
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
-        obj_recru_stage = self.pool.get('hr.recruitment.stage')
-        stage_ids = obj_recru_stage.search(cr, uid, ['|',('department_id','=',department_id),('department_id','=',False)], context=context)
-        stage_id = stage_ids and stage_ids[0] or False
+        stage_ids = self.browse(cr, uid,ids,context=context)
+        stage_id = stage_ids and stage_ids[0].stage_id.id or False
         return {'value': {'stage_id': stage_id}}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):

From 38c56a45f5e8e528697968dd3084f2ff8b787820 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 18 Dec 2012 14:20:08 +0530
Subject: [PATCH 012/197] [IMP] Improved code for 1). Changed report name
 test.pdf ==> requestforquotation.pdf. 2). Create a leave request for an
 employee: It will display False instead of taking the employee Name (works
 fine when creating for the Administrator)

bzr revid: psa@tinyerp.com-20121218085008-429nosi350ez5mgd
---
 addons/hr_holidays/hr_holidays_view.xml      | 2 +-
 addons/purchase/report/request_quotation.rml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f8b4ad07b77..9e2870d6dbe 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -41,7 +41,7 @@
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
                 <calendar string="Leave Request" color="user_id" date_start="date_from" date_stop="date_to">
-                    <field name="user_id"/>
+                    <field name="employee_id"/>
                     <field name="holiday_status_id"/>
                 </calendar>
             </field>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index d97553601a2..6c18a53921f 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="requestforquotation.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>

From 6e1dc8cfd2ba0da974dfc280544b030dc31712b7 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 19 Dec 2012 14:20:56 +0530
Subject: [PATCH 013/197] [IMP] Improved code for Create a leave request for an
 employee:     In right panel of calender view under the  user menu we can see
 the employee name.

bzr revid: psa@tinyerp.com-20121219085056-uaosi0k0z62puuct
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9e2870d6dbe..41dd39df31b 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -40,7 +40,7 @@
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <calendar string="Leave Request" color="user_id" date_start="date_from" date_stop="date_to">
+                <calendar string="Leave Request" color="employee_id" date_start="date_from" date_stop="date_to">
                     <field name="employee_id"/>
                     <field name="holiday_status_id"/>
                 </calendar>

From 164a8933fb2b79b7112440255546b0f1820c4b42 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 19 Dec 2012 15:02:27 +0530
Subject: [PATCH 014/197] [FIX]In Application,when create new application it
 should be comes in Initial Qualification

bzr revid: vja@tinyerp.com-20121219093227-qxsyow5lix6y2qa3
---
 addons/hr_recruitment/hr_recruitment.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 786b6d06125..160887d7484 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -253,9 +253,12 @@ class hr_applicant(base_stage, osv.Model):
         return {'value': {'department_id': False}}
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
-        stage_ids = self.browse(cr, uid,ids,context=context)
-        stage_id = stage_ids and stage_ids[0].stage_id.id or False
-        return {'value': {'stage_id': stage_id}}
+        obj_recru_stage = self.pool.get('hr.recruitment.stage')
+        list_stage_ids = obj_recru_stage.search(cr, uid, ['|',('department_id','=',department_id),('department_id','=',False)], context=context)
+        if ids:
+            stage_ids = self.browse(cr, uid,ids,context=context)[0].stage_id.id
+            return {'value': {'stage_id': stage_ids}}
+        return {'value': {'stage_id': list_stage_ids[0]}}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         data = {'partner_phone': False,

From 23528182af217cb4d1e3b43dea59f8a4d12b7dd0 Mon Sep 17 00:00:00 2001
From: Vishmita <vja@tinyerp.com>
Date: Wed, 19 Dec 2012 17:27:05 +0530
Subject: [PATCH 015/197] [Imp]Improve code

bzr revid: vja@tinyerp.com-20121219115705-xj8o2kr7j202mh89
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index ee9e21dc2bc..337cc898246 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -939,7 +939,7 @@ class task(base_stage, osv.osv):
             if task.child_ids:
                 for child in task.child_ids:
                     if child.state in ['draft', 'open', 'pending']:
-                        raise osv.except_osv(_("Warning !"), _("One or more delegated tasks are still open.\nPlease cancel or complete delegated tasks first."))
+                        raise osv.except_osv(_("Warning !"), _("One or more delegated tasks are still open. Please cancel or complete delegated tasks first."))
         return True
 
     def action_close(self, cr, uid, ids, context=None):

From 73cf8d29f9209c8adfcbed97248f6bcaaa220f41 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 5 Mar 2013 18:24:42 +0530
Subject: [PATCH 016/197] [IMP] Added EDIT button in message_followers template
 for editing the subtypes of the users.

bzr revid: psa@tinyerp.com-20130305125442-z8h470slga4d77ll
---
 addons/mail/mail_message_subtype.xml          | 15 ++++++++++++++-
 addons/mail/static/src/css/mail.css           |  6 ++++++
 addons/mail/static/src/js/mail_followers.js   | 19 +++++++++++++++++++
 addons/mail/static/src/xml/mail_followers.xml |  1 +
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index a79f5815bd1..156c366af30 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -5,7 +5,6 @@
         <record model="ir.ui.view" id="view_message_subtype_tree">
             <field name="name">mail.message.subtype.tree</field>
             <field name="model">mail.message.subtype</field>
-            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subtype">
                     <field name="name"/>
@@ -34,11 +33,25 @@
             </field>
         </record>
 
+
+        <record model="ir.ui.view" id="view_edit_message_subtype_tree">
+            <field name="name">edit.message.subtype.tree</field>
+            <field name="model">mail.message.subtype</field>
+            <field name="priority">9</field>
+            <field name="arch" type="xml">
+                <tree string="Edit Subtype" editable="top">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+
         <record model="ir.actions.act_window" id="action_view_message_subtype">
             <field name="name">Subtypes</field>
             <field name="res_model">mail.message.subtype</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_message_subtype_tree"/>
         </record>
         <menuitem name="Subtypes" id="menu_message_subtype" parent="base.menu_email" action="action_view_message_subtype"/>
 
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e4e112cdfaf..3ed2482911c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -617,6 +617,12 @@
     right: 0px;
     line-height: 20px;
 }
+.openerp .oe_followers .oe_edit_subtype{
+    cursor: pointer;
+    line-height: 26px;
+    position: absolute;
+    right: 12px;
+}
 
 .openerp .oe_followers .oe_show_more{
     cursor: pointer;
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 41634fd2135..ba776995d5b 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -74,10 +74,29 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
             // event: click on 'invite' button, that opens the invite wizard
             this.$('.oe_invite').on('click', self.on_invite_follower);
+            this.$el.on('click', '.oe_edit_subtype', self.on_edit_subtype);
             this.$el.on('click', '.oe_remove_follower', self.on_remove_follower);
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
         },
 
+        on_edit_subtype: function() {
+            var self = this;
+            var action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.message.subtype',
+                domain: [['res_model','=', self.view.model]],
+                view_mode: 'list',
+                view_type: 'list',
+                views: [[false, 'list']],
+                target: 'new',
+            }
+            this.do_action(action, {
+                on_close: function() {
+                    self.read_value();
+                },
+            });
+        },
+
         on_invite_follower: function (event) {
             var self = this;
             var action = {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 459f13155a0..c22d253b1f7 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,6 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 7c5ddd2de0ead278c488fb380992a7a344b4c916 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 6 Mar 2013 16:48:54 +0530
Subject: [PATCH 017/197] [IMP]Placed edit image in place of edit link and
 improved css.

bzr revid: psa@tinyerp.com-20130306111854-d95kiof2o4apc8ns
---
 addons/mail/mail_message_subtype.xml          |   2 +-
 addons/mail/static/src/css/mail.css           |   4 +++-
 addons/mail/static/src/img/icon-edit.gif      | Bin 0 -> 129 bytes
 addons/mail/static/src/xml/mail_followers.xml |   2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 addons/mail/static/src/img/icon-edit.gif

diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index 156c366af30..91317003e78 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -37,7 +37,7 @@
         <record model="ir.ui.view" id="view_edit_message_subtype_tree">
             <field name="name">edit.message.subtype.tree</field>
             <field name="model">mail.message.subtype</field>
-            <field name="priority">9</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Edit Subtype" editable="top">
                     <field name="name"/>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 3ed2482911c..8056c95ecb3 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -619,9 +619,11 @@
 }
 .openerp .oe_followers .oe_edit_subtype{
     cursor: pointer;
-    line-height: 26px;
     position: absolute;
     right: 12px;
+    margin-top: 6px;
+    width: 10px !important;
+    height: 12px !important;
 }
 
 .openerp .oe_followers .oe_show_more{
diff --git a/addons/mail/static/src/img/icon-edit.gif b/addons/mail/static/src/img/icon-edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e9aa5ef6599bb02e966d34994cc9f42a126ea5f
GIT binary patch
literal 129
zcmZ?wbhEHb<YC}pc+Ab<=;%1}?EmEC<j~O2SquzzGw<JFW%&P}k%58X%uI&=XMk)J
zp!kyoD96vB15^Msfro*CMeoB&&CaD;X83;amTFh^66_FOImOj+<*7oI_fqG-YF%Er
UH<?40kK;!r12f}!VMYdP0I0|`zyJUM

literal 0
HcmV?d00001

diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index c22d253b1f7..1e88deb7960 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <a t-if="widget.view_is_editable" class="oe_edit_subtype" title="Edit Subtype" t-att-data-id="record.id">Edit</a>
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 14317130c38bb254de5398c40847d293b9f51b32 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 8 Mar 2013 12:50:39 +0530
Subject: [PATCH 018/197] [IMP] added method for checking the group technical
 features is added or not.

bzr revid: psa@tinyerp.com-20130308072039-6iau8anuckonc6ps
---
 addons/mail/static/src/js/mail_followers.js   | 16 +++++++++++++++-
 addons/mail/static/src/xml/mail_followers.xml |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index ba776995d5b..5c6d3bc3347 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -31,6 +31,7 @@ openerp_mail_followers = function(session, mail) {
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
+            this.check_access = false;
 
             this.value = [];
             this.followers = [];
@@ -149,7 +150,20 @@ openerp_mail_followers = function(session, mail) {
             return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
                 .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
                 .then(this.proxy('display_buttons'))
-                .then(this.proxy('fetch_subtypes'));
+                .then(this.proxy('fetch_subtypes'))
+                .then(this.proxy('check_group_tech_feature'));
+        },
+
+        check_group_tech_feature: function(){
+            var self = this;
+            var edit_subtypes = new session.web.Model("res.groups");
+            edit_subtypes.query(["name","users"])
+                .filter([["name","=","Technical Features"], ["users","in",self.session.uid]]).first()
+                .then(function(res) {
+                if (res) {
+                    self.check_access = true;
+                    }
+                });
         },
 
         /** Read on res.partner failed: fall back on a generic case
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 1e88deb7960..18404c4ec05 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 0b62a6858f52a6d2e3edfaabdb64a71d2e0686fa Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 14 Mar 2013 15:59:49 +0530
Subject: [PATCH 019/197] [IMP] 1) Added code for opening the dialog box of
 edit followers, 2) Added an image in the mail.message.subtype template which
 is visible when the Technical Features menu is selected true . 3) On clicking
 on the edit pencil which is with the followers name gives the subtypes of the
 specific followers on which the user had clicked rather than the current
 form.

bzr revid: psa@tinyerp.com-20130314102949-4v9l6xpz5u1jeq10
---
 addons/mail/mail_message_subtype.py           |  1 -
 addons/mail/mail_message_subtype.xml          | 15 +----
 addons/mail/mail_thread.py                    | 49 ++++++++++++++-
 addons/mail/static/src/js/mail_followers.js   | 59 +++++++++++++++++--
 addons/mail/static/src/xml/mail_followers.xml |  3 +-
 5 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index bef6e427c3b..253ec600c6c 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -22,7 +22,6 @@
 from openerp.osv import osv
 from openerp.osv import fields
 
-
 class mail_message_subtype(osv.osv):
     """ Class holding subtype definition for messages. Subtypes allow to tune
         the follower subscription, allowing only some subtypes to be pushed
diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
index 91317003e78..a79f5815bd1 100644
--- a/addons/mail/mail_message_subtype.xml
+++ b/addons/mail/mail_message_subtype.xml
@@ -5,6 +5,7 @@
         <record model="ir.ui.view" id="view_message_subtype_tree">
             <field name="name">mail.message.subtype.tree</field>
             <field name="model">mail.message.subtype</field>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Subtype">
                     <field name="name"/>
@@ -33,25 +34,11 @@
             </field>
         </record>
 
-
-        <record model="ir.ui.view" id="view_edit_message_subtype_tree">
-            <field name="name">edit.message.subtype.tree</field>
-            <field name="model">mail.message.subtype</field>
-            <field name="priority">10</field>
-            <field name="arch" type="xml">
-                <tree string="Edit Subtype" editable="top">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-
         <record model="ir.actions.act_window" id="action_view_message_subtype">
             <field name="name">Subtypes</field>
             <field name="res_model">mail.message.subtype</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_message_subtype_tree"/>
         </record>
         <menuitem name="Subtypes" id="menu_message_subtype" parent="base.menu_email" action="action_view_message_subtype"/>
 
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 64b1410508d..2cec1557a55 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -138,9 +138,56 @@ class mail_thread(osv.AbstractModel):
             for subtype in fol.subtype_ids:
                 thread_subtype_dict[subtype.name]['followed'] = True
             res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
-
         return res
 
+    def edit_followers_subtype(self, cr, uid, ids, partner_id, context=None):
+        print "cr, uid, ids, partner_id, co",cr, uid, ids, partner_id
+        res = dict((id, dict(message_subtype_data='')) for id in ids)
+        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))
+        for id in ids:
+            res[id]['message_subtype_data'] = subtype_dict.copy()
+
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('res_id', 'in', ids),
+            ('res_model', '=', self._name),
+        ], context=context)
+        print "\n\n fol _ids>>>>>>>>>>", fol_ids
+        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
+            thread_subtype_dict = res[fol.res_id]['message_subtype_data']
+            for subtype in fol.subtype_ids:
+                thread_subtype_dict[subtype.name]['followed'] = True
+            res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
+        print "\n<<<<res partner>>>>",res
+        return res
+
+    def apply_subtype(self, cr, uid, ids, partner_id, context=None):
+        print "\n\n uid, ids, subtype_id,",  uid, ids, partner_id
+        res=[]
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('res_id', 'in', ids),
+            ('res_model', '=', self._name),
+        ], context=context)
+        print "\n\n fol _ids>>>>>>>>>>", fol_ids
+        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
+            print "\fol.subtype::::>:>:>:>:>", fol.subtype_ids
+            for subtype in fol.subtype_ids:
+                res.append(subtype.id)
+        print "\nres::::>:>:>:>:>", res
+        if partner_id==True:
+            res.append(ids[0])
+        else:
+            res.remove(ids[0])
+        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0,res)]}, context=context)
+        print "\nsubtype_id......>>>", partner_id, res
+        return partner_id
+
+
     def _search_message_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
         return [('message_ids.to_read', '=', True)]
 
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 5c6d3bc3347..031aeddb7d7 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -80,22 +80,72 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
         },
 
-        on_edit_subtype: function() {
+        on_edit_subtype: function(event) {
             var self = this;
+            var records = [];
+            var partner_id = $(event.target).data('id');
+            var id = this.view.datarecord.id;
+            var res_model = this.view.dataset.model;
+            console.log('thissssssssssssssss>>', this, id, partner_id);
+            var $dialog = session.web.dialog($('<div>'), {
+                            modal: true,
+                            title: partner_id,
+                            buttons: [
+                                    {text: _t("Apply"), click: function() { 
+                                  //     self.apply_subtype(id, partner_id);
+                                       $(this).dialog("close");
+                                        }
+                                    },
+                                    {text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                ],
+                    });
+            this.ds_model.call('edit_followers_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
+                .then(function (data) {
+              //      console.log('then>>>>>', data, id, partner_id);
+                    if (data[id]) {
+                        records = data[id].message_subtype_data;
+                //        console.log('records........', records);
+                        }
+                        _(records).each(function (record, record_name) {
+                            record.name = record_name;
+                            record.followed = record.followed || undefined;
+                           console.log('record??????????????', record);
+                           $(session.web.qweb.render("mail.followers.subtype", {'record': record})).appendTo($dialog);
+                        });
+                });
+
+    /*        var partner_id = $(event.target).data('id');
+            var context = new session.web.CompoundContext(this.build_context(), {});
+
             var action = {
                 type: 'ir.actions.act_window',
-                res_model: 'mail.message.subtype',
+                res_model: 'mail.message.subtype', //'subtype.edit.wizard', 
                 domain: [['res_model','=', self.view.model]],
                 view_mode: 'list',
                 view_type: 'list',
                 views: [[false, 'list']],
                 target: 'new',
+                context: {
+                    'res_model': this.view.dataset.model,
+                    'res_id': this.view.datarecord.id,
+                    'partner_id': partner_id,
+                },
             }
+            
             this.do_action(action, {
                 on_close: function() {
                     self.read_value();
                 },
-            });
+            });*/
+
+        },
+        
+        apply_subtype: function(id, partner_id) {
+            console.log('id>>>partner_id>>> ', id, partner_id);
+            this.ds_model.call('apply_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
+                .then(function (data) {
+                            console.log('dataaaaaaaaaaaaa', data);
+                });
         },
 
         on_invite_follower: function (event) {
@@ -154,7 +204,7 @@ openerp_mail_followers = function(session, mail) {
                 .then(this.proxy('check_group_tech_feature'));
         },
 
-        check_group_tech_feature: function(){
+        check_group_tech_feature: function() {
             var self = this;
             var edit_subtypes = new session.web.Model("res.groups");
             edit_subtypes.query(["name","users"])
@@ -276,6 +326,7 @@ openerp_mail_followers = function(session, mail) {
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
+                console.log('do follow>', record);
                 $(record).attr('checked', 'checked');
             });
         },
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 18404c4ec05..7721b1beb22 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,7 +32,8 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <!--t t-js="ab">console.log(':::::::::::;', ab);</t-->
+        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 2d4ec5c0f704c22bc4383253496c1bc8790ccc1e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 14 Mar 2013 18:54:17 +0530
Subject: [PATCH 020/197] [IMP] l10n_in: improve dat of tax codes

bzr revid: tpa@tinyerp.com-20130314132417-g02a9j5cf6s112bh
---
 addons/l10n_in/l10n_in_tax_code_template.xml | 269 ++++++++++++++++++-
 1 file changed, 265 insertions(+), 4 deletions(-)

diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 94217d79c3c..a5bcfd8524a 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -4,7 +4,7 @@
     <data noupdate="True">
 
         <record model="account.tax.code.template" id="vat_code_tax">
-            <field name="name">Tax</field>
+            <field name="name">Your Company</field>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_balance_net">
@@ -27,16 +27,277 @@
             <field name="parent_id" ref="vat_code_tax"/>
         </record>
 
-
         <record model="account.tax.code.template" id="vat_code_base_tax_sale">
-            <field name="name">Base of Taxed Sales</field>
+            <field name="name">Taxable Sale Bases</field>
             <field name="parent_id" ref="vat_code_base_net"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_base_tax_purchase">
-            <field name="name">Base of Taxed Purchases</field>
+            <field name="name">Taxable Purchase Bases</field>
             <field name="parent_id" ref="vat_code_base_net"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pur_CSTP5">
+            <field name="name">Cst 5% on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="code">CSTP5</field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_PCST5">
+            <field name="name">Purchase CST 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+            <field name="code">PCST5</field>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
+            <field name="name">Education Cess 2%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
+            <field name="name">Education Cess 2% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_import_duty">
+            <field name="name">Input Credit - Import Duty</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_edu_cess">
+            <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_modvat">
+            <field name="name">Input Credit on Capital Goods - Modvate</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_seco_hec">
+            <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_ic_st">
+            <field name="name">Input Credit - Service Tax</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_ic_edu_cess">
+            <field name="name">Input Credit - Service Tax Edu. Cess.</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_ic_seco_hec">
+            <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_edu">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
+            <field name="name">CST 2% on Sales</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cst5">
+            <field name="name">CST 5% on Sales</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
+            <field name="name">Input Additional Vat 1%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat2">
+            <field name="name">Input Additional Vat 2.5%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat12">
+            <field name="name">Input VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat15">
+            <field name="name">Input Vat 15%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat4">
+            <field name="name">Input Vat 4%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat1">
+            <field name="name">Output Adi. Vat @1%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
+            <field name="name">Output Vat @4%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
+            <field name="name">Cst 2% on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
+            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
+            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice5">
+            <field name="name">Excise Duty 5% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice6">
+            <field name="name">Excise Duty 6% on Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_urd">
+            <field name="name">Input Credit - URD</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_audit_fee">
+            <field name="name">Tds on Audit Fees - 94J</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_brokerage">
+            <field name="name">TDS on Commission Or Brokerage- 94H</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_contractor">
+            <field name="name">TDS on Contractor-94C</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_dir_intrest">
+            <field name="name"> TDS On Director's Interest</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_92b">
+            <field name="name">TDS on Director's Remuneration - 92B</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_intrest">
+            <field name="name">TDS on Interest</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_prof_fee">
+            <field name="name">TDS on Professional Fees - 94J</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_rent">
+            <field name="name">TDS on Rent-94I</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_sal">
+            <field name="name">TDS on Salary - 92B</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_tds_pur_import">
+            <field name="name">Import Purchase</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat">
+            <field name="name">Purchase Vat 4% / Vat12.5% / Vat15% / Cst2% / Cst5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_plant_machinery">
+            <field name="name">Plant &amp; Machinery</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_exp_act">
+            <field name="name">Expense Accounts</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_sales_vat">
+            <field name="name">Sales Vat 4% / Sales CST2% / Sales CST5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sale_cst12">
+            <field name="name">Sales CST2%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sale_cst15">
+            <field name="name">Sales CST5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat4">
+            <field name="name">Purchase Vat 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat12_vat15">
+            <field name="name">Purchase Vat12.5% / Vat15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat12">
+            <field name="name">Purchase Vat12.5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat15">
+            <field name="name">Purchase Vat15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat4">
+            <field name="name">Sales Vat 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_cst2">
+            <field name="name">Purchase Cst2%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_urd">
+            <field name="name">Purchase URD</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_base_tds">
+            <field name="name">Base Expenses for TDS</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
     </data>
 </openerp>

From f242c87c7e182dbe011bedb74b0fbfdecf89336a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 14 Mar 2013 19:11:22 +0530
Subject: [PATCH 021/197] [IMP] Now partner name is displayed as per the record
 and  added a new template.

bzr revid: psa@tinyerp.com-20130314134122-gedt3b9eq5kolnlt
---
 addons/mail/static/src/js/mail_followers.js   | 7 +++----
 addons/mail/static/src/xml/mail_followers.xml | 9 +++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 031aeddb7d7..41f227b5881 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -84,12 +84,12 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             var records = [];
             var partner_id = $(event.target).data('id');
+            var partner_name = $(event.target).siblings('a').text(); 
             var id = this.view.datarecord.id;
             var res_model = this.view.dataset.model;
-            console.log('thissssssssssssssss>>', this, id, partner_id);
             var $dialog = session.web.dialog($('<div>'), {
                             modal: true,
-                            title: partner_id,
+                            title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
                             buttons: [
                                     {text: _t("Apply"), click: function() { 
                                   //     self.apply_subtype(id, partner_id);
@@ -109,8 +109,7 @@ openerp_mail_followers = function(session, mail) {
                         _(records).each(function (record, record_name) {
                             record.name = record_name;
                             record.followed = record.followed || undefined;
-                           console.log('record??????????????', record);
-                           $(session.web.qweb.render("mail.followers.subtype", {'record': record})).appendTo($dialog);
+                           $(session.web.qweb.render("mail.followers.edit.subtype", {'record': record})).appendTo($dialog);
                         });
                 });
 
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7721b1beb22..071205803bb 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -50,6 +50,15 @@
         </table>
     </t>
 
+    <t t-name="mail.followers.edit.subtype">
+        <table class='oe_subtype'>
+            <tr>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+            </tr>
+        </table>
+    </t>
+
     <t t-name="mail.followers.show_more">
         <div class="oe_partner oe_show_more">And <t t-raw="number"/> more.</div>
     </t>

From 90868a808903c8f5812a4243092a448752f25100 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 14:22:45 +0530
Subject: [PATCH 022/197] [IMP] Add method for the apply button when the user
 click on the apply button of the dialog box the data will be updated Removed
 unwanted code and clean the code.

bzr revid: psa@tinyerp.com-20130315085245-uhefj63na5z62of5
---
 addons/mail/mail_thread.py                    | 26 ++------
 addons/mail/static/src/js/mail_followers.js   | 64 ++++++-------------
 addons/mail/static/src/xml/mail_followers.xml |  5 +-
 3 files changed, 29 insertions(+), 66 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2cec1557a55..d85e91fa8ba 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -141,8 +141,8 @@ class mail_thread(osv.AbstractModel):
         return res
 
     def edit_followers_subtype(self, cr, uid, ids, partner_id, context=None):
-        print "cr, uid, ids, partner_id, co",cr, uid, ids, partner_id
         res = dict((id, dict(message_subtype_data='')) for id in ids)
+
         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))
@@ -155,38 +155,24 @@ class mail_thread(osv.AbstractModel):
             ('res_id', 'in', ids),
             ('res_model', '=', self._name),
         ], context=context)
-        print "\n\n fol _ids>>>>>>>>>>", fol_ids
         for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
             thread_subtype_dict = res[fol.res_id]['message_subtype_data']
             for subtype in fol.subtype_ids:
                 thread_subtype_dict[subtype.name]['followed'] = True
             res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
-        print "\n<<<<res partner>>>>",res
         return res
 
-    def apply_subtype(self, cr, uid, ids, partner_id, context=None):
-        print "\n\n uid, ids, subtype_id,",  uid, ids, partner_id
-        res=[]
+    def apply_edited_subtypes(self, cr, uid, ids, partner_id,check_list, context=None):
+        """ Apply the edited subtypes
+                  of the user."""
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, uid, [
             ('partner_id', '=', partner_id),
             ('res_id', 'in', ids),
             ('res_model', '=', self._name),
         ], context=context)
-        print "\n\n fol _ids>>>>>>>>>>", fol_ids
-        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
-            print "\fol.subtype::::>:>:>:>:>", fol.subtype_ids
-            for subtype in fol.subtype_ids:
-                res.append(subtype.id)
-        print "\nres::::>:>:>:>:>", res
-        if partner_id==True:
-            res.append(ids[0])
-        else:
-            res.remove(ids[0])
-        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0,res)]}, context=context)
-        print "\nsubtype_id......>>>", partner_id, res
-        return partner_id
-
+        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6, 0, check_list)]}, context=context)
+        return True
 
     def _search_message_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
         return [('message_ids.to_read', '=', True)]
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 41f227b5881..0eb864d02da 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -87,24 +87,21 @@ openerp_mail_followers = function(session, mail) {
             var partner_name = $(event.target).siblings('a').text(); 
             var id = this.view.datarecord.id;
             var res_model = this.view.dataset.model;
-            var $dialog = session.web.dialog($('<div>'), {
+            var $dialog = session.web.dialog($('<div class = "oe_edit_actions">'), {
                             modal: true,
                             title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
                             buttons: [
-                                    {text: _t("Apply"), click: function() { 
-                                  //     self.apply_subtype(id, partner_id);
-                                       $(this).dialog("close");
-                                        }
-                                    },
-                                    {text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                    { text: _t("Apply"), click: function() { 
+                                        self.on_apply_subtype(id, partner_id);
+                                        $(this).dialog("close");
+                                    }},
+                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
-            this.ds_model.call('edit_followers_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
+            this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
                 .then(function (data) {
-              //      console.log('then>>>>>', data, id, partner_id);
                     if (data[id]) {
                         records = data[id].message_subtype_data;
-                //        console.log('records........', records);
                         }
                         _(records).each(function (record, record_name) {
                             record.name = record_name;
@@ -112,39 +109,21 @@ openerp_mail_followers = function(session, mail) {
                            $(session.web.qweb.render("mail.followers.edit.subtype", {'record': record})).appendTo($dialog);
                         });
                 });
-
-    /*        var partner_id = $(event.target).data('id');
-            var context = new session.web.CompoundContext(this.build_context(), {});
-
-            var action = {
-                type: 'ir.actions.act_window',
-                res_model: 'mail.message.subtype', //'subtype.edit.wizard', 
-                domain: [['res_model','=', self.view.model]],
-                view_mode: 'list',
-                view_type: 'list',
-                views: [[false, 'list']],
-                target: 'new',
-                context: {
-                    'res_model': this.view.dataset.model,
-                    'res_id': this.view.datarecord.id,
-                    'partner_id': partner_id,
-                },
-            }
-            
-            this.do_action(action, {
-                on_close: function() {
-                    self.read_value();
-                },
-            });*/
-
         },
-        
-        apply_subtype: function(id, partner_id) {
-            console.log('id>>>partner_id>>> ', id, partner_id);
-            this.ds_model.call('apply_subtype', [[id], [partner_id], new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {
-                            console.log('dataaaaaaaaaaaaa', data);
-                });
+
+        on_apply_subtype: function(id, partner_id) {
+            var checklist = new Array();
+            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
+                if ($(record).is(':checked')) {
+                    checklist.push(parseInt($(record).data('id')));
+                }
+            });
+            if (!checklist.length) {
+                this.do_unfollow();
+            } else {
+                this.ds_model.call('apply_edited_subtypes', [[id], partner_id, checklist, new session.web.CompoundContext(this.build_context(), {})])
+                    .then(this.proxy('read_value'));
+            }
         },
 
         on_invite_follower: function (event) {
@@ -325,7 +304,6 @@ openerp_mail_followers = function(session, mail) {
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
-                console.log('do follow>', record);
                 $(record).attr('checked', 'checked');
             });
         },
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 071205803bb..7a615044af1 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -32,8 +32,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <!--t t-js="ab">console.log(':::::::::::;', ab);</t-->
-        <img class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.uid === 1" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
@@ -53,7 +52,7 @@
     <t t-name="mail.followers.edit.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_edit_check"/></td>
                 <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>

From 96aa7aa6ea79c4927e8a7f65624cf7480d7356c9 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Mar 2013 16:28:46 +0530
Subject: [PATCH 023/197] [IMP] l10n_in:improved demo data of account tax

bzr revid: tpa@tinyerp.com-20130315105846-sgdli94fp6d8i8dp
---
 .../l10n_in/l10n_in_public_tax_template.xml   | 772 ++++++++++++------
 addons/l10n_in/l10n_in_tax_code_template.xml  |   7 +-
 2 files changed, 513 insertions(+), 266 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 03dbfa7cc75..79472c3e4b9 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -1,295 +1,537 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
-    <!-- Sales Tax -->
-    
-    <record id="sales_tax_public_main" model="account.tax.template">
-        <field name="name">Sale Tax-15%</field>
-        <field name="account_collected_id" ref="p24710"/>
-        <field name="account_paid_id" ref="p24710"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="sales_tax_public" model="account.tax.template">
-        <field name="name">Sale Tax-12%</field>
-        <field name="account_collected_id" ref="p24710"/>
-        <field name="account_paid_id" ref="p24710"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.12</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="sales_tax_public_4" model="account.tax.template">
-        <field name="name">Sale Tax-4%</field>
-        <field name="account_collected_id" ref="p24710"/>
-        <field name="account_paid_id" ref="p24710"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.04</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <!-- Purchase tax -->
-    
-    <record id="purchase_tax_public" model="account.tax.template">
-        <field name="name">Purchase Tax-15%</field>
-        <field name="account_collected_id" ref="p15400"/>
-        <field name="account_paid_id" ref="p15400"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
+
+    <record id="account_tax_cst_pur5" model="account.tax.template">
+        <field name="name">CST 5% - Purchase</field>
+        <field name="discription">CST 5% - Purchase</field>
         <field name="type_tax_use">purchase</field>
-        <field name="base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="tax_code_id" ref="vat_code_payable"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <!-- -->
-    
-    <!-- VAT -->
-    
-    <record id="vat_public_main" model="account.tax.template">
-        <field name="name">VAT-5%(4% VAT+1% Add. Tax.)</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.05</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.01</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="vat_public_main_tax" model="account.tax.template">
-        <field name="name">VAT-15% (12.5% VAT + 2.5% Add. Tax.)</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.15</field>
+    <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
+        <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
+        <field name="discription">Input Credit - Service Tax Seco. &amp; HEC</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="vat_public_tax" model="account.tax.template">
-        <field name="name">VAT-8%</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.08</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-        <record id="vat_public_tax_10" model="account.tax.template">
-        <field name="name">VAT-10%</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.10</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.0100</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_ic_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="vat_public_tax_12" model="account.tax.template">
-        <field name="name">VAT-12.5%</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">12.5</field>
+    <record id="account_tax_in_cradit_urd" model="account.tax.template">
+        <field name="name">Input Credit - URD</field>
+        <field name="discription">Input Credit - URD</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.0400</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_urd"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <!-- Service Tax -->
-    
-    <record id="service_public_main" model="account.tax.template">
-        <field name="name">Service Tax-12.30%</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/> 
+    <record id="account_tax_tds_audit_fee" model="account.tax.template">
+        <field name="name">Tds on Audit Fees - 94J</field>
+        <field name="discription">Tds on Audit Fees - 94J</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1000</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_audit_fee"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_brok" model="account.tax.template">
+        <field name="name">TDS on Commission Or Brokerage- 94H</field>
+        <field name="discription">TDS on Commission Or Brokerage- 94H</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1000</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_brokerage"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_import_duty" model="account.tax.template">
+        <field name="name">Input Credit - Import Duty</field>
+        <field name="discription">Input Credit - Import Duty</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0750</field>
+        <field name="sequence">1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_import_duty"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_add_duty4" model="account.tax.template">
+        <field name="name">Additional Duty (Imports) 4%</field>
+        <field name="discription">Additional Duty (Imports) 4%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0400</field>
+        <field name="sequence">1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_add_imp_duty"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_st" model="account.tax.template">
+        <field name="name">Input Credit - Service Tax</field>
+        <field name="discription">Input Credit - Service Tax</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
+        <field name="sequence">1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_ic_st"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_st_edu_cess" model="account.tax.template">
+        <field name="name">Input Credit - Service Tax Edu. Cess.</field>
+        <field name="discription">Input Credit - Service Tax Edu. Cess.</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_ic_edu_cess"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_sal" model="account.tax.template">
+        <field name="name">TDS on Salary - 92B</field>
+        <field name="discription">TDS on Salary - 92B</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.3000</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_sal"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exic6_pur" model="account.tax.template">
+        <field name="name">Excise Duty 6% on Purchase</field>
+        <field name="discription">Excise Duty 6% on Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0600</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice6"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exic5_pur" model="account.tax.template">
+        <field name="name">Excise Duty 5% - Purchase</field>
+        <field name="discription"></field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0500</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice5"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice12_pur" model="account.tax.template">
+        <field name="name">Excise Duty 12% - Purchase</field>
+        <field name="discription">Excise Duty 12% - Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
         <field name="include_base_amount" eval="True"/>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_edu_cess2_pur" model="account.tax.template">
+        <field name="name">Education Cess 2% - Purchase</field>
+        <field name="discription">Education Cess 2% - Purchase</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">21</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
+        <field name="parent_id" ref="account_tax_exice12_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_seco_high_cess_pur" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+        <field name="discription">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">22</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_edu"/>
+        <field name="parent_id" ref="account_tax_exice12_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice12_sale" model="account.tax.template">
+        <field name="name">Excise Duty - 12% - Sales</field>
+        <field name="discription">Excise Duty - 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
+        <field name="include_base_amount" eval="True"/>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_edu_cess2" model="account.tax.template">
+        <field name="name">Education Cess 2%</field>
+        <field name="discription">Education Cess 2%</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">2</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="parent_id" ref="account_tax_exice12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_seco_high_cess1" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+        <field name="discription">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">3</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
+        <field name="parent_id" ref="account_tax_exice12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst" model="account.tax.template">
+        <field name="name">CST</field>
+        <field name="discription">CST</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0000</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_adv" model="account.tax.template">
+        <field name="name">ADV</field>
+        <field name="discription">ADV</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_cap_good_sec_high" model="account.tax.template">
+        <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+        <field name="discription">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_seco_hec"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_contr" model="account.tax.template">
+        <field name="name">TDS on Contractor-94C</field>
+        <field name="discription">TDS on Contractor-94C</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_contractor"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_dir_intrest" model="account.tax.template">
+        <field name="name">TDS On Director's Interest</field>
+        <field name="discription">TDS On Director's Interest</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_dir_intrest"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_dir_renum" model="account.tax.template">
+        <field name="name">TDS on Director's Remuneration - 92B</field>
+        <field name="discription">TDS on Director's Remuneration - 92B</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.3</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_dir_ren"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_intrest" model="account.tax.template">
+        <field name="name">TDS on Interest</field>
+        <field name="discription">TDS on Interest</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_intrest"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_prof_fee" model="account.tax.template">
+        <field name="name">TDS on Professional Fees - 94J</field>
+        <field name="discription">TDS on Professional Fees - 94J</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="sequence">1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_prof_fee"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_rent" model="account.tax.template">
+        <field name="name">TDS on Rent-94I</field>
+        <field name="discription">TDS on Rent-94I</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_tds_rent"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_cap_edu_cess" model="account.tax.template">
+        <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
+        <field name="discription">Input Credit On Capital Goods - Edu. Cess</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_edu_cess"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_cap_modvat" model="account.tax.template">
+        <field name="name">Input Credit on Capital Goods - Modvate</field>
+        <field name="discription"><Input Credit on Capital Goods - Modvate/field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
         <field name="amount">0.12</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_modvat"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    <record id="service_tax_parent" model="account.tax.template">
-        <field name="name">Service Tax-%2</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/> 
-        <field name="include_base_amount" eval="True"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="amount">0.02</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="parent_id" ref="service_public_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="service_tax" model="account.tax.template">
-        <field name="name">Service Tax-%1</field>
-        <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/> 
-        <field name="include_base_amount" eval="True"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="parent_id" ref="service_public_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-<!-- Excise duty -->
 
-    <record id="exice_public_main" model="account.tax.template">
-        <field name="name">Excise Duty-10.30%</field>
-        <field name="account_collected_id" ref="p24730"/>
-        <field name="account_paid_id" ref="p24730"/>
-        <field name="include_base_amount" eval="True"/>
-        <field name="amount">0.10</field>
+    <record id="account_tax_in_vat4" model="account.tax.template">
+        <field name="name">Input Vat 4%</field>
+        <field name="discription">Input Vat 4%</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.04</field>
+        <field name="sequence">4</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="child_depend" eval="True"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
-    <record id="exice_duty_parent" model="account.tax.template">
-        <field name="name">Excise Duty-2%</field>
-        <field name="amount">0.02</field>
+
+    <record id="account_tax_in_add_vat1" model="account.tax.template">
+        <field name="name">Input Additional Vat 1%</field>
+        <field name="discription">Input Additional Vat 1%</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="p24730"/>
-        <field name="account_paid_id" ref="p24730"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="parent_id" ref="exice_public_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="exice_duty" model="account.tax.template">
-        <field name="name">Excise Duty-1%</field>
         <field name="amount">0.01</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="p24730"/>
-        <field name="account_paid_id" ref="p24730"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="parent_id" ref="exice_public_main"/>
+        <field name="sequence">5</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
+
+    <record id="account_tax_in_vat15" model="account.tax.template">
+        <field name="name">Input Vat 15%</field>
+        <field name="discription">Input Vat 15%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.15</field>
+        <field name="sequence">7</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat15"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_vat4" model="account.tax.template">
+        <field name="name">Output Vat @4%</field>
+        <field name="discription">Output Vat @4%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="sequence">11</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat4"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_adi_vat1" model="account.tax.template">
+        <field name="name">Output Adi. Vat @1%</field>
+        <field name="discription">Output Adi. Vat @1%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">12</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst2_sale" model="account.tax.template">
+        <field name="name">CST 2% on Sales</field>
+        <field name="discription">CST 2% on Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">13</field>
+        <field name="include_base_amount" eval="True"/>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_sale_cst12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst5_sale" model="account.tax.template">
+        <field name="name">CST 5% on Sales</field>
+        <field name="discription">CST 5% on Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.05</field>
+        <field name="sequence">14</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cst5"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_vat12" model="account.tax.template">
+        <field name="name">Input VAT 12.5%</field>
+        <field name="discription">Input VAT 12.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1250</field>
+        <field name="sequence">60</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_add_vat25" model="account.tax.template">
+        <field name="name">Input Additional Vat 2.5%</field>
+        <field name="discription">Input Additional Vat 2.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0250</field>
+        <field name="sequence">80</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat2"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst2_pur" model="account.tax.template">
+        <field name="name">Cst 2% on Purchase</field>
+        <field name="discription">Cst 2% on Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">9333</field>
+        <!--field name="account_collected_id" ref=""/>
+        <field name="account_paid_id" ref=""/-->
+        <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index a5bcfd8524a..ff2cd352bbf 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -199,7 +199,7 @@
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_92b">
+        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_dir_ren">
             <field name="name">TDS on Director's Remuneration - 92B</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
@@ -299,5 +299,10 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_add_imp_duty">
+            <field name="name">Additional Duty (Imports) 4%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
     </data>
 </openerp>

From b5df63291a0de2cbcd42a348db5ffa925f8e4efc Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 18:01:57 +0530
Subject: [PATCH 024/197] [IMP] Removed the dialog box on apply and close to
 open a new dialog box everytime. Removed unwanted code.

bzr revid: psa@tinyerp.com-20130315123157-n0n3fdej014ysz7v
---
 addons/mail/mail_message_subtype.py         |  1 +
 addons/mail/mail_thread.py                  |  6 ++--
 addons/mail/static/src/js/mail_followers.js | 37 +++++++--------------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index 253ec600c6c..bef6e427c3b 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -22,6 +22,7 @@
 from openerp.osv import osv
 from openerp.osv import fields
 
+
 class mail_message_subtype(osv.osv):
     """ Class holding subtype definition for messages. Subtypes allow to tune
         the follower subscription, allowing only some subtypes to be pushed
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index d85e91fa8ba..ab4eead1a6e 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -162,7 +162,8 @@ class mail_thread(osv.AbstractModel):
             res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
         return res
 
-    def apply_edited_subtypes(self, cr, uid, ids, partner_id,check_list, context=None):
+    def apply_edited_subtypes(self, cr, uid, ids, partner_id, check_list, context=None):
+        print "\n\n uid, ids, partner_id, check_list,,>", uid, ids, partner_id, check_list,
         """ Apply the edited subtypes
                   of the user."""
         fol_obj = self.pool.get('mail.followers')
@@ -171,7 +172,8 @@ class mail_thread(osv.AbstractModel):
             ('res_id', 'in', ids),
             ('res_model', '=', self._name),
         ], context=context)
-        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6, 0, check_list)]}, context=context)
+        print "\n fol _ids>", fol_ids, check_list
+        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0, check_list)]}, context=context)
         return True
 
     def _search_message_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0eb864d02da..0bfcbfc29e9 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -31,7 +31,6 @@ openerp_mail_followers = function(session, mail) {
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
-            this.check_access = false;
 
             this.value = [];
             this.followers = [];
@@ -87,15 +86,15 @@ openerp_mail_followers = function(session, mail) {
             var partner_name = $(event.target).siblings('a').text(); 
             var id = this.view.datarecord.id;
             var res_model = this.view.dataset.model;
-            var $dialog = session.web.dialog($('<div class = "oe_edit_actions">'), {
+            var $dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
                             modal: true,
                             title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.on_apply_subtype(id, partner_id);
-                                        $(this).dialog("close");
+                                        $dialog.remove();
                                     }},
-                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                    { text: _t("Cancel"), click: function() { $dialog.remove(); }}
                                 ],
                     });
             this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
@@ -112,16 +111,17 @@ openerp_mail_followers = function(session, mail) {
         },
 
         on_apply_subtype: function(id, partner_id) {
-            var checklist = new Array();
-            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
-                if ($(record).is(':checked')) {
-                    checklist.push(parseInt($(record).data('id')));
-                }
+            var check_list = new Array();
+            _($('.oe_edit_actions input[type="checkbox"]')).each(function (records) {
+                 if ($(records).is(':checked')) {
+                     check_list.push(parseInt($(records).data('id')));
+                 }
             });
-            if (!checklist.length) {
+
+            if (!check_list.length) {
                 this.do_unfollow();
             } else {
-                this.ds_model.call('apply_edited_subtypes', [[id], partner_id, checklist, new session.web.CompoundContext(this.build_context(), {})])
+                return this.ds_model.call('apply_edited_subtypes', [[id], partner_id, check_list, new session.web.CompoundContext(this.build_context(), {})])
                     .then(this.proxy('read_value'));
             }
         },
@@ -178,20 +178,7 @@ openerp_mail_followers = function(session, mail) {
             return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
                 .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
                 .then(this.proxy('display_buttons'))
-                .then(this.proxy('fetch_subtypes'))
-                .then(this.proxy('check_group_tech_feature'));
-        },
-
-        check_group_tech_feature: function() {
-            var self = this;
-            var edit_subtypes = new session.web.Model("res.groups");
-            edit_subtypes.query(["name","users"])
-                .filter([["name","=","Technical Features"], ["users","in",self.session.uid]]).first()
-                .then(function(res) {
-                if (res) {
-                    self.check_access = true;
-                    }
-                });
+                .then(this.proxy('fetch_subtypes'));
         },
 
         /** Read on res.partner failed: fall back on a generic case

From 0abe605544641bb0788f6b84f8df76603dd90b93 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 15 Mar 2013 18:18:43 +0530
Subject: [PATCH 025/197] [IMP] Oops sorry forgot to remove the prints and
 improved code.

bzr revid: psa@tinyerp.com-20130315124843-xtp19rbm2cvyfb67
---
 addons/mail/mail_thread.py                  | 2 --
 addons/mail/static/src/js/mail_followers.js | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ab4eead1a6e..720afd7fd8f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -163,7 +163,6 @@ class mail_thread(osv.AbstractModel):
         return res
 
     def apply_edited_subtypes(self, cr, uid, ids, partner_id, check_list, context=None):
-        print "\n\n uid, ids, partner_id, check_list,,>", uid, ids, partner_id, check_list,
         """ Apply the edited subtypes
                   of the user."""
         fol_obj = self.pool.get('mail.followers')
@@ -172,7 +171,6 @@ class mail_thread(osv.AbstractModel):
             ('res_id', 'in', ids),
             ('res_model', '=', self._name),
         ], context=context)
-        print "\n fol _ids>", fol_ids, check_list
         fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0, check_list)]}, context=context)
         return True
 
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0bfcbfc29e9..b778f3bb6b2 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -112,9 +112,9 @@ openerp_mail_followers = function(session, mail) {
 
         on_apply_subtype: function(id, partner_id) {
             var check_list = new Array();
-            _($('.oe_edit_actions input[type="checkbox"]')).each(function (records) {
-                 if ($(records).is(':checked')) {
-                     check_list.push(parseInt($(records).data('id')));
+            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
+                 if ($(record).is(':checked')) {
+                     check_list.push(parseInt($(record).data('id')));
                  }
             });
 

From 4a0e878584bff40db03c78cb8e9a4d13538261a1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 18 Mar 2013 12:02:24 +0530
Subject: [PATCH 026/197] [IMP] addd data of related accounts

bzr revid: tpa@tinyerp.com-20130318063224-0lefhgsq3l1ddd1q
---
 addons/l10n_in/l10n_in_public_chart.xml       | 299 +++++++++++++++++-
 .../l10n_in/l10n_in_public_tax_template.xml   | 154 +++++----
 2 files changed, 373 insertions(+), 80 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 9612afddc39..49568826c4b 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -658,7 +658,304 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="p96000"/>
         </record>
-        
+
+        <record model="account.account.template" id="p21000102">
+            <field name="name">CST 5% on Purchase</field>
+            <field name="code">21000102</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101010">
+            <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
+            <field name="code">121101010</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102012">
+            <field name="name">Input Credit - URD</field>
+            <field name="code">121102012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103001">
+            <field name="name">Tds on Audit Fees - 94J</field>
+            <field name="code">121103001</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103002">
+            <field name="name">TDS on Commission Or Brokerage- 94H</field>
+            <field name="code">121103002</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101004">
+            <field name="name">Input Credit - Import Duty - CVD</field>
+            <field name="code">121101004</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101001">
+            <field name="name">Input Credit Additional Duty on Imports 4%</field>
+            <field name="code">121101001</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101008">
+            <field name="name">Input Credit - Service Tax</field>
+            <field name="code">121101008</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101009">
+            <field name="name">Input Credit - Service Tax Edu. Cess.</field>
+            <field name="code">121101009</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103009">
+            <field name="name">TDS on Salary - 92B</field>
+            <field name="code">121103009</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101015">
+            <field name="name">Excise Duty 6% on Purchase</field>
+            <field name="code">121101015</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p1211010131">
+            <field name="name">Excise Duty 5% - Purchase</field>
+            <field name="code">1211010131</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101013">
+            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="code">121101013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101003">
+            <field name="name">Education Cess 2% - Purchase</field>
+            <field name="code">121101003</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101011">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+            <field name="code">121101011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101014">
+            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="code">121101014</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101002">
+            <field name="name">Education Cess 2%</field>
+            <field name="code">121101002</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101012">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+            <field name="code">121101012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101007">
+            <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+            <field name="code">121101007</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103003">
+            <field name="name">TDS on Contractor-94C</field>
+            <field name="code">121103003</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103004">
+            <field name="name">TDS On Director's Interest</field>
+            <field name="code">121103004</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103005">
+            <field name="name">TDS on Director's Remuneration - 92B</field>
+            <field name="code">121103005</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103006">
+            <field name="name">TDS on Interest</field>
+            <field name="code">121103006</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103007">
+            <field name="name">TDS on Professional Fees - 94J</field>
+            <field name="code">121103007</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121103008">
+            <field name="name">TDS on Rent-94I</field>
+            <field name="code">121103008</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101005">
+            <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
+            <field name="code">121101005</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121101006">
+            <field name="name">Input Credit on Capital Goods - Modvate</field>
+            <field name="code">121101006</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102007">
+            <field name="name">Input Vat 4%</field>
+            <field name="code">121102007</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102003">
+            <field name="name">Input Additional Vat 1%</field>
+            <field name="code">121102003</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102006">
+            <field name="name">Input Vat 15%</field>
+            <field name="code">121102006</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102009">
+            <field name="name">Output Vat @4%</field>
+            <field name="code">121102009</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102008">
+            <field name="name">Output Adi. Vat @1%</field>
+            <field name="code">121102008</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102001">
+            <field name="name">CST 2% on Sales</field>
+            <field name="code">121102001</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102002">
+            <field name="name">CST 5% on Sales</field>
+            <field name="code">121102002</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102005">
+            <field name="name">Input VAT 12.5%</field>
+            <field name="code">121102005</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102004">
+            <field name="name">Input Additional Vat 2.5%</field>
+            <field name="code">121102004</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102011">
+            <field name="name">Cst 2% on Purchase - New</field>
+            <field name="code">121102011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
         <record id="indian_chart_template_public" model="account.chart.template">
             <field name="name">India - Chart of Accounts for Public Ltd</field>
             <field name="account_root_id" ref="p0"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 79472c3e4b9..db77a63bdca 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -8,8 +8,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p21000102"/>
+        <field name="account_paid_id" ref="p21000102"/>
         <field name="base_code_id" ref="vat_code_tax_pur_PCST5"/>
         <field name="tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
         <field name="ref_base_code_id" ref="vat_code_tax_pur_PCST5"/>
@@ -23,8 +23,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101010"/>
+        <field name="account_paid_id" ref="p121101010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_ic_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -36,8 +36,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0400</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102012"/>
+        <field name="account_paid_id" ref="p121102012"/>
         <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_urd"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -49,8 +49,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1000</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103001"/>
+        <field name="account_paid_id" ref="p121103001"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_audit_fee"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -62,8 +62,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1000</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103002"/>
+        <field name="account_paid_id" ref="p121103002"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_brokerage"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -76,8 +76,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0750</field>
         <field name="sequence">1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101004"/>
+        <field name="account_paid_id" ref="p121101004"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_import_duty"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -90,8 +90,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0400</field>
         <field name="sequence">1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101001"/>
+        <field name="account_paid_id" ref="p121101001"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_add_imp_duty"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -104,8 +104,8 @@
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="sequence">1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101008"/>
+        <field name="account_paid_id" ref="p121101008"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -117,8 +117,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101009"/>
+        <field name="account_paid_id" ref="p121101009"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_ic_edu_cess"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -130,8 +130,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.3000</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103009"/>
+        <field name="account_paid_id" ref="p121103009"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_sal"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -143,8 +143,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0600</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101015"/>
+        <field name="account_paid_id" ref="p121101015"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_exice6"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -156,8 +156,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0500</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p1211010131"/>
+        <field name="account_paid_id" ref="p1211010131"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_exice5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -170,8 +170,8 @@
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="include_base_amount" eval="True"/>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101013"/>
+        <field name="account_paid_id" ref="p121101013"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -184,8 +184,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
         <field name="sequence">21</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101003"/>
+        <field name="account_paid_id" ref="p121101003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
@@ -199,8 +199,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
         <field name="sequence">22</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101011"/>
+        <field name="account_paid_id" ref="p121101011"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_edu"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
@@ -214,8 +214,8 @@
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="include_base_amount" eval="True"/>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101014"/>
+        <field name="account_paid_id" ref="p121101014"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -228,8 +228,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
         <field name="sequence">2</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101002"/>
+        <field name="account_paid_id" ref="p121101002"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
@@ -243,8 +243,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
         <field name="sequence">3</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101012"/>
+        <field name="account_paid_id" ref="p121101012"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
@@ -257,8 +257,6 @@
         <field name="type_tax_use">all</field>
         <field name="type">percent</field>
         <field name="amount">0.0000</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -268,8 +266,6 @@
         <field name="type_tax_use">all</field>
         <field name="type">percent</field>
         <field name="amount">0.0</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -279,8 +275,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101007"/>
+        <field name="account_paid_id" ref="p121101007"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -292,8 +288,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103003"/>
+        <field name="account_paid_id" ref="p121103003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_contractor"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -305,8 +301,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103004"/>
+        <field name="account_paid_id" ref="p121103004"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_dir_intrest"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -318,8 +314,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.3</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103005"/>
+        <field name="account_paid_id" ref="p121103005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_dir_ren"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -331,8 +327,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103006"/>
+        <field name="account_paid_id" ref="p121103006"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_intrest"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -345,8 +341,8 @@
         <field name="type">percent</field>
         <field name="amount">0.1</field>
         <field name="sequence">1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103007"/>
+        <field name="account_paid_id" ref="p121103007"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_prof_fee"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -358,8 +354,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121103008"/>
+        <field name="account_paid_id" ref="p121103008"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_tds_rent"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -371,8 +367,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101005"/>
+        <field name="account_paid_id" ref="p121101005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_edu_cess"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -380,12 +376,12 @@
 
     <record id="account_tax_ic_cap_modvat" model="account.tax.template">
         <field name="name">Input Credit on Capital Goods - Modvate</field>
-        <field name="discription"><Input Credit on Capital Goods - Modvate/field>
+        <field name="discription">Input Credit on Capital Goods - Modvate</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.12</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121101006"/>
+        <field name="account_paid_id" ref="p121101006"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_modvat"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -398,8 +394,8 @@
         <field name="type">percent</field>
         <field name="amount">0.04</field>
         <field name="sequence">4</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102007"/>
+        <field name="account_paid_id" ref="p121102007"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
         <field name="child_depend" eval="True"/>
@@ -413,8 +409,8 @@
         <field name="type">percent</field>
         <field name="amount">0.01</field>
         <field name="sequence">5</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102003"/>
+        <field name="account_paid_id" ref="p121102003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -427,8 +423,8 @@
         <field name="type">percent</field>
         <field name="amount">0.15</field>
         <field name="sequence">7</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102006"/>
+        <field name="account_paid_id" ref="p121102006"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat15"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -441,8 +437,8 @@
         <field name="type">percent</field>
         <field name="amount">0.04</field>
         <field name="sequence">11</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102009"/>
+        <field name="account_paid_id" ref="p121102009"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat4"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -455,8 +451,8 @@
         <field name="type">percent</field>
         <field name="amount">0.01</field>
         <field name="sequence">12</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102008"/>
+        <field name="account_paid_id" ref="p121102008"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -470,8 +466,8 @@
         <field name="amount">0.02</field>
         <field name="sequence">13</field>
         <field name="include_base_amount" eval="True"/>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102001"/>
+        <field name="account_paid_id" ref="p121102001"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst12"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -484,8 +480,8 @@
         <field name="type">percent</field>
         <field name="amount">0.05</field>
         <field name="sequence">14</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102002"/>
+        <field name="account_paid_id" ref="p121102002"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cst5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -498,8 +494,8 @@
         <field name="type">percent</field>
         <field name="amount">0.1250</field>
         <field name="sequence">60</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102005"/>
+        <field name="account_paid_id" ref="p121102005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -512,8 +508,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0250</field>
         <field name="sequence">80</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102004"/>
+        <field name="account_paid_id" ref="p121102004"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_add_vat2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -526,8 +522,8 @@
         <field name="type">percent</field>
         <field name="amount">0.02</field>
         <field name="sequence">9333</field>
-        <!--field name="account_collected_id" ref=""/>
-        <field name="account_paid_id" ref=""/-->
+        <field name="account_collected_id" ref="p121102011"/>
+        <field name="account_paid_id" ref="p121102011"/>
         <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>

From df42be7f5d873fe7003dfd6a155b5ce6cf23571b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 18 Mar 2013 16:20:27 +0530
Subject: [PATCH 027/197] [IMP] new improved data of tax code

bzr revid: tpa@tinyerp.com-20130318105027-r9vf27o3sx8lw9g7
---
 .../l10n_in/l10n_in_public_tax_template.xml   |  64 ++--
 addons/l10n_in/l10n_in_tax_code_template.xml  | 288 ++++++++++++------
 2 files changed, 221 insertions(+), 131 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 92b154643f2..1cfc0cf5d5a 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -26,7 +26,7 @@
         <field name="account_collected_id" ref="p121101010"/>
         <field name="account_paid_id" ref="p121101010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_ic_seco_hec"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -39,7 +39,7 @@
         <field name="account_collected_id" ref="p121102012"/>
         <field name="account_paid_id" ref="p121102012"/>
         <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_urd"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_urd"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -52,7 +52,7 @@
         <field name="account_collected_id" ref="p121103001"/>
         <field name="account_paid_id" ref="p121103001"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_audit_fee"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -65,7 +65,7 @@
         <field name="account_collected_id" ref="p121103002"/>
         <field name="account_paid_id" ref="p121103002"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_brokerage"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -79,7 +79,7 @@
         <field name="account_collected_id" ref="p121101004"/>
         <field name="account_paid_id" ref="p121101004"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_import_duty"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_import_duty"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -93,7 +93,7 @@
         <field name="account_collected_id" ref="p121101001"/>
         <field name="account_paid_id" ref="p121101001"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_add_imp_duty"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -107,7 +107,7 @@
         <field name="account_collected_id" ref="p121101008"/>
         <field name="account_paid_id" ref="p121101008"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_ic_st"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -120,7 +120,7 @@
         <field name="account_collected_id" ref="p121101009"/>
         <field name="account_paid_id" ref="p121101009"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_ic_edu_cess"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -133,7 +133,7 @@
         <field name="account_collected_id" ref="p121103009"/>
         <field name="account_paid_id" ref="p121103009"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_sal"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -146,7 +146,7 @@
         <field name="account_collected_id" ref="p121101015"/>
         <field name="account_paid_id" ref="p121101015"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice6"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -159,7 +159,7 @@
         <field name="account_collected_id" ref="p1211010131"/>
         <field name="account_paid_id" ref="p1211010131"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice5"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -173,7 +173,7 @@
         <field name="account_collected_id" ref="p121101013"/>
         <field name="account_paid_id" ref="p121101013"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -187,7 +187,7 @@
         <field name="account_collected_id" ref="p121101003"/>
         <field name="account_paid_id" ref="p121101003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -202,7 +202,7 @@
         <field name="account_collected_id" ref="p121101011"/>
         <field name="account_paid_id" ref="p121101011"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_edu"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -217,7 +217,7 @@
         <field name="account_collected_id" ref="p121101014"/>
         <field name="account_paid_id" ref="p121101014"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -246,7 +246,7 @@
         <field name="account_collected_id" ref="p121101012"/>
         <field name="account_paid_id" ref="p121101012"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_cess"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -278,7 +278,7 @@
         <field name="account_collected_id" ref="p121101007"/>
         <field name="account_paid_id" ref="p121101007"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_seco_hec"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -291,7 +291,7 @@
         <field name="account_collected_id" ref="p121103003"/>
         <field name="account_paid_id" ref="p121103003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_contractor"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -304,7 +304,7 @@
         <field name="account_collected_id" ref="p121103004"/>
         <field name="account_paid_id" ref="p121103004"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_dir_intrest"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -317,7 +317,7 @@
         <field name="account_collected_id" ref="p121103005"/>
         <field name="account_paid_id" ref="p121103005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_dir_ren"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -330,7 +330,7 @@
         <field name="account_collected_id" ref="p121103006"/>
         <field name="account_paid_id" ref="p121103006"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_intrest"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -344,7 +344,7 @@
         <field name="account_collected_id" ref="p121103007"/>
         <field name="account_paid_id" ref="p121103007"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_prof_fee"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -357,7 +357,7 @@
         <field name="account_collected_id" ref="p121103008"/>
         <field name="account_paid_id" ref="p121103008"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_tds_rent"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -370,7 +370,7 @@
         <field name="account_collected_id" ref="p121101005"/>
         <field name="account_paid_id" ref="p121101005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_edu_cess"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -383,7 +383,7 @@
         <field name="account_collected_id" ref="p121101006"/>
         <field name="account_paid_id" ref="p121101006"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_modvat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_modvat"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -426,7 +426,7 @@
         <field name="account_collected_id" ref="p121102006"/>
         <field name="account_paid_id" ref="p121102006"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -440,7 +440,7 @@
         <field name="account_collected_id" ref="p121102009"/>
         <field name="account_paid_id" ref="p121102009"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -469,7 +469,7 @@
         <field name="account_collected_id" ref="p121102001"/>
         <field name="account_paid_id" ref="p121102001"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst12"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -483,7 +483,7 @@
         <field name="account_collected_id" ref="p121102002"/>
         <field name="account_paid_id" ref="p121102002"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cst5"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -497,7 +497,7 @@
         <field name="account_collected_id" ref="p121102005"/>
         <field name="account_paid_id" ref="p121102005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -511,7 +511,7 @@
         <field name="account_collected_id" ref="p121102004"/>
         <field name="account_paid_id" ref="p121102004"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat2"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -525,7 +525,7 @@
         <field name="account_collected_id" ref="p121102011"/>
         <field name="account_paid_id" ref="p121102011"/>
         <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index ff2cd352bbf..1d721c76a94 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -39,7 +39,7 @@
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_CSTP5">
             <field name="name">Cst 5% on Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
             <field name="code">CSTP5</field>
         </record>
 
@@ -49,179 +49,179 @@
             <field name="code">PCST5</field>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
-            <field name="name">Education Cess 2%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
         <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
+            <field name="name">Education Cess 2%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
             <field name="name">Education Cess 2% - Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_import_duty">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_import_duty">
             <field name="name">Input Credit - Import Duty</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_edu_cess">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_edu_cess">
             <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_modvat">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_modvat">
             <field name="name">Input Credit on Capital Goods - Modvate</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_seco_hec">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_seco_hec">
             <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_ic_st">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
             <field name="name">Input Credit - Service Tax</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_ic_edu_cess">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
             <field name="name">Input Credit - Service Tax Edu. Cess.</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_ic_seco_hec">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
             <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_edu">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_edu">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_cess">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
-            <field name="name">CST 2% on Sales</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_cst5">
-            <field name="name">CST 5% on Sales</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
-            <field name="name">Input Additional Vat 1%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat2">
-            <field name="name">Input Additional Vat 2.5%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat12">
-            <field name="name">Input VAT 12.5%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat15">
-            <field name="name">Input Vat 15%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_vat4">
-            <field name="name">Input Vat 4%</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat1">
-            <field name="name">Output Adi. Vat @1%</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
-            <field name="name">Output Vat @4%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
-            <field name="name">Cst 2% on Purchase</field>
+            <field name="name">CST 2% on Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
-            <field name="name">Excise Duty 12% - Purchase</field>
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cst5">
+            <field name="name">CST 5% on Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
-            <field name="name">Excise Duty - 12% - Sales</field>
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat1">
+            <field name="name">Input Additional Vat 1%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice5">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat2">
+            <field name="name">Input Additional Vat 2.5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat12">
+            <field name="name">Input VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat15">
+            <field name="name">Input Vat 15%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
+            <field name="name">Input Vat 4%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
+            <field name="name">Output Adi. Vat @1%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat4">
+            <field name="name">Output Vat @4%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
+            <field name="name">Cst 2% on Purchase</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
+            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
+            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice5">
             <field name="name">Excise Duty 5% - Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice6">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice6">
             <field name="name">Excise Duty 6% on Purchase</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_urd">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_urd">
             <field name="name">Input Credit - URD</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_audit_fee">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_audit_fee">
             <field name="name">Tds on Audit Fees - 94J</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_brokerage">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_brokerage">
             <field name="name">TDS on Commission Or Brokerage- 94H</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_contractor">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_contractor">
             <field name="name">TDS on Contractor-94C</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_dir_intrest">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_intrest">
             <field name="name"> TDS On Director's Interest</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_dir_ren">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_ren">
             <field name="name">TDS on Director's Remuneration - 92B</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_intrest">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_intrest">
             <field name="name">TDS on Interest</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_prof_fee">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_prof_fee">
             <field name="name">TDS on Professional Fees - 94J</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_rent">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_rent">
             <field name="name">TDS on Rent-94I</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_tds_sal">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_sal">
             <field name="name">TDS on Salary - 92B</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_tds_pur_import">
@@ -299,10 +299,100 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_add_imp_duty">
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_imp_duty">
             <field name="name">Additional Duty (Imports) 4%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_formh_tax">
+            <field name="name">Sales Export - Form H - With Tax</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cst2_on_sal_cst3">
+            <field name="name">CST 2% on Sales CT3</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_sal_cst3">
+            <field name="name">Sales CT3 VAT</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_out4_sal_cst3">
+            <field name="name">Output VAT 4% on Sales CT3</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_out_add1_sale_cst3">
+            <field name="name">Output Adi. Vat 1% on Sales CT3</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_ct3_cst">
+            <field name="name">Sales CT3 CST</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_exp_ct1">
+            <field name="name">Sales Export - Form H - With CT1</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_sez_out_guj">
+            <field name="name">Sales Export - SEZ - Out of Gujarat</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_sez_in_guj">
+            <field name="name">Sales Export - SEZ - In Gujarat </field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_no_saz_ogs">
+            <field name="name">No Tax SEZ OGS</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_no_sez_guj">
+            <field name="name">No Tax SEZ Gujarat</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_out_country">
+            <field name="name">Sales Export - Out of Country</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_proj">
+            <field name="name">Sales Others (Projects)</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_formh_bed">
+            <field name="name">No Tax Form H with BED</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_fomh">
+            <field name="name">No Tax Form H</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_no_out_country">
+            <field name="name">No Tax Export Out of Country</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_no_proj">
+            <field name="name">No Tax Projects</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_base_service">
+            <field name="name">Base for Input Service</field>
+            <field name="parent_id" ref="vat_code_base_net"/>
+        </record>
+
     </data>
 </openerp>

From f5800836f29247953b67564e4a39ff5acace15b0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 18 Mar 2013 18:38:21 +0530
Subject: [PATCH 028/197] [IMP] improved taxes

bzr revid: tpa@tinyerp.com-20130318130821-07ylst5u9iogaa3z
---
 addons/l10n_in/l10n_in_public_chart.xml       |  28 ++-
 .../l10n_in/l10n_in_public_tax_template.xml   | 170 ++++++++++++++----
 2 files changed, 161 insertions(+), 37 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 49568826c4b..67093812c63 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -901,7 +901,7 @@
         </record>
 
         <record model="account.account.template" id="p121102009">
-            <field name="name">Output Vat @4%</field>
+            <field name="name">Output Vat 4%</field>
             <field name="code">121102009</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -909,7 +909,7 @@
         </record>
 
         <record model="account.account.template" id="p121102008">
-            <field name="name">Output Adi. Vat @1%</field>
+            <field name="name">Output Adi. Vat 1%</field>
             <field name="code">121102008</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -956,6 +956,30 @@
             <field name="parent_id" ref=""/>
         </record>
 
+        <record model="account.account.template" id="p121102017">
+            <field name="name">CST 2% on Sales - CT3 Against Form C</field>
+            <field name="code">121102017</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102018">
+            <field name="name">Output Vat 4% on Sales - CT3</field>
+            <field name="code">121102018</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
+        <record model="account.account.template" id="p121102019">
+            <field name="name">Output Adi. Vat 1% Sales CT3</field>
+            <field name="code">121102019</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref=""/>
+        </record>
+
         <record id="indian_chart_template_public" model="account.chart.template">
             <field name="name">India - Chart of Accounts for Public Ltd</field>
             <field name="account_root_id" ref="p0"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 1cfc0cf5d5a..03c2cfd2d23 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -3,8 +3,8 @@
     <data noupdate="1">
 
     <record id="account_tax_cst_pur5" model="account.tax.template">
-        <field name="name">CST 5% - Purchase</field>
-        <field name="description">CST 5% - Purchase</field>
+        <field name="name">Input CST 5%</field>
+        <field name="description">Input CST 5%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
@@ -18,8 +18,8 @@
     </record>
 
     <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
-        <field name="description">Input Credit - Service Tax Seco. &amp; HEC</field>
+        <field name="name">Input Sec. &amp; HEC - Service Tax</field>
+        <field name="description">Input Sec. &amp; HEC - Service Tax</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
@@ -98,8 +98,8 @@
     </record>
 
     <record id="account_tax_ic_st" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax</field>
-        <field name="description">Input Credit - Service Tax</field>
+        <field name="name">Input Credit - Service Tax 12.36%</field>
+        <field name="description">Input Credit - Service Tax 12.36%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
@@ -111,9 +111,9 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="account_tax_ic_st_edu_cess" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax Edu. Cess.</field>
-        <field name="description">Input Credit - Service Tax Edu. Cess.</field>
+    <record id="account_tax_in_edu_cess_st" model="account.tax.template">
+        <field name="name">Input Edu. Cess - Service Tax</field>
+        <field name="description">Input Edu. Cess - Service Tax</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -138,8 +138,8 @@
     </record>
 
     <record id="account_tax_exic6_pur" model="account.tax.template">
-        <field name="name">Excise Duty 6% on Purchase</field>
-        <field name="description">Excise Duty 6% on Purchase</field>
+        <field name="name">Input Excise Duty 6% </field>
+        <field name="description">Input Excise Duty 6% </field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0600</field>
@@ -151,8 +151,8 @@
     </record>
 
     <record id="account_tax_exic5_pur" model="account.tax.template">
-        <field name="name">Excise Duty 5% - Purchase</field>
-        <field name="description"></field>
+        <field name="name">Input Excise Duty 5% </field>
+        <field name="description">Input Excise Duty 5% </field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0500</field>
@@ -164,8 +164,8 @@
     </record>
 
     <record id="account_tax_exice12_pur" model="account.tax.template">
-        <field name="name">Excise Duty 12% - Purchase</field>
-        <field name="description">Excise Duty 12% - Purchase</field>
+        <field name="name">Input Excise Duty 12%</field>
+        <field name="description">Input Excise Duty 12%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
@@ -208,8 +208,8 @@
     </record>
 
     <record id="account_tax_exice12_sale" model="account.tax.template">
-        <field name="name">Excise Duty - 12% - Sales</field>
-        <field name="description">Excise Duty - 12% - Sales</field>
+        <field name="name">Excise Duty - 12.36% - Sales</field>
+        <field name="description">Excise Duty - 12.36% - Sales</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
@@ -269,9 +269,9 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="account_tax_ic_cap_good_sec_high" model="account.tax.template">
-        <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
-        <field name="description">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+    <record id="account_tax_in_sec_high_cap_good" model="account.tax.template">
+        <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
+        <field name="description">Input Sec. &amp; HEC - Capital Goods</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
@@ -362,8 +362,8 @@
     </record>
 
     <record id="account_tax_ic_cap_edu_cess" model="account.tax.template">
-        <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
-        <field name="description">Input Credit On Capital Goods - Edu. Cess</field>
+        <field name="name">Input Edu. Cess - Capital Goods</field>
+        <field name="description">Input Edu. Cess - Capital Goods</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
@@ -374,9 +374,9 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="account_tax_ic_cap_modvat" model="account.tax.template">
-        <field name="name">Input Credit on Capital Goods - Modvate</field>
-        <field name="description">Input Credit on Capital Goods - Modvate</field>
+    <record id="account_tax_ie12_cap_goods" model="account.tax.template">
+        <field name="name">Input Excise Duty 12% - Capital Goods</field>
+        <field name="description">Input Excise Duty 12% - Capital Goods</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.12</field>
@@ -423,16 +423,16 @@
         <field name="type">percent</field>
         <field name="amount">0.15</field>
         <field name="sequence">7</field>
-        <field name="account_collected_id" ref="p121102006"/>
-        <field name="account_paid_id" ref="p121102006"/>
+        <field name="account_collected_id" ref="account.conf_xfa"/>
+        <field name="account_paid_id" ref="account.conf_xfa"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_out_vat4" model="account.tax.template">
-        <field name="name">Output Vat @4%</field>
-        <field name="description">Output Vat @4%</field>
+        <field name="name">Output Vat 4%</field>
+        <field name="description">Output Vat 4%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.04</field>
@@ -445,8 +445,8 @@
     </record>
 
     <record id="account_tax_out_adi_vat1" model="account.tax.template">
-        <field name="name">Output Adi. Vat @1%</field>
-        <field name="description">Output Adi. Vat @1%</field>
+        <field name="name">Output Adi. Vat 1%</field>
+        <field name="description">Output Adi. Vat 1%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
@@ -459,8 +459,8 @@
     </record>
 
     <record id="account_tax_cst2_sale" model="account.tax.template">
-        <field name="name">CST 2% on Sales</field>
-        <field name="description">CST 2% on Sales</field>
+        <field name="name">CST 2% on Sales - Against Form - C</field>
+        <field name="description">CST 2% on Sales - Against Form - C</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
@@ -516,8 +516,8 @@
     </record>
 
     <record id="account_tax_cst2_pur" model="account.tax.template">
-        <field name="name">Cst 2% on Purchase</field>
-        <field name="description">Cst 2% on Purchase</field>
+        <field name="name">Input CST 2%</field>
+        <field name="description">Input CST 2%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
@@ -529,5 +529,105 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
+    <record id="account_tax_no_form_h" model="account.tax.template">
+        <field name="name">No Tax Form H</field>
+        <field name="description">No Tax Form H</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_fomh"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst2_sale_cst3_against_c" model="account.tax.template">
+        <field name="name">CST 2% on Sales - CT3  Against Form - C</field>
+        <field name="description">CST 2% on Sales - CT3  Against Form - C</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="account_collected_id" ref="p121102017"/>
+        <field name="account_paid_id" ref="p121102017"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_vat4_sal_ct3" model="account.tax.template">
+        <field name="name">Output Vat 4% on Sales - CT3</field>
+        <field name="description">Output Vat 4% on Sales - CT3</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="account_collected_id" ref="p121102018"/>
+        <field name="account_paid_id" ref="p121102018"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
+        <field name="name">Output Adi. Vat 1% Sales CT3</field>
+        <field name="description">Output Adi. Vat 1% Sales CT3</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="account_collected_id" ref="p121102019"/>
+        <field name="account_paid_id" ref="p121102019"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_sez_ogs" model="account.tax.template">
+        <field name="name">No Tax SEZ OGS</field>
+        <field name="description">No Tax SEZ OGS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">fixed</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
+        <field name="tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_sez_guj" model="account.tax.template">
+        <field name="name">No Tax SEZ Gujarat</field>
+        <field name="description">No Tax SEZ Gujarat</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
+        <field name="tax_code_id" ref="vat_code_tax_no_sez_guj"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_h_with_bed" model="account.tax.template">
+        <field name="name">No Tax Form H with BED</field>
+        <field name="description">No Tax Form H with BED</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_formh_tax"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_export_out_country" model="account.tax.template">
+        <field name="name">No Tax Exports - Out of Country</field>
+        <field name="description">No Tax Exports - Out of Country</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_out_country"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_proj" model="account.tax.template">
+        <field name="name">No Tax Projects</field>
+        <field name="description">No Tax Projects</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_proj"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_no_proj"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file

From cf3415f0877affc7f26ad16cd6a47ba671a9d601 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 19 Mar 2013 13:03:19 +0530
Subject: [PATCH 029/197] [IMP]Changed the position of methods and improved
 code.

bzr revid: psa@tinyerp.com-20130319073319-8myj2hx5iaqmi5xj
---
 addons/mail/mail_thread.py                    | 71 ++++++++++---------
 addons/mail/static/src/js/mail_followers.js   |  4 +-
 addons/mail/static/src/xml/mail_followers.xml |  4 ++
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 6ead2c9202b..ddbbf8a689b 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -140,40 +140,6 @@ class mail_thread(osv.AbstractModel):
             res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
         return res
 
-    def edit_followers_subtype(self, cr, uid, ids, partner_id, context=None):
-        res = dict((id, dict(message_subtype_data='')) for id in ids)
-
-        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))
-        for id in ids:
-            res[id]['message_subtype_data'] = subtype_dict.copy()
-
-        fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, uid, [
-            ('partner_id', '=', partner_id),
-            ('res_id', 'in', ids),
-            ('res_model', '=', self._name),
-        ], context=context)
-        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
-            thread_subtype_dict = res[fol.res_id]['message_subtype_data']
-            for subtype in fol.subtype_ids:
-                thread_subtype_dict[subtype.name]['followed'] = True
-            res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
-        return res
-
-    def apply_edited_subtypes(self, cr, uid, ids, partner_id, check_list, context=None):
-        """ Apply the edited subtypes
-                  of the user."""
-        fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, uid, [
-            ('partner_id', '=', partner_id),
-            ('res_id', 'in', ids),
-            ('res_model', '=', self._name),
-        ], context=context)
-        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0, check_list)]}, context=context)
-        return True
-
     def _search_message_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
         return [('message_ids.to_read', '=', True)]
 
@@ -323,6 +289,43 @@ class mail_thread(osv.AbstractModel):
         default['message_follower_ids'] = []
         return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
 
+    #------------------------------------------------------
+    # Edit and apply followers subtypes.
+    #------------------------------------------------------
+    def edit_followers_subtype(self, cr, uid, ids, partner_id, context=None):
+        res = dict((id, dict(message_subtype_data='')) for id in ids)
+
+        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))
+        for id in ids:
+            res[id]['message_subtype_data'] = subtype_dict.copy()
+
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('res_id', 'in', ids),
+            ('res_model', '=', self._name),
+        ], context=context)
+        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
+            thread_subtype_dict = res[fol.res_id]['message_subtype_data']
+            for subtype in fol.subtype_ids:
+                thread_subtype_dict[subtype.name]['followed'] = True
+            res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
+        return res
+
+    def apply_edited_subtypes(self, cr, uid, ids, partner_id, check_list, context=None):
+        """ Apply the edited subtypes
+                  of the user."""
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('res_id', 'in', ids),
+            ('res_model', '=', self._name),
+        ], context=context)
+        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0, check_list)]}, context=context)
+        return True
+
     #------------------------------------------------------
     # Automatically log tracked fields
     #------------------------------------------------------
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 9a9f5f2ba54..1ca65087316 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -92,9 +92,9 @@ openerp_mail_followers = function(session, mail) {
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.on_apply_subtype(id, partner_id);
-                                        $dialog.remove();
+                                        $(this).remove();
                                     }},
-                                    { text: _t("Cancel"), click: function() { $dialog.remove(); }}
+                                    { text: _t("Cancel"), click: function() { $(this).remove(); }}
                                 ],
                     });
             this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 4a492cee713..ea11c26570b 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -48,6 +48,10 @@
         </table>
     </t>
 
+    <!--
+        followers.edit.subtype template
+        Template used to edit the display message subtypes of a follower subscription
+    -->
     <t t-name="mail.followers.edit.subtype">
         <table class='oe_subtype'>
             <tr>

From 10d8c8d8fbea100fc05948a6ce8d33157c7954aa Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 20 Mar 2013 14:39:34 +0530
Subject: [PATCH 030/197] [IMP] l10n_in : improved parent_id of accounts, and
 improved typo

bzr revid: tpa@tinyerp.com-20130320090934-0f3w2v7uq3cikmeb
---
 addons/l10n_in/l10n_in_public_chart.xml       | 273 +++++++++---------
 .../l10n_in/l10n_in_public_tax_template.xml   | 236 +++++++--------
 addons/l10n_in/l10n_in_tax_code_template.xml  |  53 ++--
 3 files changed, 268 insertions(+), 294 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 67093812c63..477df493bf6 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -116,7 +116,7 @@
         <record model="account.account.template" id="p15400">
             <field name="name">Tax Receivable</field>
             <field name="code">15400</field>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_asset"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="p10000"/>
@@ -659,325 +659,324 @@
             <field name="parent_id" ref="p96000"/>
         </record>
 
-        <record model="account.account.template" id="p21000102">
+        <record model="account.account.template" id="p154001">
             <field name="name">CST 5% on Purchase</field>
-            <field name="code">21000102</field>
+            <field name="code">154001</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_expense"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101010">
+        <record model="account.account.template" id="p154002">
             <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
-            <field name="code">121101010</field>
+            <field name="code">154002</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102012">
+        <record model="account.account.template" id="p154003">
             <field name="name">Input Credit - URD</field>
-            <field name="code">121102012</field>
+            <field name="code">154003</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103001">
-            <field name="name">Tds on Audit Fees - 94J</field>
-            <field name="code">121103001</field>
+        <record model="account.account.template" id="p154004">
+            <field name="name">TDS on Audit Fees - 94J</field>
+            <field name="code">154004</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103002">
-            <field name="name">TDS on Commission Or Brokerage- 94H</field>
-            <field name="code">121103002</field>
+        <record model="account.account.template" id="p154005">
+            <field name="name">TDS on Commission Or Brokerage - 94H</field>
+            <field name="code">154005</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101004">
+        <record model="account.account.template" id="p154006">
             <field name="name">Input Credit - Import Duty - CVD</field>
-            <field name="code">121101004</field>
+            <field name="code">154006</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101001">
+        <record model="account.account.template" id="p154007">
             <field name="name">Input Credit Additional Duty on Imports 4%</field>
-            <field name="code">121101001</field>
+            <field name="code">154007</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101008">
+        <record model="account.account.template" id="p154008">
             <field name="name">Input Credit - Service Tax</field>
-            <field name="code">121101008</field>
+            <field name="code">154008</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101009">
+        <record model="account.account.template" id="p154009">
             <field name="name">Input Credit - Service Tax Edu. Cess.</field>
-            <field name="code">121101009</field>
+            <field name="code">154009</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103009">
+        <record model="account.account.template" id="p154010">
             <field name="name">TDS on Salary - 92B</field>
-            <field name="code">121103009</field>
+            <field name="code">154010</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101015">
+        <record model="account.account.template" id="p154011">
             <field name="name">Excise Duty 6% on Purchase</field>
-            <field name="code">121101015</field>
+            <field name="code">154011</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p1211010131">
+        <record model="account.account.template" id="p154012">
             <field name="name">Excise Duty 5% - Purchase</field>
-            <field name="code">1211010131</field>
+            <field name="code">154012</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101013">
+        <record model="account.account.template" id="p154013">
             <field name="name">Excise Duty 12% - Purchase</field>
-            <field name="code">121101013</field>
+            <field name="code">154013</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101003">
+        <record model="account.account.template" id="p154014">
             <field name="name">Education Cess 2% - Purchase</field>
-            <field name="code">121101003</field>
+            <field name="code">154014</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101011">
+        <record model="account.account.template" id="p154015">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-            <field name="code">121101011</field>
+            <field name="code">154015</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101014">
+        <record model="account.account.template" id="p247001">
             <field name="name">Excise Duty - 12% - Sales</field>
-            <field name="code">121101014</field>
+            <field name="code">247001</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121101002">
+        <record model="account.account.template" id="p247010">
             <field name="name">Education Cess 2%</field>
-            <field name="code">121101002</field>
+            <field name="code">247010</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121101012">
+        <record model="account.account.template" id="p247002">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="code">121101012</field>
+            <field name="code">247002</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121101007">
+        <record model="account.account.template" id="p154016">
             <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
-            <field name="code">121101007</field>
+            <field name="code">154016</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103003">
-            <field name="name">TDS on Contractor-94C</field>
-            <field name="code">121103003</field>
+        <record model="account.account.template" id="p154017">
+            <field name="name">TDS on Contractor - 94C</field>
+            <field name="code">154017</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103004">
+        <record model="account.account.template" id="p154018">
             <field name="name">TDS On Director's Interest</field>
-            <field name="code">121103004</field>
+            <field name="code">154018</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103005">
+        <record model="account.account.template" id="p154019">
             <field name="name">TDS on Director's Remuneration - 92B</field>
-            <field name="code">121103005</field>
+            <field name="code">154019</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103006">
+        <record model="account.account.template" id="p154020">
             <field name="name">TDS on Interest</field>
-            <field name="code">121103006</field>
+            <field name="code">154020</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103007">
+        <record model="account.account.template" id="p154021">
             <field name="name">TDS on Professional Fees - 94J</field>
-            <field name="code">121103007</field>
+            <field name="code">154021</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121103008">
-            <field name="name">TDS on Rent-94I</field>
-            <field name="code">121103008</field>
+        <record model="account.account.template" id="p154022">
+            <field name="name">TDS on Rent - 94I</field>
+            <field name="code">154022</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101005">
+        <record model="account.account.template" id="p154023">
             <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
-            <field name="code">121101005</field>
+            <field name="code">154023</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121101006">
-            <field name="name">Input Credit on Capital Goods - Modvate</field>
-            <field name="code">121101006</field>
+        <record model="account.account.template" id="p154024">
+            <field name="name">Input Excise Duty 12% - Capital Goods</field>
+            <field name="code">154024</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102007">
-            <field name="name">Input Vat 4%</field>
-            <field name="code">121102007</field>
+        <record model="account.account.template" id="p154025">
+            <field name="name">Input VAT 4%</field>
+            <field name="code">154025</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102003">
-            <field name="name">Input Additional Vat 1%</field>
-            <field name="code">121102003</field>
+        <record model="account.account.template" id="p154026">
+            <field name="name">Input Additional VAT 1%</field>
+            <field name="code">154026</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102006">
-            <field name="name">Input Vat 15%</field>
-            <field name="code">121102006</field>
+        <record model="account.account.template" id="p154027">
+            <field name="name">Input VAT 15%</field>
+            <field name="code">154027</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102009">
-            <field name="name">Output Vat 4%</field>
-            <field name="code">121102009</field>
+        <record model="account.account.template" id="p247003">
+            <field name="name">Output VAT 4%</field>
+            <field name="code">247003</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121102008">
-            <field name="name">Output Adi. Vat 1%</field>
-            <field name="code">121102008</field>
+        <record model="account.account.template" id="p247004">
+            <field name="name">Output Adi. VAT 1%</field>
+            <field name="code">247004</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121102001">
+        <record model="account.account.template" id="p247005">
             <field name="name">CST 2% on Sales</field>
-            <field name="code">121102001</field>
+            <field name="code">247005</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121102002">
+        <record model="account.account.template" id="p247006">
             <field name="name">CST 5% on Sales</field>
-            <field name="code">121102002</field>
+            <field name="code">247006</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121102005">
+        <record model="account.account.template" id="p154028">
             <field name="name">Input VAT 12.5%</field>
-            <field name="code">121102005</field>
+            <field name="code">154028</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102004">
-            <field name="name">Input Additional Vat 2.5%</field>
-            <field name="code">121102004</field>
+        <record model="account.account.template" id="p154029">
+            <field name="name">Input Additional VAT 2.5%</field>
+            <field name="code">154029</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102011">
-            <field name="name">Cst 2% on Purchase - New</field>
-            <field name="code">121102011</field>
+        <record model="account.account.template" id="p154030">
+            <field name="name">CST 2% on Purchase</field>
+            <field name="code">154030</field>
             <field name="type">other</field>
-            <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="parent_id" ref="p15400"/>
         </record>
 
-        <record model="account.account.template" id="p121102017">
+        <record model="account.account.template" id="p247007">
             <field name="name">CST 2% on Sales - CT3 Against Form C</field>
-            <field name="code">121102017</field>
+            <field name="code">247007</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121102018">
-            <field name="name">Output Vat 4% on Sales - CT3</field>
-            <field name="code">121102018</field>
+        <record model="account.account.template" id="p247008">
+            <field name="name">Output VAT 4% on Sales - CT3</field>
+            <field name="code">247008</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
-        <record model="account.account.template" id="p121102019">
-            <field name="name">Output Adi. Vat 1% Sales CT3</field>
-            <field name="code">121102019</field>
+        <record model="account.account.template" id="p247009">
+            <field name="name">Output Adi. VAT 1% Sales CT3</field>
+            <field name="code">247009</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
-            <field name="parent_id" ref=""/>
+            <field name="parent_id" ref="p24700"/>
         </record>
 
         <record id="indian_chart_template_public" model="account.chart.template">
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 03c2cfd2d23..09b2c41d7aa 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -8,8 +8,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p21000102"/>
-        <field name="account_paid_id" ref="p21000102"/>
+        <field name="account_collected_id" ref="p154001"/>
+        <field name="account_paid_id" ref="p154001"/>
         <field name="base_code_id" ref="vat_code_tax_pur_PCST5"/>
         <field name="tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
         <field name="ref_base_code_id" ref="vat_code_tax_pur_PCST5"/>
@@ -23,8 +23,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
-        <field name="account_collected_id" ref="p121101010"/>
-        <field name="account_paid_id" ref="p121101010"/>
+        <field name="account_collected_id" ref="p154002"/>
+        <field name="account_paid_id" ref="p154002"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -36,21 +36,21 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0400</field>
-        <field name="account_collected_id" ref="p121102012"/>
-        <field name="account_paid_id" ref="p121102012"/>
+        <field name="account_collected_id" ref="p154003"/>
+        <field name="account_paid_id" ref="p154003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_urd"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_tds_audit_fee" model="account.tax.template">
-        <field name="name">Tds on Audit Fees - 94J</field>
-        <field name="description">Tds on Audit Fees - 94J</field>
+        <field name="name">TDS on Audit Fees - 94J</field>
+        <field name="description">TDS on Audit Fees - 94J</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1000</field>
-        <field name="account_collected_id" ref="p121103001"/>
-        <field name="account_paid_id" ref="p121103001"/>
+        <field name="account_collected_id" ref="p154004"/>
+        <field name="account_paid_id" ref="p154004"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -62,8 +62,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1000</field>
-        <field name="account_collected_id" ref="p121103002"/>
-        <field name="account_paid_id" ref="p121103002"/>
+        <field name="account_collected_id" ref="p154005"/>
+        <field name="account_paid_id" ref="p154005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -76,8 +76,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0750</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p121101004"/>
-        <field name="account_paid_id" ref="p121101004"/>
+        <field name="account_collected_id" ref="p154006"/>
+        <field name="account_paid_id" ref="p154006"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_import_duty"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -90,22 +90,22 @@
         <field name="type">percent</field>
         <field name="amount">0.0400</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p121101001"/>
-        <field name="account_paid_id" ref="p121101001"/>
+        <field name="account_collected_id" ref="p154007"/>
+        <field name="account_paid_id" ref="p154007"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_ic_st" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax 12.36%</field>
-        <field name="description">Input Credit - Service Tax 12.36%</field>
+        <field name="name">Input Credit - Service Tax 12%</field>
+        <field name="description">Input Credit - Service Tax 12%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p121101008"/>
-        <field name="account_paid_id" ref="p121101008"/>
+        <field name="account_collected_id" ref="p154007"/>
+        <field name="account_paid_id" ref="p154007"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -117,8 +117,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
-        <field name="account_collected_id" ref="p121101009"/>
-        <field name="account_paid_id" ref="p121101009"/>
+        <field name="account_collected_id" ref="p154009"/>
+        <field name="account_paid_id" ref="p154009"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -130,8 +130,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.3000</field>
-        <field name="account_collected_id" ref="p121103009"/>
-        <field name="account_paid_id" ref="p121103009"/>
+        <field name="account_collected_id" ref="p154010"/>
+        <field name="account_paid_id" ref="p154010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -143,8 +143,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0600</field>
-        <field name="account_collected_id" ref="p121101015"/>
-        <field name="account_paid_id" ref="p121101015"/>
+        <field name="account_collected_id" ref="p154011"/>
+        <field name="account_paid_id" ref="p154011"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -156,8 +156,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0500</field>
-        <field name="account_collected_id" ref="p1211010131"/>
-        <field name="account_paid_id" ref="p1211010131"/>
+        <field name="account_collected_id" ref="p154012"/>
+        <field name="account_paid_id" ref="p154012"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -170,8 +170,8 @@
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="p121101013"/>
-        <field name="account_paid_id" ref="p121101013"/>
+        <field name="account_collected_id" ref="p154013"/>
+        <field name="account_paid_id" ref="p154013"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -184,8 +184,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
         <field name="sequence">21</field>
-        <field name="account_collected_id" ref="p121101003"/>
-        <field name="account_paid_id" ref="p121101003"/>
+        <field name="account_collected_id" ref="p154014"/>
+        <field name="account_paid_id" ref="p154014"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
@@ -199,8 +199,8 @@
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
         <field name="sequence">22</field>
-        <field name="account_collected_id" ref="p121101011"/>
-        <field name="account_paid_id" ref="p121101011"/>
+        <field name="account_collected_id" ref="p154015"/>
+        <field name="account_paid_id" ref="p154015"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
@@ -208,14 +208,14 @@
     </record>
 
     <record id="account_tax_exice12_sale" model="account.tax.template">
-        <field name="name">Excise Duty - 12.36% - Sales</field>
-        <field name="description">Excise Duty - 12.36% - Sales</field>
+        <field name="name">Excise Duty - 12% - Sales</field>
+        <field name="description">Excise Duty - 12% - Sales</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="p121101014"/>
-        <field name="account_paid_id" ref="p121101014"/>
+        <field name="account_collected_id" ref="p247001"/>
+        <field name="account_paid_id" ref="p247001"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -224,12 +224,12 @@
     <record id="account_tax_edu_cess2" model="account.tax.template">
         <field name="name">Education Cess 2%</field>
         <field name="description">Education Cess 2%</field>
-        <field name="type_tax_use">all</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
         <field name="sequence">2</field>
-        <field name="account_collected_id" ref="p121101002"/>
-        <field name="account_paid_id" ref="p121101002"/>
+        <field name="account_collected_id" ref="p247010"/>
+        <field name="account_paid_id" ref="p247010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
@@ -239,57 +239,39 @@
     <record id="account_tax_seco_high_cess1" model="account.tax.template">
         <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
         <field name="description">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-        <field name="type_tax_use">all</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
         <field name="sequence">3</field>
-        <field name="account_collected_id" ref="p121101012"/>
-        <field name="account_paid_id" ref="p121101012"/>
+        <field name="account_collected_id" ref="p247002"/>
+        <field name="account_paid_id" ref="p247002"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_cess"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="account_tax_cst" model="account.tax.template">
-        <field name="name">CST</field>
-        <field name="description">CST</field>
-        <field name="type_tax_use">all</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0000</field>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_adv" model="account.tax.template">
-        <field name="name">ADV</field>
-        <field name="description">ADV</field>
-        <field name="type_tax_use">all</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0</field>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
     <record id="account_tax_in_sec_high_cap_good" model="account.tax.template">
         <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
         <field name="description">Input Sec. &amp; HEC - Capital Goods</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p121101007"/>
-        <field name="account_paid_id" ref="p121101007"/>
+        <field name="account_collected_id" ref="p154016"/>
+        <field name="account_paid_id" ref="p154016"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_tds_contr" model="account.tax.template">
-        <field name="name">TDS on Contractor-94C</field>
-        <field name="description">TDS on Contractor-94C</field>
+        <field name="name">TDS on Contractor - 94C</field>
+        <field name="description">TDS on Contractor - 94C</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
-        <field name="account_collected_id" ref="p121103003"/>
-        <field name="account_paid_id" ref="p121103003"/>
+        <field name="account_collected_id" ref="p154017"/>
+        <field name="account_paid_id" ref="p154017"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -301,8 +283,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
-        <field name="account_collected_id" ref="p121103004"/>
-        <field name="account_paid_id" ref="p121103004"/>
+        <field name="account_collected_id" ref="p154018"/>
+        <field name="account_paid_id" ref="p154018"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -314,8 +296,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.3</field>
-        <field name="account_collected_id" ref="p121103005"/>
-        <field name="account_paid_id" ref="p121103005"/>
+        <field name="account_collected_id" ref="p154019"/>
+        <field name="account_paid_id" ref="p154019"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -327,8 +309,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
-        <field name="account_collected_id" ref="p121103006"/>
-        <field name="account_paid_id" ref="p121103006"/>
+        <field name="account_collected_id" ref="p154020"/>
+        <field name="account_paid_id" ref="p154020"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -341,21 +323,21 @@
         <field name="type">percent</field>
         <field name="amount">0.1</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p121103007"/>
-        <field name="account_paid_id" ref="p121103007"/>
+        <field name="account_collected_id" ref="p154021"/>
+        <field name="account_paid_id" ref="p154021"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_tds_rent" model="account.tax.template">
-        <field name="name">TDS on Rent-94I</field>
+        <field name="name">TDS on Rent - 94I</field>
         <field name="description">TDS on Rent-94I</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
-        <field name="account_collected_id" ref="p121103008"/>
-        <field name="account_paid_id" ref="p121103008"/>
+        <field name="account_collected_id" ref="p154022"/>
+        <field name="account_paid_id" ref="p154022"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -367,8 +349,8 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
-        <field name="account_collected_id" ref="p121101005"/>
-        <field name="account_paid_id" ref="p121101005"/>
+        <field name="account_collected_id" ref="p154023"/>
+        <field name="account_paid_id" ref="p154023"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -380,22 +362,22 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.12</field>
-        <field name="account_collected_id" ref="p121101006"/>
-        <field name="account_paid_id" ref="p121101006"/>
+        <field name="account_collected_id" ref="p154024"/>
+        <field name="account_paid_id" ref="p154024"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_modvat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_in_vat4" model="account.tax.template">
-        <field name="name">Input Vat 4%</field>
-        <field name="description">Input Vat 4%</field>
+        <field name="name">Input VAT 4%</field>
+        <field name="description">Input VAT 4%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.04</field>
         <field name="sequence">4</field>
-        <field name="account_collected_id" ref="p121102007"/>
-        <field name="account_paid_id" ref="p121102007"/>
+        <field name="account_collected_id" ref="p154025"/>
+        <field name="account_paid_id" ref="p154025"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
         <field name="child_depend" eval="True"/>
@@ -403,56 +385,56 @@
     </record>
 
     <record id="account_tax_in_add_vat1" model="account.tax.template">
-        <field name="name">Input Additional Vat 1%</field>
-        <field name="description">Input Additional Vat 1%</field>
+        <field name="name">Input Additional VAT 1%</field>
+        <field name="description">Input Additional VAT 1%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
         <field name="sequence">5</field>
-        <field name="account_collected_id" ref="p121102003"/>
-        <field name="account_paid_id" ref="p121102003"/>
+        <field name="account_collected_id" ref="p154026"/>
+        <field name="account_paid_id" ref="p154026"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_in_vat15" model="account.tax.template">
-        <field name="name">Input Vat 15%</field>
-        <field name="description">Input Vat 15%</field>
+        <field name="name">Input VAT 15%</field>
+        <field name="description">Input VAT 15%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.15</field>
         <field name="sequence">7</field>
-        <field name="account_collected_id" ref="account.conf_xfa"/>
-        <field name="account_paid_id" ref="account.conf_xfa"/>
+        <field name="account_collected_id" ref="p154027"/>
+        <field name="account_paid_id" ref="p154027"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_out_vat4" model="account.tax.template">
-        <field name="name">Output Vat 4%</field>
-        <field name="description">Output Vat 4%</field>
+        <field name="name">Output VAT 4%</field>
+        <field name="description">Output VAT 4%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.04</field>
         <field name="sequence">11</field>
-        <field name="account_collected_id" ref="p121102009"/>
-        <field name="account_paid_id" ref="p121102009"/>
+        <field name="account_collected_id" ref="p247003"/>
+        <field name="account_paid_id" ref="p247003"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_out_adi_vat1" model="account.tax.template">
-        <field name="name">Output Adi. Vat 1%</field>
-        <field name="description">Output Adi. Vat 1%</field>
+        <field name="name">Output Adi. VAT 1%</field>
+        <field name="description">Output Adi. VAT 1%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
         <field name="sequence">12</field>
-        <field name="account_collected_id" ref="p121102008"/>
-        <field name="account_paid_id" ref="p121102008"/>
+        <field name="account_collected_id" ref="p247004"/>
+        <field name="account_paid_id" ref="p247004"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -466,8 +448,8 @@
         <field name="amount">0.02</field>
         <field name="sequence">13</field>
         <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="p121102001"/>
-        <field name="account_paid_id" ref="p121102001"/>
+        <field name="account_collected_id" ref="p247005"/>
+        <field name="account_paid_id" ref="p247005"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst12"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -480,8 +462,8 @@
         <field name="type">percent</field>
         <field name="amount">0.05</field>
         <field name="sequence">14</field>
-        <field name="account_collected_id" ref="p121102002"/>
-        <field name="account_paid_id" ref="p121102002"/>
+        <field name="account_collected_id" ref="p247006"/>
+        <field name="account_paid_id" ref="p247006"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst5"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -494,22 +476,22 @@
         <field name="type">percent</field>
         <field name="amount">0.1250</field>
         <field name="sequence">60</field>
-        <field name="account_collected_id" ref="p121102005"/>
-        <field name="account_paid_id" ref="p121102005"/>
+        <field name="account_collected_id" ref="p154028"/>
+        <field name="account_paid_id" ref="p154028"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_in_add_vat25" model="account.tax.template">
-        <field name="name">Input Additional Vat 2.5%</field>
-        <field name="description">Input Additional Vat 2.5%</field>
+        <field name="name">Input Additional VAT 2.5%</field>
+        <field name="description">Input Additional VAT 2.5%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0250</field>
         <field name="sequence">80</field>
-        <field name="account_collected_id" ref="p121102004"/>
-        <field name="account_paid_id" ref="p121102004"/>
+        <field name="account_collected_id" ref="p154029"/>
+        <field name="account_paid_id" ref="p154029"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -522,8 +504,8 @@
         <field name="type">percent</field>
         <field name="amount">0.02</field>
         <field name="sequence">9333</field>
-        <field name="account_collected_id" ref="p121102011"/>
-        <field name="account_paid_id" ref="p121102011"/>
+        <field name="account_collected_id" ref="p154030"/>
+        <field name="account_paid_id" ref="p154030"/>
         <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -546,34 +528,34 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
-        <field name="account_collected_id" ref="p121102017"/>
-        <field name="account_paid_id" ref="p121102017"/>
+        <field name="account_collected_id" ref="p247007"/>
+        <field name="account_paid_id" ref="p247007"/>
         <field name="base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_out_vat4_sal_ct3" model="account.tax.template">
-        <field name="name">Output Vat 4% on Sales - CT3</field>
-        <field name="description">Output Vat 4% on Sales - CT3</field>
+        <field name="name">Output VAT 4% on Sales - CT3</field>
+        <field name="description">Output VAT 4% on Sales - CT3</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.04</field>
-        <field name="account_collected_id" ref="p121102018"/>
-        <field name="account_paid_id" ref="p121102018"/>
+        <field name="account_collected_id" ref="p247008"/>
+        <field name="account_paid_id" ref="p247008"/>
         <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
-        <field name="name">Output Adi. Vat 1% Sales CT3</field>
-        <field name="description">Output Adi. Vat 1% Sales CT3</field>
+        <field name="name">Output Adi. VAT 1% Sales CT3</field>
+        <field name="description">Output Adi. VAT 1% Sales CT3</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p121102019"/>
-        <field name="account_paid_id" ref="p121102019"/>
+        <field name="account_collected_id" ref="p247009"/>
+        <field name="account_paid_id" ref="p247009"/>
         <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 1d721c76a94..1abccc181bb 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -38,15 +38,13 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_CSTP5">
-            <field name="name">Cst 5% on Purchase</field>
+            <field name="name">CST 5% on Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
-            <field name="code">CSTP5</field>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_PCST5">
             <field name="name">Purchase CST 5%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-            <field name="code">PCST5</field>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
@@ -69,8 +67,8 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_modvat">
-            <field name="name">Input Credit on Capital Goods - Modvate</field>
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cap_goods">
+            <field name="name">Input Excise Duty 12% - Capital Goods</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -99,9 +97,9 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_cess">
+        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
@@ -115,7 +113,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat1">
-            <field name="name">Input Additional Vat 1%</field>
+            <field name="name">Input Additional VAT 1%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -130,7 +128,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_vat15">
-            <field name="name">Input Vat 15%</field>
+            <field name="name">Input VAT 15%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -140,17 +138,17 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
-            <field name="name">Output Adi. Vat @1%</field>
+            <field name="name">Output Adi. VAT 1%</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_vat4">
-            <field name="name">Output Vat @4%</field>
+            <field name="name">Output VAT 4%</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
-            <field name="name">Cst 2% on Purchase</field>
+            <field name="name">CST 2% on Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -180,7 +178,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_tds_audit_fee">
-            <field name="name">Tds on Audit Fees - 94J</field>
+            <field name="name">TDS on Audit Fees - 94J</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -230,7 +228,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_vat">
-            <field name="name">Purchase Vat 4% / Vat12.5% / Vat15% / Cst2% / Cst5%</field>
+            <field name="name">Purchase VAT 4% / VAT 12.5% / VAT 15% / CST 2% / CST 5%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
@@ -245,47 +243,47 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_sales_vat">
-            <field name="name">Sales Vat 4% / Sales CST2% / Sales CST5%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+            <field name="name">Sales VAT 4% / Sales CST 2% / Sales CST 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_sale_cst12">
-            <field name="name">Sales CST2%</field>
+            <field name="name">Sales CST 2%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_sale_cst15">
-            <field name="name">Sales CST5%</field>
+            <field name="name">Sales CST 5%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_vat4">
-            <field name="name">Purchase Vat 4%</field>
+            <field name="name">Purchase VAT 4%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_vat12_vat15">
-            <field name="name">Purchase Vat12.5% / Vat15%</field>
+            <field name="name">Purchase VAT 12.5% / VAT 15%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_vat12">
-            <field name="name">Purchase Vat12.5%</field>
+            <field name="name">Purchase VAT 12.5%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_vat15">
-            <field name="name">Purchase Vat15%</field>
+            <field name="name">Purchase VAT 15%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_sal_vat4">
-            <field name="name">Sales Vat 4%</field>
+            <field name="name">Sales VAT 4%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_cst2">
-            <field name="name">Purchase Cst2%</field>
+            <field name="name">Purchase CST 2%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
@@ -325,7 +323,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_out_add1_sale_cst3">
-            <field name="name">Output Adi. Vat 1% on Sales CT3</field>
+            <field name="name">Output Adi. VAT 1% on Sales CT3</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
@@ -389,10 +387,5 @@
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_base_service">
-            <field name="name">Base for Input Service</field>
-            <field name="parent_id" ref="vat_code_base_net"/>
-        </record>
-
     </data>
 </openerp>

From e9065f77273a544c99b546bf58201ee9c08b4b73 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 21 Mar 2013 18:10:36 +0530
Subject: [PATCH 031/197] [IMP] Reduced code, deleted redundant code, deleted
 the edit template and used it in the existing by using 'mode' and improved
 code using the existing code and removed unwanted code.

bzr revid: psa@tinyerp.com-20130321124036-0s4pv3oivzesmjh5
---
 addons/mail/mail_thread.py                    | 31 ++---------
 addons/mail/static/src/js/mail_followers.js   | 53 +++++++++----------
 addons/mail/static/src/xml/mail_followers.xml | 17 +-----
 3 files changed, 32 insertions(+), 69 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c901f6e64c2..2268e66ce36 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -126,6 +126,8 @@ class mail_thread(osv.AbstractModel):
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 
+        if context and 'partner_id' in context:
+            user_pid = context.get('partner_id')
         # find the document followers, update the data
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, uid, [
@@ -138,6 +140,7 @@ class mail_thread(osv.AbstractModel):
             for subtype in fol.subtype_ids:
                 thread_subtype_dict[subtype.name]['followed'] = True
             res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
+
         return res
 
     def _search_message_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
@@ -289,34 +292,8 @@ class mail_thread(osv.AbstractModel):
         default['message_follower_ids'] = []
         return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
 
-    #------------------------------------------------------
-    # Edit and apply followers subtypes.
-    #------------------------------------------------------
-    def edit_followers_subtype(self, cr, uid, ids, partner_id, context=None):
-        res = dict((id, dict(message_subtype_data='')) for id in ids)
-
-        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))
-        for id in ids:
-            res[id]['message_subtype_data'] = subtype_dict.copy()
-
-        fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, uid, [
-            ('partner_id', '=', partner_id),
-            ('res_id', 'in', ids),
-            ('res_model', '=', self._name),
-        ], context=context)
-        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
-            thread_subtype_dict = res[fol.res_id]['message_subtype_data']
-            for subtype in fol.subtype_ids:
-                thread_subtype_dict[subtype.name]['followed'] = True
-            res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
-        return res
-
     def apply_edited_subtypes(self, cr, uid, ids, partner_id, check_list, context=None):
-        """ Apply the edited subtypes
-                  of the user."""
+        """ Apply the edited subtypes of the user."""
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, uid, [
             ('partner_id', '=', partner_id),
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 1ca65087316..155cd74ebeb 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -81,37 +81,27 @@ openerp_mail_followers = function(session, mail) {
 
         on_edit_subtype: function(event) {
             var self = this;
-            var records = [];
             var partner_id = $(event.target).data('id');
-            var partner_name = $(event.target).siblings('a').text(); 
-            var id = this.view.datarecord.id;
-            var res_model = this.view.dataset.model;
-            var $dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
+            var context = new session.web.CompoundContext(this.build_context(), {'partner_id': partner_id});
+            self.$dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
                             modal: true,
-                            title: _t('Edit Subtypes of ') + '"' + partner_name + '"',
+                            width: 'auto',
+                            height: 'auto',
+                            title: _t('Edit Subscriptions of ') + $(event.target).siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
-                                        self.on_apply_subtype(id, partner_id);
+                                        self.on_apply_subtype(partner_id);
                                         $(this).remove();
                                     }},
                                     { text: _t("Cancel"), click: function() { $(this).remove(); }}
                                 ],
                     });
-            this.ds_model.call('edit_followers_subtype', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {
-                    if (data[id]) {
-                        records = data[id].message_subtype_data;
-                        }
-                        _(records).each(function (record, record_name) {
-                            record.name = record_name;
-                            record.followed = record.followed || undefined;
-                           $(session.web.qweb.render("mail.followers.edit.subtype", {'record': record})).appendTo($dialog);
-                        });
-                });
+             return self.fetch_subtypes(context);
         },
 
-        on_apply_subtype: function(id, partner_id) {
+        on_apply_subtype: function(partner_id) {
             var check_list = new Array();
+            var id = this.view.datarecord.id;
             _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
                  if ($(record).is(':checked')) {
                      check_list.push(parseInt($(record).data('id')));
@@ -256,25 +246,34 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function () {
+        fetch_subtypes: function (context) {
             var self = this;
-            var subtype_list_ul = this.$('.oe_subtype_list').empty();
-            if (! this.message_is_follower) return;
+            var mode = "";
+            if (context && context.eval('partner_id')) {
+                mode = "edit_follower";
+            } else {
+                var subtype_list_ul = this.$('.oe_subtype_list').empty();
+                if (! this.message_is_follower) return;
+            }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id], new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id);});
+            this.ds_model.call('message_get_subscription_data', [[id],context])
+                .then(function (data) {self.display_subtypes(data, id, mode);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id) {
+        display_subtypes:function (data, id, mode) {
             var self = this;
             var $list = this.$('.oe_subtype_list');
-            $list.empty().hide();
+            if (mode.length == 0){ $list.empty().hide();}
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
+                if (mode.length == 0) {
+                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( self.$('.oe_subtype_list') );
+                } else {
+                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo(self.$dialog);
+                }
             });
             if (_.size(records) > 1) {
                 $list.show();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index ea11c26570b..6420046477c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -42,21 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
-            </tr>
-        </table>
-    </t>
-
-    <!--
-        followers.edit.subtype template
-        Template used to edit the display message subtypes of a follower subscription
-    -->
-    <t t-name="mail.followers.edit.subtype">
-        <table class='oe_subtype'>
-            <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_edit_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_edit_check"/></td>
-                <td><label t-att-for="'input_mail_followers_edit_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>

From e627fce6b8a3b9db56967a7b8d93b24a9bdc45f5 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 21 Mar 2013 18:18:59 +0530
Subject: [PATCH 032/197] [IMP] Little improvement with context(context is
 None:).

bzr revid: psa@tinyerp.com-20130321124859-281pcjosai1xtvaj
---
 addons/mail/mail_thread.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2268e66ce36..c8086a8db76 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -116,6 +116,8 @@ class mail_thread(osv.AbstractModel):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
                 available, which are followed if any """
+        if context is None:
+            context = {}
         res = dict((id, dict(message_subtype_data='')) for id in ids)
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
 
@@ -126,7 +128,7 @@ class mail_thread(osv.AbstractModel):
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 
-        if context and 'partner_id' in context:
+        if 'partner_id' in context:
             user_pid = context.get('partner_id')
         # find the document followers, update the data
         fol_obj = self.pool.get('mail.followers')

From f1db1ed7783b664ac3b6cceb085edfdddb7b8ee2 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Fri, 22 Mar 2013 13:52:06 +0530
Subject: [PATCH 033/197] [IMP]Add method for checking the group technical
 features.

bzr revid: vja@tinyerp.com-20130322082206-x2490850o8qbkmk0
---
 addons/mail/mail_thread.py                    | 7 +++++++
 addons/mail/static/src/js/mail_followers.js   | 9 +++++++--
 addons/mail/static/src/xml/mail_followers.xml | 3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c8086a8db76..f25d58c90e6 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -112,6 +112,13 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
+    def check_access_right(self, cr, uid,ids , context=None ):
+        grp_id =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
+        user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
+        if uid in user_pid:
+            return True
+        return False
+
     def _get_subscription_data(self, cr, uid, ids, name, args, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 155cd74ebeb..c615ceb35e5 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -210,14 +210,19 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
+            this.check_access = false;
+
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                self.ds_model.call('check_access_right', [self.session.uid]).then(function(r){
+                    self.check_access = r;
+                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                })
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 6420046477c..bdcfd1e048c 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,8 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.session.uid === 1" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <t t-js="d">console.log("dsfsdfd",d)</t>
+        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From bd6a436bbb04b8121e58ad8b547ba8d7c67c3584 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 22 Mar 2013 14:40:26 +0530
Subject: [PATCH 034/197] [IMP] Added css for the ' Close(X)' icon of the
 dialog box when the title size increases than overlap the title.

bzr revid: psa@tinyerp.com-20130322091026-m0eqoqnt1t2p184v
---
 addons/mail/mail_thread.py                    | 2 +-
 addons/mail/static/src/css/mail.css           | 4 +++-
 addons/mail/static/src/js/mail_followers.js   | 4 ++--
 addons/mail/static/src/xml/mail_followers.xml | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index f25d58c90e6..14d13ab7094 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -112,7 +112,7 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def check_access_right(self, cr, uid,ids , context=None ):
+    def check_access_right(self, cr, uid, ids, context=None):
         grp_id =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
         user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
         if uid in user_pid:
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 6d7d8875601..9805c9d3a61 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -646,7 +646,9 @@
     width: 10px !important;
     height: 12px !important;
 }
-
+.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
+    padding-right: 20px;
+}
 .openerp .oe_followers .oe_show_more{
     cursor: pointer;
 }
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index c615ceb35e5..7e49a391bca 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -218,8 +218,8 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_access_right', [self.session.uid]).then(function(r){
-                    self.check_access = r;
+                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
+                    self.check_access = result;
                     record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                     $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 })
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index bdcfd1e048c..081111a9afd 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,6 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <t t-js="d">console.log("dsfsdfd",d)</t>
         <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>

From 22cd9a5c13877201ecccc6c0c66f0137e517099e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 22 Mar 2013 16:47:15 +0530
Subject: [PATCH 035/197] [IMP]Improve label and help of /Skip 'Draft' State
 for Manual Entries/

bzr revid: psa@tinyerp.com-20130322111715-qbxuq3166o0z2puc
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 8c7f058acc6..fda094efb5f 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -722,7 +722,7 @@ class account_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
-        'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='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. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
+        'entry_posted': fields.boolean('Autopost created moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries are automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
         'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
 

From fb82744bac71db510c90a867350675dad601b631 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 22 Mar 2013 17:35:33 +0530
Subject: [PATCH 036/197] [IMP] Improved.

bzr revid: psa@tinyerp.com-20130322120533-n6oofcl1c7d532cb
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index fda094efb5f..8709b59fa62 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -722,7 +722,7 @@ class account_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
-        'entry_posted': fields.boolean('Autopost created moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries are automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
+        'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries are automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
         'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
 

From 6624bf9675a54e93be5983163722e183b8e3cefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 27 Mar 2013 15:14:26 +0100
Subject: [PATCH 037/197] [FIX] point_of_sale: add scrollbar when there are too
 much payment methods

bzr revid: fva@openerp.com-20130327141426-ivgfxlsxlpazehar
---
 addons/point_of_sale/static/src/css/pos.css | 7 ++++++-
 addons/point_of_sale/static/src/xml/pos.xml | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index d9a4d6d00a9..16355240f25 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -291,10 +291,15 @@
     display: inline-block;
     text-align: center;
     vertical-align: top;
+    width: 205px;
+    max-height: 232px;
+    overflow-y: auto;
+    overflow-x: hidden;
 }
 .point-of-sale #paypad button {
     height: 50px;
-    width: 208px;
+    display: block;
+    width: 100%;
     margin: 0px -6px 4px -2px;
     font-weight: bold;
     vertical-align: middle;
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 3da76ec12d8..1dce368b9cb 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -538,7 +538,6 @@
         <button class="paypad-button" t-att-cash-register-id="widget.cashRegister.get('id')">
             <t t-esc="widget.cashRegister.get('journal').name"/>
         </button>
-        <br />
     </t>
 
     <t t-name="OrderButtonWidget">

From 28ed62fd7e22fe79d856926e6ce91aba5f0dd429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 27 Mar 2013 16:15:18 +0100
Subject: [PATCH 038/197] [IMP] point_of_sale: adding visual feedback when
 clicking on buttons

bzr revid: fva@openerp.com-20130327151518-t4h67hqn02s80tai
---
 addons/point_of_sale/static/src/css/pos.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 16355240f25..e328054aa28 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -307,6 +307,17 @@
     border-top: 1px solid #efefef;
     font-size: 14px;
 }
+.point-of-sale #paypad button, .point-of-sale #numpad button, .point-of-sale .popup button{
+    position: relative;
+    top: 0;
+    -webkit-transition: top 150ms linear;
+       -moz-transition: top 150ms linear;
+        -ms-transition: top 150ms linear;
+            transition: top 150ms linear;
+}
+.point-of-sale #paypad button:active, .point-of-sale #numpad button:active, .point-of-sale .popup button:active{
+    top:3px;
+}
 .point-of-sale #paypad button:hover, .point-of-sale #numpad button:hover, .point-of-sale #numpad .selected-mode, .point-of-sale .popup button:hover {
     border: none;
     color: white;

From 74b3538dd17b291c47fcb5697484506c66d6429d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 27 Mar 2013 16:40:54 +0100
Subject: [PATCH 039/197] [IMP] point_of_sale: add an invoice button (does
 nothing yet)

bzr revid: fva@openerp.com-20130327154054-nhfy6ak73v1gwj09
---
 .../static/src/img/icons/png48/invoice.png    | Bin 0 -> 2086 bytes
 addons/point_of_sale/static/src/js/screens.js |  18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 addons/point_of_sale/static/src/img/icons/png48/invoice.png

diff --git a/addons/point_of_sale/static/src/img/icons/png48/invoice.png b/addons/point_of_sale/static/src/img/icons/png48/invoice.png
new file mode 100644
index 0000000000000000000000000000000000000000..e65d2ec5a67398a6aa245c89d66355ae3e5a0d46
GIT binary patch
literal 2086
zcmV+>2-)|EP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000N=Nkl<Zc-q~V
zX>3$g6o3^(HlyMaw}_JX0}^BWW6(b){xLDe#69s3KTTXhkf3a>RIF5r#a2ppT9Cp(
zX**@6oo>(~2BX!1(q-Cdk)@Sx)0w_5vrp%E&h6>Dym>5nbq1ri`7+a)dGDR?oOADe
zGj{;Mf13ZVKy!1=qbHi{iyE71{S7B=K-8b8(NNb|t)aHTs$#1rEGjj1$B9T?qxFid
z!D_SCR;{&KtxFOn(AZ?l86Fv$hB%IJBn)2P6bug!z}Yst-&R*WQC(+FZf<VAEA9gI
zCv20^XcU5>00aVl@C$t4^LxSP^NK*Gyu>6-PE8==Fflm};}Z%p2Fkbx#t@I<2G7_i
zxRFth3&s==p2LUd4T2m0x1VqESJzhkQr1{@Ut9%h8>++jD1!F;IdB96Cn#`z@RN!V
zP-X=bLJCm8qwW!KxrgyJHw1$Lah#*OJ!G+&`z)5S6>$^5z7+y8Xc@SG0%tG?L;;z7
zf`cb!gBQ#Q3=aPVSNbkN043-cXRl+rs=8dMtSoyeE&|oH$A!R@ZzkXi7cM}1dwbky
zYiol}M>`A-4UmM8?ETXTW=pxZqT<Ml|5(6kGm`*kIVRgvh|Ib`xi<4L+2{5_M$`(p
zMu*|zWlTy(D@15=W0HnP2f=xv3o5J1+@|BE$N!OlrMglGaIjc`UdmitX=!PJrluxr
z$4Ll<LnM!_brsIHpADCrk93xllq{OFK$W$e1bAXHvd;-k)^(Ye+1K_zPvQ}*z?J?>
z(BWtk0yM-D>lzXgzx?)d;8>;U=$r-2mSZHKwntBoGwv0z+wE}r^l3PC>J<EO_7AWl
zT|EvVaCNW`>Kkgj2M_Q6U`_%RRYyrcW|$e%AhRwrKT4SwxCPkzoP7aT0Kp*p!P(OV
zzuSL<=ATZ2#aac2O{HM2s({{$Jz_qXj+OQUz@3H#um@2f3JR^|h%*5dXl-qUGiS~~
zeSJNc&1NV)REh$JplDwK6c!c0#Y??VQ+s^kK<U1>3=5Q1m`FfwMk<<YbFUMl3}>Am
zM`izO=Kw<e{?|Ys{E4ekm$MTm?>T6}YBZfX0Y{FRQ0O3>J8y@Bhl&pv7C2gdC>$jL
z4wNg9a5_6X#T*zK8Gyd4mua&@fs)IH1x#h7BtRLaYzjOQ{r?(V-1`Dq1^4V6kbA+1
zU<gKBLs*ePW<UrGBD9H?94L(B=jSglByjlXk1Q|~l+&5`3UqXIVBjo)k0cQa1)&%P
zXiqRCP-;Sf=&XQ?k(qbL;NkaGJbaA48jPkI$PiTmgD0c}#ZbI|E&_-53jq!$p%oYy
zx+)}OTd5L4pr|C@xB$+4jev?K(=Oc{@DOq@(9a850g0>x!xAh|Se$2E0M}j?a3#C~
z-2c=*ETAF;@{4ke3+(@~P$MAFXPV%BK<*6$?-zvJCloz=en!7<&_a?|xYxMAz5@lC
z7V7G9+>TX<uBB-`K!MzR5=b#7P*j{p0-BxG<Ke!R8I_qHCp-d$Q0Tc9<$CDutF-r4
zG;;E?jSCd)%as)vi|-uh@9*Q=a^3B@?iQWK-rOG|DMkhI3-@YTNcO$#ZJAYZVGcxo
zcbE{28-$LPax}7YvWyGl7G(2A#_e*epk=V)Tim2zLXUR>rkF`$>Uu~a8hiF;Mp9A?
z3gqPNApz=1UEunlwE@%pix&Dt<0jzyF~_LqqLG!o+qgh>ZWi4OsgsevktH05!$AV7
z6phRuGK>rC$;l)E%D5)$+}FBn%Z!R2z!)F+iNGxW8{m^apvC-%Mq_u@F5?1NwlD|*
zu}WYCdTv_<D0n}M(8%~c-MB#Jo(v(ttAU)H`mA%tWR?R&FaSX!L<AwE5`s{eq38U1
zkl<qiK|G!-Lu1$OoyG;e&)OvfxNQ<v0Yy<DtO`ky0E^H_|1QnAKt^WzjDXtn`t19-
z-#PPiLC!j7I~>B`!s2K3NF*Ydo|Z(22q8WbBQhgFW9P0N#s$9Hy%PmM73k^hxgFn!
zDFM`4Y9(l-?MyW;ke-po0=iX4_C8NG+4s8aQ+7G?(=Z*K7PrSV=#dbwb0uUIv;sT6
z{o1$ymW^9TSAm4n-QBGbNKO07m;jDD)6!E(;1(;8S6hW3!Yhxgf}96j4T-M*^%I%K
z*WYZ5tY5!=@y!J|aAy9FZ>7Na+*cvGi>01s89gCQ;DmN5rIC`F99gqw%~FhO9>u2@
z;NbZKcOi>X)3yr%1qE)s1AA}27x3KB5gW7&T-}*zZ2KxHvU>IE2QjX@DY-167vSI*
zBM*F&w%tn;i~?75w-Gnk(5@BH%CHc_fvN;JXc@S=JV)^_Ib~~j*|KHJF|K=&g;GK*
zFpmxILzaKOX@jNp{JAI&_%}zlvkTUJ_Ng6XdJcI6S;C3d3$We&$WyDHUG?_bb)WpY
zZF^GW%apCaU^ccu^0pb01e+o0%Ne#3$(vNR5J?+VHWORF5Nsm0e6F&Q*t|jT1%uC{
zAAS5`$I6u}*J4c1Bab3WZziySKkzW}4Dtf<3i2BA2J$BIF7h7pe%z4fe21^|I`S&=
zG6(-8vJ6>t{TAZYhudfgSK=YIew<IR9C?~qkpP~i>hpD;Kpx|^d64^mF=u~XjDUV6
zVv&VxyqKi8I`<@)rOXn(?jnw30Vh}uUJB?WSVS^kf^vyvz7~#w<BE;<Z)-8^(WCf(
Q<^TWy07*qoM6N<$f{QWH@c;k-

literal 0
HcmV?d00001

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index eca4a3c5915..a99de66988d 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -886,6 +886,15 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     },
                 });
 
+            this.invoice_button = this.add_action_button({
+                    label: 'Invoice',
+                    name: 'invoice',
+                    icon: '/point_of_sale/static/src/img/icons/png48/invoice.png',
+                    click: function(){
+                        self.validateCurrentOrder({invoice: true});
+                    },
+                });
+
             this.updatePaymentSummary();
             this.line_refocus();
         },
@@ -897,11 +906,15 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         back: function() {
             this.pos_widget.screen_selector.set_current_screen(self.back_screen);
         },
-        validateCurrentOrder: function() {
+        validateCurrentOrder: function(options) {
+            options = options || {};
+
             var currentOrder = this.pos.get('selectedOrder');
 
             this.pos.push_order(currentOrder.exportAsJSON()) 
-            if(this.pos.iface_print_via_proxy){
+            if(options.invoice){
+                console.log('send invoice');
+            }else if(this.pos.iface_print_via_proxy){
                 this.pos.proxy.print_receipt(currentOrder.export_for_printing());
                 this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
             }else{
@@ -984,6 +997,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 
             if(this.pos_widget.action_bar){
                 this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+                this.pos_widget.action_bar.set_button_disabled('invoice', remaining > 0);
             }
         },
         set_numpad_state: function(numpadState) {

From 0fdf9066ddb12b5058b055433b9b98e62189c83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 28 Mar 2013 16:07:18 +0100
Subject: [PATCH 040/197] [FIX] point_of_sale: fixing potential timeout issues
 when sending orders over bad connection

bzr revid: fva@openerp.com-20130328150718-zj91ljrlkvv59tkj
---
 addons/point_of_sale/static/src/js/db.js     |  16 ++-
 addons/point_of_sale/static/src/js/models.js | 133 +++++++++++++------
 2 files changed, 109 insertions(+), 40 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index a79b111b5c5..c28c08950db 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -267,11 +267,12 @@ function openerp_pos_db(instance, module){
             return results;
         },
         add_order: function(order){
-            var last_id = this.load('last_order_id',0);
+            var order_id = this.load('last_order_id',0) + 1;
             var orders  = this.load('orders',[]);
-            orders.push({id: last_id + 1, data: order});
-            this.save('last_order_id',last_id+1);
+            orders.push({id: order_id, data: order});
+            this.save('last_order_id', order_id);
             this.save('orders',orders);
+            return order_id;
         },
         remove_order: function(order_id){
             var orders = this.load('orders',[]);
@@ -283,5 +284,14 @@ function openerp_pos_db(instance, module){
         get_orders: function(){
             return this.load('orders',[]);
         },
+        get_order: function(order_id){
+            var orders = this.get_orders();
+            for(var i = 0, len = orders.length; i < len; i++){
+                if(orders[i].id === order_id){
+                    return orders[i];
+                }
+            }
+            return undefined;
+        },
     });
 }
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 660434ba53e..ac86ee852e0 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -120,7 +120,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
                     return self.fetch('res.currency',['symbol','position','rounding','accuracy'],[['id','=',self.get('company').currency_id[0]]]);
                 }).then(function(currencies){
-                    console.log('Currency:',currencies[0]);
                     self.set('currency',currencies[0]);
 
                     return self.fetch('product.uom', null, null);
@@ -256,12 +255,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             }
         },
 
-        // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
-        push_order: function(record) {
-            this.db.add_order(record);
-            this.flush();
-        },
-
         //creates a new empty order and sets it as the current order
         add_new_order: function(){
             var order = new module.Order({pos:this});
@@ -269,45 +262,111 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.set('selectedOrder', order);
         },
 
+        // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
+        // it returns a deferred that succeeds or fail when the pushed order is successfully posted on the server, previously failed orders
+        // will try to be re-sent but don't make this method return false if they fail. ( So that in the unlikely case of an order making
+        // the server crash, the other orders can still be sent )
+        // payment process ) 
+        push_order: function(record) {
+            var self = this;
+            var order_id = this.db.add_order(record);
+            var pushed = new $.Deferred();
+
+            this.set('nbr_pending_operations',self.db.get_orders().length);
+
+            this.flush_mutex.exec(function(){
+
+                //first we try to push all orders (the one we added and the one that were not sent)
+                var tried_all = self._flush_all_orders();
+                var done = new $.Deferred();
+
+                tried_all.always(function(){
+                    // then we verify that the one we just added has been sent successfuly.
+                    self._flush_order(order_id)
+                        .done(   function(){ pushed.resolve();})
+                        .fail(   function(){ pushed.reject(); })
+                        .always( function(){ done.resolve();  });
+                });
+
+                return done;
+            });
+
+            return pushed;
+        },
+
+
         // attemps to send all pending orders ( stored in the pos_db ) to the server,
         // and remove the successfully sent ones from the db once
         // it has been confirmed that they have been sent correctly.
         flush: function() {
-            //TODO make the mutex work 
-            //this makes sure only one _int_flush is called at the same time
-            /*
-            return this.flush_mutex.exec(_.bind(function() {
-                return this._flush(0);
-            }, this));
-            */
-            this._flush(0);
+            var self = this;
+            var flushed = new $.Deferred();
+
+            this.flush_mutex.exec(function(){
+                var done = new $.Deferred();
+
+                self._flush_all_orders()
+                    .done(  function(){ flushed.resolve();})
+                    .fail(  function(){ flushed.reject(); })
+                    .always(function(){ done.resolve();   });
+
+                return done;
+            });
+
+            return flushed;
         },
-        // attempts to send an order of index 'index' in the list of order to send. The index
-        // is used to skip orders that failed. do not call this method outside the mutex provided
-        // by flush() 
-        _flush: function(index){
+
+        // attempts to send the locally stored order of id 'order_id'
+        // the sending is asynchronous and can take a long time to decide if it is successful or not (60s)
+        // it is therefore important to only call this method from inside a mutex
+        // this method returns a deferred indicating wether the sending was successful or not
+        _flush_order: function(order_id){
+            var self   = this;
+            var order  = this.db.get_order(order_id);
+
+            if(!order){
+                // flushing a non existing order always succeeds
+                return (new $.Deferred()).resolve();
+            }
+
+            //we try to send the order. shadow prevents a spinner if it takes too long.
+            var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: true, timeout: 2000});
+            
+            rpc.fail(function(unused,event){
+                //prevent an error popup creation by the rpc failure
+                event.preventDefault();
+                console.error('Failed to send order:',order);
+            });
+
+            rpc.done(function(){
+                self.db.remove_order(order_id);
+                self.set('nbr_pending_operations',self.db.get_orders().length);
+            });
+
+            return rpc;
+        },
+        
+        // attempts to send all the locally stored orders. As with _flush_order, it should only be
+        // called from within a mutex. 
+        // this method returns a deferred that always succeeds when all orders have been tried to be sent,
+        // even if none of them could actually be sent. 
+        _flush_all_orders: function(){
             var self = this;
             var orders = this.db.get_orders();
-            self.set('nbr_pending_operations',orders.length);
+            var tried_all = new $.Deferred();
 
-            var order  = orders[index];
-            if(!order){
-                return;
+            function rec_flush(index){
+                if(index < orders.length){
+                    self._flush_order(orders[index].id).always(function(){ 
+                        rec_flush(index+1); 
+                    })
+                }else{
+                    tried_all.resolve();
+                }
             }
-            //try to push an order to the server
-            // shadow : true is to prevent a spinner to appear in case of timeout
-            (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{ shadow:true })
-                .fail(function(unused, event){
-                    //don't show error popup if it fails 
-                    event.preventDefault();
-                    console.error('Failed to send order:',order);
-                    self._flush(index+1);
-                })
-                .done(function(){
-                    //remove from db if success
-                    self.db.remove_order(order.id);
-                    self._flush(index);
-                });
+            rec_flush(0);
+
+            return tried_all;
         },
 
         scan_product: function(parsed_ean){

From 96a74ae6ad1872a519cbe70d07fe2fbc00b40cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 28 Mar 2013 16:35:37 +0100
Subject: [PATCH 041/197] [IMP] point_of_sale: ...

bzr revid: fva@openerp.com-20130328153537-ohdc3243lcu3dgbj
---
 addons/point_of_sale/static/src/js/models.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index ac86ee852e0..6a9d54ce608 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -294,7 +294,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             return pushed;
         },
 
-
         // attemps to send all pending orders ( stored in the pos_db ) to the server,
         // and remove the successfully sent ones from the db once
         // it has been confirmed that they have been sent correctly.

From 703039f7c6cd660210e2d1cf4b59c19323557956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 28 Mar 2013 16:39:51 +0100
Subject: [PATCH 042/197] [IMP] web corelib: adding timeout option to the rpc
 api

bzr revid: fva@openerp.com-20130328153951-om7hrs5l10oc0vm2
---
 addons/web/static/src/js/corelib.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index bfde707312c..c31b4ff5606 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1011,6 +1011,9 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         var deferred = $.Deferred();
         if (! options.shadow)
             this.trigger('request', url, payload);
+        
+        if (options.timeout)
+            url.timeout = options.timeout;
 
         this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {

From cae96ed4543abc9f05dbc4398a1832a1468639c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 29 Mar 2013 12:00:48 +0100
Subject: [PATCH 043/197] [FIX] point_of_sale: correctly set the customer on
 the order

bzr revid: fva@openerp.com-20130329110048-1cx2sr4hp98cue0f
---
 addons/point_of_sale/point_of_sale.py        | 3 ++-
 addons/point_of_sale/static/src/js/models.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 44139f7a499..9ee5b944718 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -489,7 +489,8 @@ class pos_order(osv.osv):
                 'user_id': order['user_id'] or False,
                 'session_id': order['pos_session_id'],
                 'lines': order['lines'],
-                'pos_reference':order['name']
+                'pos_reference':order['name'],
+                'partner_id': order['partner_id'] or False
             }, context)
 
             for payments in order['statement_ids']:
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 6a9d54ce608..426bea9a9b7 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -330,7 +330,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
             //we try to send the order. shadow prevents a spinner if it takes too long.
             var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: true, timeout: 2000});
-            
+
             rpc.fail(function(unused,event){
                 //prevent an error popup creation by the rpc failure
                 event.preventDefault();
@@ -863,7 +863,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 lines: orderLines,
                 statement_ids: paymentLines,
                 pos_session_id: this.pos.get('pos_session').id,
-                partner_id: this.pos.get('client') ? this.pos.get('client').id : undefined,
+                partner_id: this.get_client() ? this.get_client().id : false,
                 user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
             };
         },

From b32cc3b4427c6d59581da13d039bde931ce82a5c Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 4 Apr 2013 12:37:23 +0530
Subject: [PATCH 044/197] [IMP] Improved code 1) Edit Subscriptions of -> Edit
 Subscription (without 's') of 2) Instead of defining a new
 'apply_edited_subtype', you can use 'message_subscribe' that has an optional
 'subtype_ids' parameter that already allows to manage subtypes of a
 subscription. 3) In _get_subscription_data: do not use context when it is not
 necessary. Please add a parameter user_id=None that will be used instead of
 uid to find user_pid. 4) Instead of defining a new 'on_apply_subtype', can't
 you reuse 'do_update_subscription' with maybe some update to handle the
 classic use / edit widget ? The above changes has been done.

bzr revid: psa@tinyerp.com-20130404070723-5v1v35fte6vl2b2j
---
 addons/mail/mail_thread.py                  | 31 ++++--------
 addons/mail/static/src/js/mail_followers.js | 55 +++++++++------------
 2 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index db177db7e8c..63f5b8316df 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -119,12 +119,10 @@ class mail_thread(osv.AbstractModel):
             return True
         return False
 
-    def _get_subscription_data(self, cr, uid, ids, name, args, context=None):
+    def _get_subscription_data(self, cr, uid, ids, user_id, name, args, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
                 available, which are followed if any """
-        if context is None:
-            context = {}
         res = dict((id, dict(message_subtype_data='')) for id in ids)
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
 
@@ -135,8 +133,8 @@ class mail_thread(osv.AbstractModel):
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 
-        if 'partner_id' in context:
-            user_pid = context.get('partner_id')
+        if user_id:
+            user_pid = user_id
         # find the document followers, update the data
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, uid, [
@@ -301,17 +299,6 @@ class mail_thread(osv.AbstractModel):
         default['message_follower_ids'] = []
         return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
 
-    def apply_edited_subtypes(self, cr, uid, ids, partner_id, check_list, context=None):
-        """ Apply the edited subtypes of the user."""
-        fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, uid, [
-            ('partner_id', '=', partner_id),
-            ('res_id', 'in', ids),
-            ('res_model', '=', self._name),
-        ], context=context)
-        fol_obj.write(cr, uid, fol_ids, {'subtype_ids': [(6,0, check_list)]}, context=context)
-        return True
-
     #------------------------------------------------------
     # Automatically log tracked fields
     #------------------------------------------------------
@@ -1102,21 +1089,23 @@ class mail_thread(osv.AbstractModel):
     # Followers API
     #------------------------------------------------------
 
-    def message_get_subscription_data(self, cr, uid, ids, context=None):
+    def message_get_subscription_data(self, cr, uid, ids, user_id=None, context=None):
         """ Wrapper to get subtypes data. """
-        return self._get_subscription_data(cr, uid, ids, None, None, context=context)
+        return self._get_subscription_data(cr, uid, ids, user_id, None, None, context=context)
 
-    def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, context=None):
+    def message_subscribe_users(self, cr, uid, ids, user_ids=None, partner_id=None, subtype_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, subscribe uid instead. """
         if user_ids is None:
             user_ids = [uid]
         partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
-        return self.message_subscribe(cr, uid, ids, partner_ids, subtype_ids=subtype_ids, context=context)
+        return self.message_subscribe(cr, uid, ids, partner_ids, partner_id, subtype_ids=subtype_ids, context=context)
 
-    def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
+    def message_subscribe(self, cr, uid, ids, partner_ids, user_id, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        if user_id:
+            partner_ids = [user_id]
         if set(partner_ids) == set([user_pid]):
             self.check_access_rights(cr, uid, 'read')
         else:
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 7e49a391bca..bc15eed3fd9 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -82,38 +82,20 @@ openerp_mail_followers = function(session, mail) {
         on_edit_subtype: function(event) {
             var self = this;
             var partner_id = $(event.target).data('id');
-            var context = new session.web.CompoundContext(this.build_context(), {'partner_id': partner_id});
-            self.$dialog = new session.web.dialog($('<div class = "oe_edit_actions">'), {
+            self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
                             width: 'auto',
                             height: 'auto',
-                            title: _t('Edit Subscriptions of ') + $(event.target).siblings('a').text(),
+                            title: _t('Edit Subscription of ') + $(event.target).siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
-                                        self.on_apply_subtype(partner_id);
+                                        self.do_update_subscription(event, partner_id);
                                         $(this).remove();
                                     }},
                                     { text: _t("Cancel"), click: function() { $(this).remove(); }}
                                 ],
                     });
-             return self.fetch_subtypes(context);
-        },
-
-        on_apply_subtype: function(partner_id) {
-            var check_list = new Array();
-            var id = this.view.datarecord.id;
-            _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
-                 if ($(record).is(':checked')) {
-                     check_list.push(parseInt($(record).data('id')));
-                 }
-            });
-
-            if (!check_list.length) {
-                this.do_unfollow();
-            } else {
-                return this.ds_model.call('apply_edited_subtypes', [[id], partner_id, check_list, new session.web.CompoundContext(this.build_context(), {})])
-                    .then(this.proxy('read_value'));
-            }
+             return self.fetch_subtypes(partner_id);
         },
 
         on_invite_follower: function (event) {
@@ -251,17 +233,17 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function (context) {
+        fetch_subtypes: function (partner_id) {
             var self = this;
             var mode = "";
-            if (context && context.eval('partner_id')) {
+            if (partner_id) {
                 mode = "edit_follower";
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id],context])
+            this.ds_model.call('message_get_subscription_data', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
                 .then(function (data) {self.display_subtypes(data, id, mode);});
         },
 
@@ -307,23 +289,30 @@ openerp_mail_followers = function(session, mail) {
             return false;
         },
 
-        do_update_subscription: function (event) {
+        do_update_subscription: function (event, partner_id) {
             var self = this;
 
             var checklist = new Array();
-            _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
-                if ($(record).is(':checked')) {
-                    checklist.push(parseInt($(record).data('id')));
-                }
-            });
-
+            if (partner_id) {
+                _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
+                    if ($(record).is(':checked')) {
+                        checklist.push(parseInt($(record).data('id')));
+                    }
+                });
+            } else {
+                _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
+                    if ($(record).is(':checked')) {
+                        checklist.push(parseInt($(record).data('id')));
+                    }
+                });
+            }
             if (!checklist.length) {
                 if (!this.do_unfollow()) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, context])
+                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], partner_id, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },

From 4822b6332ee01685fdbced96c37d54e8d615dfe6 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 4 Apr 2013 13:02:53 +0530
Subject: [PATCH 045/197] [IMP] improved code

bzr revid: tpa@tinyerp.com-20130404073253-6bxc9rnc94q80cd5
---
 addons/l10n_in/l10n_in_public_chart.xml       |  2 +-
 .../l10n_in/l10n_in_public_tax_template.xml   | 86 +++++++++++++++++--
 addons/l10n_in/l10n_in_tax_code_template.xml  | 75 +++++++++++-----
 3 files changed, 136 insertions(+), 27 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 477df493bf6..f39a42c0f53 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -820,7 +820,7 @@
         </record>
 
         <record model="account.account.template" id="p154018">
-            <field name="name">TDS On Director's Interest</field>
+            <field name="name">TDS on Director's Interest</field>
             <field name="code">154018</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 09b2c41d7aa..4bfe26a3e01 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -150,6 +150,36 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
+    <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
+        <field name="name">Education Cess 2% -Purchase</field>
+        <field name="description">Education Cess 2% -Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">21</field>
+        <field name="account_collected_id" ref="p154014"/>
+        <field name="account_paid_id" ref="p154014"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% -Purchase</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% -Purchase</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">22</field>
+        <field name="account_collected_id" ref="p154015"/>
+        <field name="account_paid_id" ref="p154015"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     <record id="account_tax_exic5_pur" model="account.tax.template">
         <field name="name">Input Excise Duty 5% </field>
         <field name="description">Input Excise Duty 5% </field>
@@ -180,7 +210,7 @@
     <record id="account_tax_edu_cess2_pur" model="account.tax.template">
         <field name="name">Education Cess 2% - Purchase</field>
         <field name="description">Education Cess 2% - Purchase</field>
-        <field name="type_tax_use">all</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
         <field name="sequence">21</field>
@@ -222,8 +252,8 @@
     </record>
 
     <record id="account_tax_edu_cess2" model="account.tax.template">
-        <field name="name">Education Cess 2%</field>
-        <field name="description">Education Cess 2%</field>
+        <field name="name">Education Cess 2% - Sales</field>
+        <field name="description">Education Cess 2% - Sales</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -231,7 +261,7 @@
         <field name="account_collected_id" ref="p247010"/>
         <field name="account_paid_id" ref="p247010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -278,8 +308,8 @@
     </record>
 
     <record id="account_tax_tds_dir_intrest" model="account.tax.template">
-        <field name="name">TDS On Director's Interest</field>
-        <field name="description">TDS On Director's Interest</field>
+        <field name="name">TDS on Director's Interest</field>
+        <field name="description">TDS on Director's Interest</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1</field>
@@ -611,5 +641,49 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
+    <record id="account_tax_ser12_sale" model="account.tax.template">
+        <field name="name">Service Tax 12% - Sales</field>
+        <field name="description">Service Tax 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser2_sale" model="account.tax.template">
+        <field name="name">Service Tax 2% - Sales</field>
+        <field name="description">Service Tax 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="parent_id" ref="account_tax_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser1_sale" model="account.tax.template">
+        <field name="name">Service Tax 1% - Sales</field>
+        <field name="description">Service Tax 1% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="parent_id" ref="account_tax_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 1abccc181bb..b230600d640 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -47,14 +47,34 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
-            <field name="name">Education Cess 2%</field>
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
+            <field name="name">Excise Duty - (12% + 2% +1%) Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
+            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
+            <field name="name">Input Credit - Service Tax (12% + 2% + 1%) purchase</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
+            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
+            <field name="name">Education Cess 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
             <field name="name">Education Cess 2% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_import_duty">
@@ -77,29 +97,34 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_base">
+            <field name="name">Input Credit - Service Tax (12% + 2% + 1%)</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
             <field name="name">Input Credit - Service Tax</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
             <field name="name">Input Credit - Service Tax Edu. Cess.</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
             <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_edu">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
             <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
@@ -133,7 +158,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
-            <field name="name">Input Vat 4%</field>
+            <field name="name">Input VAT 4%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -152,16 +177,6 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
-            <field name="name">Excise Duty 12% - Purchase</field>
-            <field name="parent_id" ref="vat_code_payable"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
-            <field name="name">Excise Duty - 12% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
         <record model="account.tax.code.template" id="vat_code_tax_pay_exice5">
             <field name="name">Excise Duty 5% - Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
@@ -193,7 +208,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_intrest">
-            <field name="name"> TDS On Director's Interest</field>
+            <field name="name"> TDS on Director's Interest</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -387,5 +402,25 @@
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st_salebase">
+            <field name="name">Service Tax (12% + 2% + 1%) Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st12">
+            <field name="name">Service Tax 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st2">
+            <field name="name">Service Tax 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st1">
+            <field name="name">Service Tax 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
     </data>
 </openerp>

From 9a2a45c768b77fb829582f060221a90340445da1 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 4 Apr 2013 14:17:24 +0530
Subject: [PATCH 046/197] [IMP] Improved code and removed unwanted code. As
 suggested by tde in his comment >>  **What's the purpose of defining a new
 'check_access_right' ? Limiting to 'group_no_one' does not seems a viable
 solution. Instead, access rights on mail.followers entries should be
 correctly written (please check it is the case). I think having an
 asynchronous call just to check access rights is not necessary. In debug
 mode, always display the button.**

bzr revid: psa@tinyerp.com-20130404084724-meqsx35jdvk56z2c
---
 addons/mail/mail_thread.py                    | 7 -------
 addons/mail/static/src/js/mail_followers.js   | 9 ++-------
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 63f5b8316df..528fd412e46 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -112,13 +112,6 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def check_access_right(self, cr, uid, ids, context=None):
-        grp_id =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
-        user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
-        if uid in user_pid:
-            return True
-        return False
-
     def _get_subscription_data(self, cr, uid, ids, user_id, name, args, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index bc15eed3fd9..02cf01d9889 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -192,19 +192,14 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
-            this.check_access = false;
-
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
-                    self.check_access = result;
-                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
-                })
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 081111a9afd..960c399ecce 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-        <img t-if="widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 7e2e37b7c9ab314c5a45f99547b1a22be58eede8 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 4 Apr 2013 15:25:28 +0530
Subject: [PATCH 047/197] [IMP] Added *None* where message_subscribe is used.

bzr revid: psa@tinyerp.com-20130404095528-l58jnpxiw8l5nuqf
---
 addons/mail/mail_group.py  | 2 +-
 addons/mail/mail_thread.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 24aed942b1b..bb66c909ad6 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -111,7 +111,7 @@ class mail_group(osv.Model):
             partner_ids = []
             for group in mail_group.group_ids:
                 partner_ids += [user.partner_id.id for user in group.users]
-            self.message_subscribe(cr, uid, ids, partner_ids, context=context)
+            self.message_subscribe(cr, uid, ids, partner_ids, None, context=context)
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 528fd412e46..aff451a9935 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1206,7 +1206,7 @@ class mail_thread(osv.AbstractModel):
 
             for pid, subtypes in new_followers.items():
                 subtypes = list(subtypes) if subtypes is not None else None
-                self.message_subscribe(cr, uid, [record.id], [pid], subtypes, context=context)
+                self.message_subscribe(cr, uid, [record.id], [pid], None, subtypes, context=context)
 
             # find first email message, set it as unread for auto_subscribe fields for them to have a notification
             if user_id_partner_ids:

From f5ff7acbb62ba0980e368ed2d38a43b0d7c2500d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 5 Apr 2013 12:25:19 +0530
Subject: [PATCH 048/197] [IMP] improved code

bzr revid: tpa@tinyerp.com-20130405065519-jfb6rbtdts616uy7
---
 addons/l10n_in/l10n_in_public_chart.xml       | 30 +++++-----
 .../l10n_in/l10n_in_public_tax_template.xml   | 60 ++++++++++---------
 addons/l10n_in/l10n_in_tax_code_template.xml  | 22 +++----
 3 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index f39a42c0f53..9a743dfd080 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -660,7 +660,7 @@
         </record>
 
         <record model="account.account.template" id="p154001">
-            <field name="name">CST 5% on Purchase</field>
+            <field name="name">Input CST 5%</field>
             <field name="code">154001</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_expense"/>
@@ -668,7 +668,7 @@
         </record>
 
         <record model="account.account.template" id="p154002">
-            <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
+            <field name="name">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
             <field name="code">154002</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -700,7 +700,7 @@
         </record>
 
         <record model="account.account.template" id="p154006">
-            <field name="name">Input Credit - Import Duty - CVD</field>
+            <field name="name">Input Credit - Import Duty</field>
             <field name="code">154006</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -708,7 +708,7 @@
         </record>
 
         <record model="account.account.template" id="p154007">
-            <field name="name">Input Credit Additional Duty on Imports 4%</field>
+            <field name="name">Additional Duty (Imports) 4%</field>
             <field name="code">154007</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -716,7 +716,7 @@
         </record>
 
         <record model="account.account.template" id="p154008">
-            <field name="name">Input Credit - Service Tax</field>
+            <field name="name">Input Credit - Service Tax 12%</field>
             <field name="code">154008</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -724,7 +724,7 @@
         </record>
 
         <record model="account.account.template" id="p154009">
-            <field name="name">Input Credit - Service Tax Edu. Cess.</field>
+            <field name="name">Input Credit - Service Tax Edu. Cess. 2%</field>
             <field name="code">154009</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -740,7 +740,7 @@
         </record>
 
         <record model="account.account.template" id="p154011">
-            <field name="name">Excise Duty 6% on Purchase</field>
+            <field name="name">Input Excise Duty 6%</field>
             <field name="code">154011</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -748,7 +748,7 @@
         </record>
 
         <record model="account.account.template" id="p154012">
-            <field name="name">Excise Duty 5% - Purchase</field>
+            <field name="name">Input Excise Duty 5%</field>
             <field name="code">154012</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -756,7 +756,7 @@
         </record>
 
         <record model="account.account.template" id="p154013">
-            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="name">Input Excise Duty 12%</field>
             <field name="code">154013</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -780,7 +780,7 @@
         </record>
 
         <record model="account.account.template" id="p247001">
-            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="name">Excise Duty 12% - Sales</field>
             <field name="code">247001</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -788,7 +788,7 @@
         </record>
 
         <record model="account.account.template" id="p247010">
-            <field name="name">Education Cess 2%</field>
+            <field name="name">Education Cess 2% - Sales</field>
             <field name="code">247010</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -804,7 +804,7 @@
         </record>
 
         <record model="account.account.template" id="p154016">
-            <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+            <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
             <field name="code">154016</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -860,7 +860,7 @@
         </record>
 
         <record model="account.account.template" id="p154023">
-            <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
+            <field name="name">Input Edu. Cess - Capital Goods</field>
             <field name="code">154023</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -916,7 +916,7 @@
         </record>
 
         <record model="account.account.template" id="p247005">
-            <field name="name">CST 2% on Sales</field>
+            <field name="name">CST 2% on Sales - Against Form - C</field>
             <field name="code">247005</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -948,7 +948,7 @@
         </record>
 
         <record model="account.account.template" id="p154030">
-            <field name="name">CST 2% on Purchase</field>
+            <field name="name">Input CST 2%</field>
             <field name="code">154030</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_expense"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 4bfe26a3e01..6c0a63f0090 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -17,19 +17,6 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
-        <field name="name">Input Sec. &amp; HEC - Service Tax</field>
-        <field name="description">Input Sec. &amp; HEC - Service Tax</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="account_collected_id" ref="p154002"/>
-        <field name="account_paid_id" ref="p154002"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
     <record id="account_tax_in_cradit_urd" model="account.tax.template">
         <field name="name">Input Credit - URD</field>
         <field name="description">Input Credit - URD</field>
@@ -104,16 +91,16 @@
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="sequence">1</field>
-        <field name="account_collected_id" ref="p154007"/>
-        <field name="account_paid_id" ref="p154007"/>
+        <field name="account_collected_id" ref="p154008"/>
+        <field name="account_paid_id" ref="p154008"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
     <record id="account_tax_in_edu_cess_st" model="account.tax.template">
-        <field name="name">Input Edu. Cess - Service Tax</field>
-        <field name="description">Input Edu. Cess - Service Tax</field>
+        <field name="name">Input Credit - Service Tax Edu. Cess. 2%</field>
+        <field name="description">Input Credit - Service Tax Edu. Cess. 2%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -121,6 +108,21 @@
         <field name="account_paid_id" ref="p154009"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
+        <field name="parent_id" ref="account_tax_ic_st"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
+        <field name="name">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
+        <field name="description">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="account_collected_id" ref="p154002"/>
+        <field name="account_paid_id" ref="p154002"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="parent_id" ref="account_tax_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -138,8 +140,8 @@
     </record>
 
     <record id="account_tax_exic6_pur" model="account.tax.template">
-        <field name="name">Input Excise Duty 6% </field>
-        <field name="description">Input Excise Duty 6% </field>
+        <field name="name">Input Excise Duty 6%</field>
+        <field name="description">Input Excise Duty 6%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0600</field>
@@ -151,8 +153,8 @@
     </record>
 
     <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
-        <field name="name">Education Cess 2% -Purchase</field>
-        <field name="description">Education Cess 2% -Purchase</field>
+        <field name="name">Education Cess 2% Purchase</field>
+        <field name="description">Education Cess 2% Purchase</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -166,8 +168,8 @@
     </record>
 
     <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
-        <field name="name">Seco. &amp; Higher Edu. Cess 1% -Purchase</field>
-        <field name="description">Seco. &amp; Higher Edu. Cess 1% -Purchase</field>
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
         <field name="type_tax_use">all</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
@@ -181,8 +183,8 @@
     </record>
 
     <record id="account_tax_exic5_pur" model="account.tax.template">
-        <field name="name">Input Excise Duty 5% </field>
-        <field name="description">Input Excise Duty 5% </field>
+        <field name="name">Input Excise Duty 5%</field>
+        <field name="description">Input Excise Duty 5%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0500</field>
@@ -238,8 +240,8 @@
     </record>
 
     <record id="account_tax_exice12_sale" model="account.tax.template">
-        <field name="name">Excise Duty - 12% - Sales</field>
-        <field name="description">Excise Duty - 12% - Sales</field>
+        <field name="name">Excise Duty 12% - Sales</field>
+        <field name="description">Excise Duty 12% - Sales</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
@@ -579,8 +581,8 @@
     </record>
 
     <record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
-        <field name="name">Output Adi. VAT 1% Sales CT3</field>
-        <field name="description">Output Adi. VAT 1% Sales CT3</field>
+        <field name="name">Output Adi. VAT 1% on Sales - CT3</field>
+        <field name="description">Output Adi. VAT 1% on Sales - CT3</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index b230600d640..e9bbcc28faa 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -38,7 +38,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_CSTP5">
-            <field name="name">CST 5% on Purchase</field>
+            <field name="name">Input CST 5%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -53,12 +53,12 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
-            <field name="name">Excise Duty - 12% - Sales</field>
+            <field name="name">Excise Duty 12% - Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
-            <field name="name">Input Credit - Service Tax (12% + 2% + 1%) purchase</field>
+            <field name="name">Input Credit - Service Tax (12% + 2% + 1%) Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -103,17 +103,17 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
-            <field name="name">Input Credit - Service Tax</field>
+            <field name="name">Input Credit - Service Tax 12%</field>
             <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
-            <field name="name">Input Credit - Service Tax Edu. Cess.</field>
+            <field name="name">Input Credit - Service Tax Edu. Cess. 2%</field>
             <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
-            <field name="name">Input Credit - Service Tax Seco. &amp; HEC</field>
+            <field name="name">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
             <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
@@ -178,12 +178,12 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_exice5">
-            <field name="name">Excise Duty 5% - Purchase</field>
+            <field name="name">Input Excise Duty 5%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_exice6">
-            <field name="name">Excise Duty 6% on Purchase</field>
+            <field name="name">Input Excise Duty 6%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -228,7 +228,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_tds_rent">
-            <field name="name">TDS on Rent-94I</field>
+            <field name="name">TDS on Rent - 94I</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -268,7 +268,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_sale_cst15">
-            <field name="name">Sales CST 5%</field>
+            <field name="name">CST 5% on Sales</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
@@ -298,7 +298,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pur_cst2">
-            <field name="name">Purchase CST 2%</field>
+            <field name="name">Input CST 2%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 

From e61d6bae165444015ef37f71ae1e3c13f42ec253 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 5 Apr 2013 19:14:25 +0530
Subject: [PATCH 049/197] [IMP] Improved code and passed user_id=None as
 optional field.

bzr revid: psa@tinyerp.com-20130405134425-3xfbbv3vapq1un68
---
 addons/mail/mail_thread.py                  | 10 ++++-----
 addons/mail/static/src/js/mail_followers.js | 24 +++++++++------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 2527b4cf035..aa929083374 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -112,7 +112,7 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def _get_subscription_data(self, cr, uid, ids, user_id, name, args, context=None):
+    def _get_subscription_data(self, cr, uid, ids, name, args, user_id=None, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
                 available, which are followed if any """
@@ -1105,17 +1105,17 @@ class mail_thread(osv.AbstractModel):
 
     def message_get_subscription_data(self, cr, uid, ids, user_id=None, context=None):
         """ Wrapper to get subtypes data. """
-        return self._get_subscription_data(cr, uid, ids, user_id, None, None, context=context)
+        return self._get_subscription_data(cr, uid, ids, None, None, user_id=user_id, context=context)
 
-    def message_subscribe_users(self, cr, uid, ids, user_ids=None, partner_id=None, subtype_ids=None, context=None):
+    def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, user_id=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, subscribe uid instead. """
         if user_ids is None:
             user_ids = [uid]
         partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
-        return self.message_subscribe(cr, uid, ids, partner_ids, partner_id, subtype_ids=subtype_ids, context=context)
+        return self.message_subscribe(cr, uid, ids, partner_ids, subtype_ids=subtype_ids, user_id=user_id, context=context)
 
-    def message_subscribe(self, cr, uid, ids, partner_ids, user_id, subtype_ids=None, context=None):
+    def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, user_id=None, context=None):
         """ Add partners to the records followers. """
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if user_id:
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 02cf01d9889..83b46f9f951 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -264,7 +264,7 @@ openerp_mail_followers = function(session, mail) {
 
         do_follow: function () {
             var context = new session.web.CompoundContext(this.build_context(), {});
-            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context])
+            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, undefined, context])
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
@@ -288,19 +288,15 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
-            if (partner_id) {
-                _($('.oe_edit_actions input[type="checkbox"]')).each(function (record) {
-                    if ($(record).is(':checked')) {
-                        checklist.push(parseInt($(record).data('id')));
-                    }
-                });
-            } else {
-                _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
-                    if ($(record).is(':checked')) {
-                        checklist.push(parseInt($(record).data('id')));
-                    }
-                });
-            }
+            var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
+             if (partner_id) {
+                subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))
+             }
+            subtype_checkbox.each(function (record) {
+                if ($(record).is(':checked')) {
+                    checklist.push(parseInt($(record).data('id')));
+                }
+            });
             if (!checklist.length) {
                 if (!this.do_unfollow()) {
                     $(event.target).attr("checked", "checked");

From 1769067ddd9b4b7b51ae4c0d430587e1287af22d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 9 Apr 2013 10:09:32 +0530
Subject: [PATCH 050/197] [IMP] Improved code and removed unwanted 'None'.

bzr revid: psa@tinyerp.com-20130409043932-z5c8hupbhrednwa0
---
 addons/mail/mail_group.py                   | 2 +-
 addons/mail/mail_thread.py                  | 2 +-
 addons/mail/static/src/js/mail_followers.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 93f363a740e..977608f487e 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -111,7 +111,7 @@ class mail_group(osv.Model):
             partner_ids = []
             for group in mail_group.group_ids:
                 partner_ids += [user.partner_id.id for user in group.users]
-            self.message_subscribe(cr, uid, ids, partner_ids, None, context=context)
+            self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index aa929083374..01fb561ebf3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1227,7 +1227,7 @@ class mail_thread(osv.AbstractModel):
 
             for pid, subtypes in new_followers.items():
                 subtypes = list(subtypes) if subtypes is not None else None
-                self.message_subscribe(cr, uid, [record.id], [pid], None, subtypes, context=context)
+                self.message_subscribe(cr, uid, [record.id], [pid], subtypes, context=context)
 
             # find first email message, set it as unread for auto_subscribe fields for them to have a notification
             if user_id_partner_ids:
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 83b46f9f951..93f8f995ec7 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -297,13 +297,14 @@ openerp_mail_followers = function(session, mail) {
                     checklist.push(parseInt($(record).data('id')));
                 }
             });
+
             if (!checklist.length) {
                 if (!this.do_unfollow()) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], partner_id, checklist, context])
+                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, partner_id, context])
                     .then(this.proxy('read_value'));
             }
         },

From 3aa6f4add577b153df2518f8681d0fbe2a84e8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 11 Apr 2013 14:07:19 +0200
Subject: [PATCH 051/197] [IMP] point_of_sale: the invoicing should now work
 reliably and validate the orders

bzr revid: fva@openerp.com-20130411120719-colzjq4l8eaiotdf
---
 addons/point_of_sale/point_of_sale.py         |  11 ++
 addons/point_of_sale/static/src/js/db.js      |  13 ++-
 addons/point_of_sale/static/src/js/models.js  | 105 +++++++++++++-----
 addons/point_of_sale/static/src/js/screens.js |  74 ++++++++++--
 addons/point_of_sale/static/src/js/widgets.js |   9 ++
 addons/point_of_sale/static/src/xml/pos.xml   |  37 +++++-
 6 files changed, 206 insertions(+), 43 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 9ee5b944718..9363afe01ea 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -483,7 +483,10 @@ class pos_order(osv.osv):
         #_logger.info("orders: %r", orders)
         order_ids = []
         for tmp_order in orders:
+            to_invoice = tmp_order['to_invoice']
             order = tmp_order['data']
+
+
             order_id = self.create(cr, uid, {
                 'name': order['name'],
                 'user_id': order['user_id'] or False,
@@ -522,6 +525,13 @@ class pos_order(osv.osv):
             order_ids.append(order_id)
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
+
+            if to_invoice:
+                self.action_invoice(cr, uid, [order_id], context)
+                order_obj = self.browse(cr, uid, order_id, context)
+                wf_service = netsvc.LocalService('workflow')
+                wf_service.trg_validate(uid,'account.invoice', order_obj.invoice_id.id,'invoice_open',cr)
+        
         return order_ids
 
     def unlink(self, cr, uid, ids, context=None):
@@ -859,6 +869,7 @@ class pos_order(osv.osv):
                 inv_line_ref.create(cr, uid, inv_line, context=context)
             inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
             wf_service.trg_validate(uid, 'pos.order', order.id, 'invoice', cr)
+            wf_service.trg_validate(uid, 'account.invoice', inv_id, 'validate', cr)
 
         if not inv_ids: return {}
 
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index c28c08950db..aad6ed8ca69 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -267,10 +267,19 @@ function openerp_pos_db(instance, module){
             return results;
         },
         add_order: function(order){
-            var order_id = this.load('last_order_id',0) + 1;
+            var order_id = order.uid;
             var orders  = this.load('orders',[]);
+
+            // if the order was already stored, we overwrite its data
+            for(var i = 0, len = orders.length; i < len; i++){
+                if(orders[i].id === order_id){
+                    orders[i].data = order;
+                    this.save('orders',orders);
+                    return order_id;
+                }
+            }
+
             orders.push({id: order_id, data: order});
-            this.save('last_order_id', order_id);
             this.save('orders',orders);
             return order_id;
         },
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 426bea9a9b7..ec4924c6068 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -262,36 +262,80 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.set('selectedOrder', order);
         },
 
-        // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
-        // it returns a deferred that succeeds or fail when the pushed order is successfully posted on the server, previously failed orders
-        // will try to be re-sent but don't make this method return false if they fail. ( So that in the unlikely case of an order making
-        // the server crash, the other orders can still be sent )
-        // payment process ) 
-        push_order: function(record) {
+        // saves the order locally and try to send it to the backend. 
+        // it returns a deferred that succeeds after having tried to send the order and all the other pending orders.
+        push_order: function(order) {
             var self = this;
-            var order_id = this.db.add_order(record);
+            var order_id = this.db.add_order(order.export_as_JSON());
             var pushed = new $.Deferred();
 
             this.set('nbr_pending_operations',self.db.get_orders().length);
 
             this.flush_mutex.exec(function(){
+                var flushed = self._flush_all_orders();
 
-                //first we try to push all orders (the one we added and the one that were not sent)
-                var tried_all = self._flush_all_orders();
-                var done = new $.Deferred();
+                flushed.always(function(){
+                    pushed.resolve();
+                });
 
-                tried_all.always(function(){
-                    // then we verify that the one we just added has been sent successfuly.
-                    self._flush_order(order_id)
-                        .done(   function(){ pushed.resolve();})
-                        .fail(   function(){ pushed.reject(); })
-                        .always( function(){ done.resolve();  });
+                return flushed;
+            });
+            return pushed;
+        },
+
+        // saves the order locally and try to send it to the backend and make an invoice
+        // returns a deferred that succeeds when the order has been posted and successfully generated
+        // an invoice. This method can fail in various ways:
+        // error-no-client: the order must have an associated partner_id. You can retry to make an invoice once
+        //     this error is solved
+        // error-transfer: there was a connection error during the transfer. You can retry to make the invoice once
+        //     the network connection is up 
+
+        push_and_invoice_order: function(order){
+            var self = this;
+            var invoiced = new $.Deferred(); 
+
+            if(!order.get_client()){
+                invoiced.reject('error-no-client');
+                return invoiced;
+            }
+
+            var order_id = this.db.add_order(order.export_as_JSON());
+
+            this.set('nbr_pending_operations',self.db.get_orders().length);
+
+            this.flush_mutex.exec(function(){
+                var done = new $.Deferred(); // holds the mutex
+
+                // send the order to the server
+                // we have a 30 seconds timeout on this push.
+                // FIXME: if the server takes more than 30 seconds to accept the order,
+                // the client will believe it wasn't successfully sent, and very bad
+                // things will happen as a duplicate will be sent next time
+                // so we must make sure the server detects and ignores duplicated orders
+
+                var transfer = self._flush_order(order_id, {timeout:30000, to_invoice:true});
+                
+                transfer.fail(function(){
+                    invoiced.reject('error-transfer');
+                    done.reject();
+                });
+
+                // on success, get the order id generated by the server
+                transfer.pipe(function(order_server_id){    
+                    // generate the pdf and download it
+                    self.pos_widget.do_action('point_of_sale.pos_invoice_report',{additional_context:{ 
+                        active_ids:order_server_id,
+                    }});
+                    invoiced.resolve();
+                    done.resolve();
                 });
 
                 return done;
+
             });
 
-            return pushed;
+            return invoiced;
         },
 
         // attemps to send all pending orders ( stored in the pos_db ) to the server,
@@ -316,23 +360,30 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         },
 
         // attempts to send the locally stored order of id 'order_id'
-        // the sending is asynchronous and can take a long time to decide if it is successful or not (60s)
+        // the sending is asynchronous and can take some time to decide if it is successful or not
         // it is therefore important to only call this method from inside a mutex
         // this method returns a deferred indicating wether the sending was successful or not
-        _flush_order: function(order_id){
+        // there is a timeout parameter which is set to 2 seconds by default. 
+        _flush_order: function(order_id, options){
             var self   = this;
+            options = options || {};
+            timeout = typeof options.timeout === 'number' ? options.timeout : 5000;
+
             var order  = this.db.get_order(order_id);
+            order.to_invoice = options.to_invoice || false;
 
             if(!order){
-                // flushing a non existing order always succeeds
-                return (new $.Deferred()).resolve();
+                // flushing a non existing order always fails
+                return (new $.Deferred()).reject();
             }
 
-            //we try to send the order. shadow prevents a spinner if it takes too long.
-            var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: true, timeout: 2000});
+            // we try to send the order. shadow prevents a spinner if it takes too long. (unless we are sending an invoice,
+            // then we want to notify the user that we are waiting on something )
+            var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: !options.to_invoice, timeout:timeout});
 
             rpc.fail(function(unused,event){
-                //prevent an error popup creation by the rpc failure
+                // prevent an error popup creation by the rpc failure
+                // we want the failure to be silent as we send the orders in the background
                 event.preventDefault();
                 console.error('Failed to send order:',order);
             });
@@ -664,11 +715,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
     module.Order = Backbone.Model.extend({
         initialize: function(attributes){
             Backbone.Model.prototype.initialize.apply(this, arguments);
+            this.uid =     this.generateUniqueId();
             this.set({
                 creationDate:   new Date(),
                 orderLines:     new module.OrderlineCollection(),
                 paymentLines:   new module.PaymentlineCollection(),
-                name:           "Order " + this.generateUniqueId(),
+                name:           "Order " + this.uid,
                 client:         null,
             });
             this.pos =     attributes.pos; 
@@ -844,7 +896,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 currency: this.pos.get('currency'),
             };
         },
-        exportAsJSON: function() {
+        export_as_JSON: function() {
             var orderLines, paymentLines;
             orderLines = [];
             (this.get('orderLines')).each(_.bind( function(item) {
@@ -865,6 +917,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 pos_session_id: this.pos.get('pos_session').id,
                 partner_id: this.get_client() ? this.get_client().id : false,
                 user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
+                uid: this.uid,
             };
         },
         getSelectedLine: function(){
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index a99de66988d..6c96d51748b 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -433,6 +433,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         template:'ErrorNegativePricePopupWidget',
     });
 
+    module.ErrorNoClientPopupWidget = module.ErrorPopupWidget.extend({
+        template: 'ErrorNoClientPopupWidget',
+    });
+
+    module.ErrorInvoiceTransferPopupWidget = module.ErrorPopupWidget.extend({
+        template: 'ErrorInvoiceTransferPopupWidget',
+    });
+
     module.ScaleInviteScreenWidget = module.ScreenWidget.extend({
         template:'ScaleInviteScreenWidget',
 
@@ -639,7 +647,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
                             var cashregister = selfCheckoutRegisters[0] || self.pos.get('cashRegisters').models[0];
                             currentOrder.addPaymentLine(cashregister);
-                            self.pos.push_order(currentOrder.exportAsJSON())
+                            self.pos.push_order(currentOrder)
                             currentOrder.destroy();
                             self.pos.proxy.transaction_end();
                             self.pos_widget.screen_selector.set_current_screen(self.next_screen);
@@ -807,19 +815,40 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this._super();
             var self = this;
 
-            this.add_action_button({
+            var print_button = this.add_action_button({
                     label: 'Print',
                     icon: '/point_of_sale/static/src/img/icons/png48/printer.png',
                     click: function(){ self.print(); },
                 });
 
-            this.add_action_button({
+            var finish_button = this.add_action_button({
                     label: 'Next Order',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-next.png',
                     click: function() { self.finishOrder(); },
                 });
 
             window.print();
+
+            // THIS IS THE HACK OF THE CENTURY
+            //
+            // The problem is that in chrome the print() is asynchronous and doesn't
+            // execute until all rpc are finished. So it conflicts with the rpc used
+            // to send the orders to the backend, and the user is able to go to the next 
+            // screen before the printing dialog is opened. The problem is that what's 
+            // printed is whatever is in the page when the dialog is opened and not when it's called,
+            // and so you end up printing the product list instead of the receipt... 
+            //
+            // Fixing this would need a re-architecturing
+            // of the code to postpone sending of orders after printing.
+            //
+            // But since the print dialog also blocks the other asynchronous calls, the
+            // button enabling in the setTimeout() is blocked until the printing dialog is 
+            // closed. But this is not reliable ... if the timeout is too slow it doesn't work
+
+            finish_button.set_disabled(true);   
+            setTimeout(function(){
+                finish_button.set_disabled(false);
+            }, 2000);
         },
         print: function() {
             window.print();
@@ -896,7 +925,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 });
 
             this.updatePaymentSummary();
-            this.line_refocus();
+            this.line_refocus();this
         },
         close: function(){
             this._super();
@@ -907,18 +936,43 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos_widget.screen_selector.set_current_screen(self.back_screen);
         },
         validateCurrentOrder: function(options) {
+            var self = this;
             options = options || {};
 
             var currentOrder = this.pos.get('selectedOrder');
 
-            this.pos.push_order(currentOrder.exportAsJSON()) 
+
             if(options.invoice){
-                console.log('send invoice');
-            }else if(this.pos.iface_print_via_proxy){
-                this.pos.proxy.print_receipt(currentOrder.export_for_printing());
-                this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
+                // deactivate the validation button while we try to send the order
+                this.pos_widget.action_bar.set_button_disabled('validation',true);
+                this.pos_widget.action_bar.set_button_disabled('invoice',true);
+
+                var invoiced = this.pos.push_and_invoice_order(currentOrder);
+
+                invoiced.fail(function(error){
+                    if(error === 'error-no-client'){
+                        self.pos_widget.screen_selector.show_popup('error-no-client');
+                    }else{
+                        self.pos_widget.screen_selector.show_popup('error-invoice-transfer');
+                    }
+                    self.pos_widget.action_bar.set_button_disabled('validation',false);
+                    self.pos_widget.action_bar.set_button_disabled('invoice',false);
+                });
+
+                invoiced.done(function(){
+                    self.pos_widget.action_bar.set_button_disabled('validation',false);
+                    self.pos_widget.action_bar.set_button_disabled('invoice',false);
+                    self.pos.get('selectedOrder').destroy();
+                });
+
             }else{
-                this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+                this.pos.push_order(currentOrder) 
+                if(this.pos.iface_print_via_proxy){
+                    this.pos.proxy.print_receipt(currentOrder.export_for_printing());
+                    this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
+                }else{
+                    this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+                }
             }
         },
         bindPaymentLineEvents: function() {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index cec48dbe72f..6a606652a8e 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -828,6 +828,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             instance.web.blockUI(); 
 
             this.pos = new module.PosModel(this.session);
+            this.pos.pos_widget = this;
             this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically
 
             this.numpad_visible = true;
@@ -942,6 +943,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.error_negative_price_popup = new module.ErrorNegativePricePopupWidget(this, {});
             this.error_negative_price_popup.appendTo($('.point-of-sale'));
 
+            this.error_no_client_popup = new module.ErrorNoClientPopupWidget(this, {});
+            this.error_no_client_popup.appendTo($('.point-of-sale'));
+
+            this.error_invoice_transfer_popup = new module.ErrorInvoiceTransferPopupWidget(this, {});
+            this.error_invoice_transfer_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -1003,6 +1010,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     'error-session': this.error_session_popup,
                     'error-negative-price': this.error_negative_price_popup,
                     'choose-receipt': this.choose_receipt_popup,
+                    'error-no-client': this.error_no_client_popup,
+                    'error-invoice-transfer': this.error_invoice_transfer_popup,
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 1dce368b9cb..e28ea1c06b0 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -336,11 +336,11 @@
         <div class="modal-dialog">
             <div class="popup popup-help">
                 <p class="message">The scanned product was not recognized<br /> Please wait, a cashier is on the way</p>
-            </div>
-        </div>
-        <div class="footer">
-            <div class="button">
-                Ok
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
             </div>
         </div>
     </t>
@@ -361,6 +361,33 @@
         </div>
     </t>
 
+    <t t-name="ErrorNoClientPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">An anonymous order cannot be invoiced</p>
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="ErrorInvoiceTransferPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">The Order could not be sent to the server for invoicing. Invoices cannot be generated
+                    in offline mode. Please check your internet connection and try again.</p>
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
     <t t-name="ErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">

From ef81f0bd43d0e218a68b959e23c26dc22015088b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 11 Apr 2013 14:22:50 +0200
Subject: [PATCH 052/197] [IMP] point_of_sale: add a configuration option to
 enable invoicing from the Point of Sale (enabled by default)

bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
---
 addons/point_of_sale/point_of_sale.py         |  2 ++
 addons/point_of_sale/point_of_sale_view.xml   |  1 +
 addons/point_of_sale/static/src/js/models.js  |  3 +-
 addons/point_of_sale/static/src/js/screens.js | 28 +++++++++++--------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 9363afe01ea..fa7fcba6bf1 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -63,6 +63,7 @@ class pos_config(osv.osv):
         'iface_electronic_scale' : fields.boolean('Electronic Scale Interface'),
         'iface_vkeyboard' : fields.boolean('Virtual KeyBoard Interface'),
         'iface_print_via_proxy' : fields.boolean('Print via Proxy'),
+        'iface_invoicing': fields.boolean('Invoicing',help='Enables invoice generation from the Point of Sale'),
 
         'state' : fields.selection(POS_CONFIG_STATE, 'Status', required=True, readonly=True),
         'sequence_id' : fields.many2one('ir.sequence', 'Order IDs Sequence', readonly=True,
@@ -121,6 +122,7 @@ class pos_config(osv.osv):
         'shop_id': _default_shop,
         'journal_id': _default_sale_journal,
         'group_by' : True,
+        'iface_invoicing': True,
     }
 
     def set_active(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 8a53015b7d7..cd2d01333bd 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -790,6 +790,7 @@
                                 <field name="iface_self_checkout" />
                                 <field name="iface_cashdrawer" />
                                 <field name="iface_payment_terminal" />
+                                <field name="iface_invoicing" />
                             </group>
                             <group>
                                 <field name="iface_electronic_scale" />
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index ec4924c6068..4f10d10fab3 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -160,7 +160,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                         ['name','journal_ids','shop_id','journal_id',
                          'iface_self_checkout', 'iface_led', 'iface_cashdrawer',
                          'iface_payment_terminal', 'iface_electronic_scale', 'iface_barscan', 'iface_vkeyboard',
-                         'iface_print_via_proxy','iface_cashdrawer','state','sequence_id','session_ids'],
+                         'iface_print_via_proxy','iface_cashdrawer','iface_invoicing','state','sequence_id','session_ids'],
                         [['id','=', self.get('pos_session').config_id[0]]]
                     );
                 }).then(function(configs){
@@ -171,6 +171,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.iface_vkeyboard           =  !!pos_config.iface_vkeyboard; 
                     self.iface_self_checkout       =  !!pos_config.iface_self_checkout;
                     self.iface_cashdrawer          =  !!pos_config.iface_cashdrawer;
+                    self.iface_invoicing           =  !!pos_config.iface_invoicing;
 
                     return self.fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
                 }).then(function(shops){
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 6c96d51748b..651fe7bdea5 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -843,7 +843,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             //
             // But since the print dialog also blocks the other asynchronous calls, the
             // button enabling in the setTimeout() is blocked until the printing dialog is 
-            // closed. But this is not reliable ... if the timeout is too slow it doesn't work
+            // closed. But the timeout has to be big enough or else it doesn't work
+            // 2 seconds is the same as the default timeout for sending orders and so the dialog
+            // should have appeared before the timeout... so yeah that's not ultra reliable. 
 
             finish_button.set_disabled(true);   
             setTimeout(function(){
@@ -898,7 +900,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             this.set_numpad_state(this.pos_widget.numpad.state);
             
-            this.back_button = this.add_action_button({
+            this.add_action_button({
                     label: 'Back',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
@@ -906,7 +908,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     },
                 });
             
-            this.validate_button = this.add_action_button({
+            this.add_action_button({
                     label: 'Validate',
                     name: 'validation',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
@@ -914,15 +916,17 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                         self.validateCurrentOrder();
                     },
                 });
-
-            this.invoice_button = this.add_action_button({
-                    label: 'Invoice',
-                    name: 'invoice',
-                    icon: '/point_of_sale/static/src/img/icons/png48/invoice.png',
-                    click: function(){
-                        self.validateCurrentOrder({invoice: true});
-                    },
-                });
+           
+            if(this.pos.iface_invoicing){
+                this.add_action_button({
+                        label: 'Invoice',
+                        name: 'invoice',
+                        icon: '/point_of_sale/static/src/img/icons/png48/invoice.png',
+                        click: function(){
+                            self.validateCurrentOrder({invoice: true});
+                        },
+                    });
+            }
 
             this.updatePaymentSummary();
             this.line_refocus();this

From 5bbffbc39c899adb92d251a3c8ef7f06e39338a7 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 11 Apr 2013 18:05:37 +0530
Subject: [PATCH 053/197] [IMP] Improved code and made the EDIT followers
 visible when 'Technical Features' are given and it is in 'DEBUG mode'.

bzr revid: psa@tinyerp.com-20130411123537-2wzb468o7o0dno8c
---
 addons/mail/mail_thread.py                    | 7 +++++++
 addons/mail/static/src/js/mail_followers.js   | 8 ++++++--
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 603c77f6ede..879f991ddb3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -152,6 +152,13 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
+    def check_access_right(self, cr, uid, ids, context=None):
+        grp_id =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
+        user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
+        if uid in user_pid:
+            return True
+        return False
+
     def _get_subscription_data(self, cr, uid, ids, name, args, user_id=None, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 93f8f995ec7..09f54f012ce 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -192,14 +192,18 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
+            this.check_access = false;
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
+                    self.check_access = result;
+                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+              })
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 88f38146de3..ca0064cbc78 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 9d2cf73253089464ec06c23e029ea74be5655a35 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Wed, 17 Apr 2013 18:17:03 +0200
Subject: [PATCH 054/197] [FIX]crm: lead/opp convert/opp wizard: Add
 salesperson and salesteam in wizard form

bzr revid: dle@openerp.com-20130417161703-z3id6hb20c9pceho
---
 addons/crm/crm_lead.py                        |  7 +++-
 addons/crm/wizard/crm_lead_to_opportunity.py  | 28 +++++++++++++---
 .../wizard/crm_lead_to_opportunity_view.xml   | 14 ++++----
 addons/crm/wizard/crm_merge_opportunities.py  | 19 ++++++++++-
 .../wizard/crm_merge_opportunities_view.xml   | 33 +++++++++++--------
 5 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 2361f12d61b..b8e8b58aaf4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -628,7 +628,7 @@ class crm_lead(base_stage, format_address, osv.osv):
                 attachment.write(values)
         return True
 
-    def merge_opportunity(self, cr, uid, ids, context=None):
+    def merge_opportunity(self, cr, uid, ids, user_id=False, section_id=False, context=None):
         """
         Different cases of merge:
         - merge leads together = 1 new lead
@@ -662,6 +662,11 @@ class crm_lead(base_stage, format_address, osv.osv):
         fields = list(CRM_LEAD_FIELDS_TO_MERGE)
         merged_data = self._merge_data(cr, uid, ids, highest, fields, context=context)
 
+        if user_id:
+            merged_data['user_id'] = user_id
+        if section_id:
+            merged_data['section_id'] = section_id
+
         # Merge messages and attachements into the first opportunity
         self._merge_opportunity_history(cr, uid, highest.id, tail_opportunities, context=context)
         self._merge_opportunity_attachments(cr, uid, highest.id, tail_opportunities, context=context)
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e67b7c0c7be..ca99de80779 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -35,6 +35,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 ('merge', 'Merge with existing opportunities')
             ], 'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities'),
+        'user_id': fields.many2one('res.users', 'Salesperson', select=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -74,9 +76,27 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 res.update({'name' : len(tomerge) >= 2 and 'merge' or 'convert'})
             if 'opportunity_ids' in fields and len(tomerge) >= 2:
                 res.update({'opportunity_ids': list(tomerge)})
-
+            if lead.user_id:
+                res.update({'user_id': lead.user_id.id})
+            if lead.section_id:
+                res.update({'section_id': lead.section_id.id})
         return res
 
+    def on_change_user(self, cr, uid, ids, user_id, section_id, context=None):
+        """ When changing the user, also set a section_id or restrict section id
+            to the ones user_id is member of. """
+        if user_id:
+            if section_id:
+                user_in_section = self.pool.get('crm.case.section').search(cr, uid, [('id', '=', section_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context, count=True)
+            else:
+                user_in_section = False
+            if not user_in_section:
+                section_id = False
+                section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
+                if section_ids:
+                    section_id = section_ids[0]
+        return {'value': {'section_id': section_id}}
+
     def view_init(self, cr, uid, fields, context=None):
         """
         Check some preconditions before the wizard executes.
@@ -118,15 +138,15 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         w = self.browse(cr, uid, ids, context=context)[0]
         opp_ids = [o.id for o in w.opportunity_ids]
         if w.name == 'merge':
-            lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, context=context)
+            lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, w.user_id.id, w.section_id.id, context=context)
             lead_ids = [lead_id]
             lead = self.pool.get('crm.lead').read(cr, uid, lead_id, ['type'], context=context)
             if lead['type'] == "lead":
                 context.update({'active_ids': lead_ids})
-                self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
+                self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context)
         else:
             lead_ids = context.get('active_ids', [])
-            self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
+            self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context)
 
         return self.pool.get('crm.lead').redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 4093df910d0..e06ff091960 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -10,6 +10,10 @@
                     <group name="name">
                         <field name="name" class="oe_inline"/>
                     </group>
+                    <group string="Assign opportunities to">
+                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, section_id, context)"/>
+                        <field name="section_id" class="oe_inline"/>
+                    </group>
                     <group string="Opportunities">
                         <field name="opportunity_ids" attrs="{'invisible': [('name', '!=', 'merge')]}" nolabel="1">
                             <tree>
@@ -56,6 +60,10 @@
                             attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
                             class="oe_inline"/>
                     </group>
+                    <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
+                        <field name="user_ids" widget="many2many_tags"/>
+                    </group>
                     <group string="Select Opportunities" attrs="{'invisible': [('name', '!=', 'merge')]}">
                         <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
                             <tree>
@@ -72,12 +80,6 @@
                             </tree>
                         </field>
                     </group>
-
-                    <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
-                        <field name="section_id" groups="base.group_multi_salesteams"/>
-                        <field name="user_ids" widget="many2many_tags"/>
-                    </group>
-
                     <footer>
                         <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 8b78c039007..43fbaa786ea 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -34,6 +34,8 @@ class crm_merge_opportunity(osv.osv_memory):
     _description = 'Merge opportunities'
     _columns = {
         'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'),
+        'user_id': fields.many2one('res.users', 'Salesperson', select=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
     }
 
     def action_merge(self, cr, uid, ids, context=None):
@@ -47,7 +49,7 @@ class crm_merge_opportunity(osv.osv_memory):
         #TODO: why is this passed through the context ?
         context['lead_ids'] = [opportunity2merge_ids[0].id]
 
-        merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], context=context)
+        merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], wizard.user_id.id, wizard.section_id.id, context=context)
 
         # The newly created lead might be a lead or an opp: redirect toward the right view
         merge_result = lead_obj.browse(cr, uid, merge_id, context=context)
@@ -79,4 +81,19 @@ class crm_merge_opportunity(osv.osv_memory):
 
         return res
 
+    def on_change_user(self, cr, uid, ids, user_id, section_id, context=None):
+        """ When changing the user, also set a section_id or restrict section id
+            to the ones user_id is member of. """
+        if user_id:
+            if section_id:
+                user_in_section = self.pool.get('crm.case.section').search(cr, uid, [('id', '=', section_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context, count=True)
+            else:
+                user_in_section = False
+            if not user_in_section:
+                section_id = False
+                section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
+                if section_ids:
+                    section_id = section_ids[0]
+        return {'value': {'section_id': section_id}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 919d83cb9a7..44f308529f9 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -8,20 +8,25 @@
             <field name="model">crm.merge.opportunity</field>
             <field name="arch" type="xml">
                 <form string="Merge Leads/Opportunities" version="7.0">
-                    <separator string="Select Leads/Opportunities"/>
-                    <field name="opportunity_ids">
-                        <tree>
-                            <field name="create_date"/>
-                            <field name="name"/>
-                            <field name="type"/>
-                            <field name="contact_name"/>
-                            <field name="email_from"/>
-                            <field name="phone"/>
-                            <field name="stage_id"/>
-                            <field name="user_id"/>
-                            <field name="section_id" groups="base.group_multi_salesteams"/>
-                        </tree>
-                    </field>
+                    <group string="Assign opportunities to">
+                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, context)"/>
+                        <field name="section_id" class="oe_inline"/>
+                    </group>
+                    <group string="Select Leads/Opportunities">
+                        <field name="opportunity_ids" nolabel="1">
+                            <tree>
+                                <field name="create_date"/>
+                                <field name="name"/>
+                                <field name="type"/>
+                                <field name="contact_name"/>
+                                <field name="email_from"/>
+                                <field name="phone"/>
+                                <field name="stage_id"/>
+                                <field name="user_id"/>
+                                <field name="section_id" groups="base.group_multi_salesteams"/>
+                            </tree>
+                        </field>
+                    </group>
                     <footer>
                         <button name="action_merge" type="object" string="Merge" class="oe_highlight"/>
                         or

From 5a5c6eeb7a9e89faae25786f59276de485c27faf Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 25 Apr 2013 16:16:33 +0530
Subject: [PATCH 055/197] [IMP] remove base tax code from childs.

bzr revid: tpa@tinyerp.com-20130425104633-uiwvtx74f45p3vs0
---
 addons/l10n_in/l10n_in_public_tax_template.xml | 12 +-----------
 addons/l10n_in/l10n_in_tax_code_template.xml   | 13 +++++++++----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 6c0a63f0090..aaf51b535ed 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -106,7 +106,6 @@
         <field name="amount">0.0200</field>
         <field name="account_collected_id" ref="p154009"/>
         <field name="account_paid_id" ref="p154009"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
         <field name="parent_id" ref="account_tax_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -120,7 +119,6 @@
         <field name="amount">0.0100</field>
         <field name="account_collected_id" ref="p154002"/>
         <field name="account_paid_id" ref="p154002"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
         <field name="parent_id" ref="account_tax_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -161,7 +159,6 @@
         <field name="sequence">21</field>
         <field name="account_collected_id" ref="p154014"/>
         <field name="account_paid_id" ref="p154014"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
         <field name="parent_id" ref="account_tax_exic6_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -176,7 +173,6 @@
         <field name="sequence">22</field>
         <field name="account_collected_id" ref="p154015"/>
         <field name="account_paid_id" ref="p154015"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
         <field name="parent_id" ref="account_tax_exic6_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -218,7 +214,6 @@
         <field name="sequence">21</field>
         <field name="account_collected_id" ref="p154014"/>
         <field name="account_paid_id" ref="p154014"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -233,7 +228,6 @@
         <field name="sequence">22</field>
         <field name="account_collected_id" ref="p154015"/>
         <field name="account_paid_id" ref="p154015"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -262,7 +256,6 @@
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="p247010"/>
         <field name="account_paid_id" ref="p247010"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -277,7 +270,6 @@
         <field name="sequence">3</field>
         <field name="account_collected_id" ref="p247002"/>
         <field name="account_paid_id" ref="p247002"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -652,7 +644,7 @@
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -666,7 +658,6 @@
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
         <field name="parent_id" ref="account_tax_ser12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
@@ -681,7 +672,6 @@
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
         <field name="parent_id" ref="account_tax_ser12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index e9bbcc28faa..c547b84821f 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -48,7 +48,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
-            <field name="name">Excise Duty - (12% + 2% +1%) Sales</field>
+            <field name="name">Excise Duty 12.36% - Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
@@ -58,7 +58,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
-            <field name="name">Input Credit - Service Tax (12% + 2% + 1%) Purchase</field>
+            <field name="name">Input Credit - Service Tax 12.36% - Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -98,7 +98,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_base">
-            <field name="name">Input Credit - Service Tax (12% + 2% + 1%)</field>
+            <field name="name">Input Credit - Service Tax 12.36%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -403,7 +403,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_rec_st_salebase">
-            <field name="name">Service Tax (12% + 2% + 1%) Sales</field>
+            <field name="name">Service Tax 12.36% - Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
@@ -422,5 +422,10 @@
             <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
+            <field name="name">Service Tax 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
     </data>
 </openerp>

From d490560859771a16bf99b7a992ff4fd0247e908a Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 30 Apr 2013 16:58:38 +0530
Subject: [PATCH 056/197] [IMP] improved data and sign for tax paid.

bzr revid: tpa@tinyerp.com-20130430112838-ub3x3iko5pnui1yp
---
 .../l10n_in/l10n_in_public_tax_template.xml   | 93 ++++++++++---------
 addons/l10n_in/l10n_in_tax_code_template.xml  | 17 ++--
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index aaf51b535ed..f848045e705 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -104,6 +104,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
+        <field name="sequence">3</field>
         <field name="account_collected_id" ref="p154009"/>
         <field name="account_paid_id" ref="p154009"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
@@ -117,6 +118,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
+        <field name="sequence">5</field>
         <field name="account_collected_id" ref="p154002"/>
         <field name="account_paid_id" ref="p154002"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
@@ -137,47 +139,6 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="account_tax_exic6_pur" model="account.tax.template">
-        <field name="name">Input Excise Duty 6%</field>
-        <field name="description">Input Excise Duty 6%</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0600</field>
-        <field name="account_collected_id" ref="p154011"/>
-        <field name="account_paid_id" ref="p154011"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
-        <field name="name">Education Cess 2% Purchase</field>
-        <field name="description">Education Cess 2% Purchase</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0200</field>
-        <field name="sequence">21</field>
-        <field name="account_collected_id" ref="p154014"/>
-        <field name="account_paid_id" ref="p154014"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
-        <field name="parent_id" ref="account_tax_exic6_pur"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
-        <field name="name">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
-        <field name="description">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
-        <field name="type_tax_use">all</field>
-        <field name="type">percent</field>
-        <field name="amount">0.0100</field>
-        <field name="sequence">22</field>
-        <field name="account_collected_id" ref="p154015"/>
-        <field name="account_paid_id" ref="p154015"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
-        <field name="parent_id" ref="account_tax_exic6_pur"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
     <record id="account_tax_exic5_pur" model="account.tax.template">
         <field name="name">Input Excise Duty 5%</field>
         <field name="description">Input Excise Duty 5%</field>
@@ -253,7 +214,7 @@
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
-        <field name="sequence">2</field>
+        <field name="sequence">3</field>
         <field name="account_collected_id" ref="p247010"/>
         <field name="account_paid_id" ref="p247010"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
@@ -267,7 +228,7 @@
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
-        <field name="sequence">3</field>
+        <field name="sequence">5</field>
         <field name="account_collected_id" ref="p247002"/>
         <field name="account_paid_id" ref="p247002"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
@@ -635,6 +596,48 @@
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
+    <record id="account_tax_exic6_pur" model="account.tax.template">
+        <field name="name">Input Excise Duty 6%</field>
+        <field name="description">Input Excise Duty 6%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0600</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p154011"/>
+        <field name="account_paid_id" ref="p154011"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
+        <field name="name">Education Cess 2% Purchase</field>
+        <field name="description">Education Cess 2% Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">21</field>
+        <field name="account_collected_id" ref="p154014"/>
+        <field name="account_paid_id" ref="p154014"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">22</field>
+        <field name="account_collected_id" ref="p154015"/>
+        <field name="account_paid_id" ref="p154015"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     <record id="account_tax_ser12_sale" model="account.tax.template">
         <field name="name">Service Tax 12% - Sales</field>
         <field name="description">Service Tax 12% - Sales</field>
@@ -655,7 +658,7 @@
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
-        <field name="sequence">1</field>
+        <field name="sequence">3</field>
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
@@ -669,7 +672,7 @@
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <field name="sequence">1</field>
+        <field name="sequence">5</field>
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index c547b84821f..b067ef6a601 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -19,6 +19,7 @@
 
         <record model="account.tax.code.template" id="vat_code_payable">
             <field name="name">Tax Paid</field>
+            <field name="sign">-1</field>
             <field name="parent_id" ref="vat_code_balance_net"/>
         </record>
 
@@ -52,6 +53,11 @@
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
+            <field name="name">Sales Service Tax 12%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
             <field name="name">Excise Duty 12% - Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
@@ -208,7 +214,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_intrest">
-            <field name="name"> TDS on Director's Interest</field>
+            <field name="name">TDS on Director's Interest</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -268,7 +274,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_sale_cst15">
-            <field name="name">CST 5% on Sales</field>
+            <field name="name">Sales CST 5%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
@@ -358,7 +364,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_sal_sez_in_guj">
-            <field name="name">Sales Export - SEZ - In Gujarat </field>
+            <field name="name">Sales Export - SEZ - In Gujarat</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
@@ -422,10 +428,5 @@
             <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
-            <field name="name">Service Tax 12% - Sales</field>
-            <field name="parent_id" ref="vat_code_base_tax_sale"/>
-        </record>
-
     </data>
 </openerp>

From 57c9a37374697df0103b389f4f1e17de05746e78 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 2 May 2013 11:37:37 +0530
Subject: [PATCH 057/197] [ADD] Add Refund Base Code and Refund tax code for
 public chart.

bzr revid: tpa@tinyerp.com-20130502060737-qhyev1c1u138ho1n
---
 .../l10n_in/l10n_in_public_tax_template.xml   | 183 +++++++++++++++++-
 1 file changed, 182 insertions(+), 1 deletion(-)

diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index f848045e705..124f0f6975e 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -13,7 +13,9 @@
         <field name="base_code_id" ref="vat_code_tax_pur_PCST5"/>
         <field name="tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
         <field name="ref_base_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -27,6 +29,10 @@
         <field name="account_paid_id" ref="p154003"/>
         <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_urd"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_urd"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_urd"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -40,6 +46,10 @@
         <field name="account_paid_id" ref="p154004"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -53,6 +63,10 @@
         <field name="account_paid_id" ref="p154005"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -67,6 +81,10 @@
         <field name="account_paid_id" ref="p154006"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_import_duty"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_import_duty"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -81,6 +99,10 @@
         <field name="account_paid_id" ref="p154007"/>
         <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -95,6 +117,10 @@
         <field name="account_paid_id" ref="p154008"/>
         <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -108,6 +134,8 @@
         <field name="account_collected_id" ref="p154009"/>
         <field name="account_paid_id" ref="p154009"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -122,6 +150,8 @@
         <field name="account_collected_id" ref="p154002"/>
         <field name="account_paid_id" ref="p154002"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -136,6 +166,10 @@
         <field name="account_paid_id" ref="p154010"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -149,6 +183,10 @@
         <field name="account_paid_id" ref="p154012"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -163,6 +201,10 @@
         <field name="account_paid_id" ref="p154013"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -176,6 +218,8 @@
         <field name="account_collected_id" ref="p154014"/>
         <field name="account_paid_id" ref="p154014"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -190,6 +234,8 @@
         <field name="account_collected_id" ref="p154015"/>
         <field name="account_paid_id" ref="p154015"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_exice12_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -205,6 +251,10 @@
         <field name="account_paid_id" ref="p247001"/>
         <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_sales_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -218,6 +268,8 @@
         <field name="account_collected_id" ref="p247010"/>
         <field name="account_paid_id" ref="p247010"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cess2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -232,6 +284,8 @@
         <field name="account_collected_id" ref="p247002"/>
         <field name="account_paid_id" ref="p247002"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_exice12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -246,6 +300,10 @@
         <field name="account_paid_id" ref="p154016"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -259,6 +317,10 @@
         <field name="account_paid_id" ref="p154017"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -272,6 +334,10 @@
         <field name="account_paid_id" ref="p154018"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -285,6 +351,10 @@
         <field name="account_paid_id" ref="p154019"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -298,6 +368,10 @@
         <field name="account_paid_id" ref="p154020"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -312,6 +386,10 @@
         <field name="account_paid_id" ref="p154021"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -325,6 +403,10 @@
         <field name="account_paid_id" ref="p154022"/>
         <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -338,6 +420,10 @@
         <field name="account_paid_id" ref="p154023"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -351,6 +437,10 @@
         <field name="account_paid_id" ref="p154024"/>
         <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -365,7 +455,10 @@
         <field name="account_paid_id" ref="p154025"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
-        <field name="child_depend" eval="True"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -380,6 +473,10 @@
         <field name="account_paid_id" ref="p154026"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -394,6 +491,10 @@
         <field name="account_paid_id" ref="p154027"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -408,6 +509,10 @@
         <field name="account_paid_id" ref="p247003"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -422,6 +527,10 @@
         <field name="account_paid_id" ref="p247004"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -437,6 +546,10 @@
         <field name="account_paid_id" ref="p247005"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst12"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -451,6 +564,10 @@
         <field name="account_paid_id" ref="p247006"/>
         <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -465,6 +582,10 @@
         <field name="account_paid_id" ref="p154028"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -479,6 +600,10 @@
         <field name="account_paid_id" ref="p154029"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -493,6 +618,10 @@
         <field name="account_paid_id" ref="p154030"/>
         <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_cst2"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cst2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -504,6 +633,10 @@
         <field name="amount">0.02</field>
         <field name="base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_fomh"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_fomh"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -517,6 +650,10 @@
         <field name="account_paid_id" ref="p247007"/>
         <field name="base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -530,6 +667,10 @@
         <field name="account_paid_id" ref="p247008"/>
         <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -543,6 +684,10 @@
         <field name="account_paid_id" ref="p247009"/>
         <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -553,6 +698,10 @@
         <field name="type">fixed</field>
         <field name="base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
         <field name="tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -563,6 +712,10 @@
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
         <field name="tax_code_id" ref="vat_code_tax_no_sez_guj"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_no_sez_guj"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -573,6 +726,10 @@
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_formh_tax"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_formh_tax"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -583,6 +740,10 @@
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_out_country"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_out_country"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -593,6 +754,10 @@
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_proj"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_no_proj"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_proj"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_no_proj"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -607,6 +772,10 @@
         <field name="account_paid_id" ref="p154011"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice6"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -620,6 +789,8 @@
         <field name="account_collected_id" ref="p154014"/>
         <field name="account_paid_id" ref="p154014"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_exic6_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -634,6 +805,8 @@
         <field name="account_collected_id" ref="p154015"/>
         <field name="account_paid_id" ref="p154015"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_exic6_pur"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -649,6 +822,10 @@
         <field name="account_paid_id" ref="p24740"/>
         <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
@@ -662,6 +839,8 @@
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_ser12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -676,6 +855,8 @@
         <field name="account_collected_id" ref="p24740"/>
         <field name="account_paid_id" ref="p24740"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_ser12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>

From 2aa9e4b58d96aff4a94405140b107176551acce2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 2 May 2013 16:59:21 +0530
Subject: [PATCH 058/197] [IMP] improved chart of account for private LTD

bzr revid: tpa@tinyerp.com-20130502112921-12c0cfp4a7ix9lpw
---
 addons/l10n_in/l10n_in_private_chart.xml      |  40 +-
 .../l10n_in/l10n_in_private_tax_template.xml  | 530 +++++++++++-------
 addons/l10n_in/l10n_in_public_chart.xml       |   6 +-
 .../l10n_in/l10n_in_public_tax_template.xml   |  32 +-
 addons/l10n_in/l10n_in_tax_code_template.xml  | 178 +++++-
 5 files changed, 550 insertions(+), 236 deletions(-)

diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index 671fdc334d9..4b8e4be55bf 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -135,11 +135,47 @@
         <record model="account.account.template" id="a189">
             <field name="name">Tax Receivable</field>
             <field name="code">189</field>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="a10"/>
         </record>
+
+        <record model="account.account.template" id="a189100">
+            <field name="name">Purchase Tax Receivable</field>
+            <field name="code">189100</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
+        <record model="account.account.template" id="a189200">
+            <field name="name">VAT Receivable</field>
+            <field name="code">189200</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
+        <record model="account.account.template" id="a189300">
+            <field name="name">Service Tax Receivable</field>
+            <field name="code">189300</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
+        <record model="account.account.template" id="a189400">
+            <field name="name">Exice Duty Receivable</field>
+            <field name="code">189400</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
         <!-- Liabilities -->
         
         <record model="account.account.template" id="a20">
diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml
index 7aec30f0575..9516774c547 100644
--- a/addons/l10n_in/l10n_in_private_tax_template.xml
+++ b/addons/l10n_in/l10n_in_private_tax_template.xml
@@ -2,269 +2,417 @@
 <openerp>
     <data noupdate="1">
     <!-- Taxes Sale Tax -->
-    
+
     <record id="sales_private" model="account.tax.template">
-        <field name="name">Sale Tax-15%</field>
-        <field name="price_include" eval="0"/>
+        <field name="name">Sale Tax 15%</field>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="account_paid_id" ref="a2161"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale15"/>
+        <field name="tax_code_id" ref="vat_code_rec_sale15"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_sale15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_rec_sale15"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
     <record id="sales_private_main" model="account.tax.template">
-        <field name="name">Sale Tax-12%</field>
-        <field name="price_include" eval="0"/>
+        <field name="name">Sale Tax 12%</field>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="account_paid_id" ref="a2161"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale12"/>
+        <field name="tax_code_id" ref="vat_code_rec_sale12"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_sale12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_rec_sale12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
     <record id="sales_private_main_4" model="account.tax.template">
-        <field name="name">Sale Tax-4%</field>
-        <field name="price_include" eval="0"/>
+        <field name="name">Sale Tax 4%</field>
         <field name="amount">0.04</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="a2161"/>
         <field name="account_paid_id" ref="a2161"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale4"/>
+        <field name="tax_code_id" ref="vat_code_rec_sale4"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_sale4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_rec_sale4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <!-- Purchase tax -->
-    
+
     <record id="purchase_tax_private" model="account.tax.template">
-        <field name="name">Purchase Tax-15%</field>
+        <field name="name">Purchase Tax 15%</field>
         <field name="account_collected_id" ref="a189"/>
-        <field name="account_paid_id" ref="a189"/> 
-        <field name="price_include" eval="0"/>
+        <field name="account_paid_id" ref="a189"/>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="tax_code_id" ref="vat_code_payable"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable"/>
+        <field name="base_code_id" ref="vat_code_base_tax_pur15"/>
+        <field name="tax_code_id" ref="vat_code_pay_pur4"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_pur15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_pay_pur4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
     <!-- vat -->
-    
-    <record id="vat_private_main" model="account.tax.template">
-        <field name="name">VAT-5%(4% VAT+1% Add. Tax.)</field>
-        <field name="price_include" eval="0"/>
+
+    <record id="vat_private_out_vat5" model="account.tax.template">
+        <field name="name">Output VAT 5% (VAT 4% + Add. VAT 1%)</field>
+        <field name="description">Output VAT 5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat5"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat5"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat5"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_in_vat5" model="account.tax.template">
+        <field name="name">Input VAT 5% (VAT 4% + Add. VAT 1%)</field>
+        <field name="description">Input VAT 5%</field>
         <field name="amount">0.05</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat5"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat5"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="vat_private_main_tax" model="account.tax.template">
-        <field name="name">VAT-15%(12.5% VAT+2.5% Add. Tax.)</field>
-        <field name="price_include" eval="0"/>
+
+    <record id="vat_private_in_vat15" model="account.tax.template">
+        <field name="name">Input VAT 15% (VAT 12.5% + Add. VAT 2.5%)</field>
+        <field name="description">Input VAT 15%</field>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="vat_private_tax" model="account.tax.template">
-        <field name="name">VAT-8%</field>
-        <field name="price_include" eval="0"/>
+
+    <record id="vat_private_out_vat15" model="account.tax.template">
+        <field name="name">Output VAT 15% (VAT 12.5% + Add. VAT 2.5%)</field>
+        <field name="description">Output VAT 15%</field>
+        <field name="amount">0.15</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_in_vat8" model="account.tax.template">
+        <field name="name">Input VAT 8%</field>
+        <field name="description">Input VAT 8%</field>
         <field name="amount">0.08</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat8"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat8"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
-    <record id="vat_private_tax_10" model="account.tax.template">
-        <field name="name">VAT-10%</field>
-        <field name="price_include" eval="0"/>
+    <record id="vat_private_out_vat8" model="account.tax.template">
+        <field name="name">Output VAT 8%</field>
+        <field name="description">Output VAT 8%</field>
+        <field name="amount">0.08</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat8"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat8"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_in_vat10" model="account.tax.template">
+        <field name="name">Input VAT 10%</field>
+        <field name="description">Input VAT 10%</field>
         <field name="amount">0.10</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat10"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat10"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
-    <record id="vat_private_tax_12" model="account.tax.template">
-        <field name="name">VAT-12.5%</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">12.5</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>       
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-<!-- Exice Duty -->
-
-    <record id="exice_duty_private_main" model="account.tax.template">
-        <field name="name">Excise Duty-10.30%</field>
-        <field name="include_base_amount" eval="True"/>
+    <record id="vat_private_out_vat10" model="account.tax.template">
+        <field name="name">Output VAT 10%</field>
+        <field name="description">Output VAT 10%</field>
         <field name="amount">0.10</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>         
+        <field name="base_code_id" ref="vat_code_tax_sal_vat10"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat10"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="exice_private_duty_parent" model="account.tax.template">
-        <field name="name">Excise Duty-2%</field>
-        <field name="amount">0.02</field>
+
+    <record id="vat_private_in_vat12" model="account.tax.template">
+        <field name="name">Input VAT 12.5%</field>
+        <field name="description">Input VAT 12.5%</field>
+        <field name="amount">0.125</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_out_vat12" model="account.tax.template">
+        <field name="name">Output VAT 12.5%</field>
+        <field name="description">Output VAT 12.5%</field>
+        <field name="amount">0.125</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="parent_id" ref="exice_duty_private_main"/>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="exice_private_duty" model="account.tax.template">
-        <field name="name">Excise Duty-1%</field>
-        <field name="amount">0.01</field>
-        <field name="type">percent</field>
+
+    <!-- Exice Duty -->
+
+    <record id="exice_duty_private_sale12" model="account.tax.template">
+        <field name="name">Excise Duty 12% - Sales</field>
+        <field name="description">Excise Duty 12% - Sales</field>
         <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
         <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="parent_id" ref="exice_duty_private_main"/>
+        <field name="account_paid_id" ref="a2164"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
+    <record id="exice_duty_private_sale2" model="account.tax.template">
+        <field name="name">Excise Duty 2% - Sales</field>
+        <field name="description">Excise Duty 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.020</field>
+        <field name="account_collected_id" ref="a2164"/>
+        <field name="account_paid_id" ref="a2164"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="exice_duty_private_sale1" model="account.tax.template">
+        <field name="name">Excise Duty 1% - Sales</field>
+        <field name="description">Excise Duty 1% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="account_collected_id" ref="a2164"/>
+        <field name="account_paid_id" ref="a2164"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice1"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
     <!-- Service Tax -->
-    
-    <record id="service_private_main" model="account.tax.template">
-        <field name="type_tax_use">all</field>
-        <field name="name">Service Tax-12.30%</field>
-        <field name="include_base_amount" eval="True"/>
+
+    <record id="service_private_ser12_sale" model="account.tax.template">
+        <field name="name">Service Tax 12% - Sales</field>
+        <field name="description">Service Tax 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
         <field name="amount">0.12</field>
-        <field name="type">percent</field>
+        <field name="sequence">1</field>
         <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/> 			
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
-    <record id="service_private_tax_parent" model="account.tax.template">
-        <field name="name">Service Tax-%2</field>
+
+    <record id="service_private_ser2_sale" model="account.tax.template">
+        <field name="name">Service Tax 2% - Sales</field>
+        <field name="description">Service Tax 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
         <field name="amount">0.02</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
+        <field name="sequence">3</field>
         <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/> 			
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="parent_id" ref="service_private_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="service_private_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
-    <record id="service_private_tax" model="account.tax.template">
-        <field name="name">Service Tax-%1</field>
+
+    <record id="service_private_ser1_sale" model="account.tax.template">
+        <field name="name">Service Tax 1% - Sales</field>
+        <field name="description">Service Tax 1% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
+        <field name="sequence">5</field>
         <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/> 			
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="parent_id" ref="service_private_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="service_private_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
+
+    <record id="service_private_ser12_sale" model="account.tax.template">
+        <field name="name">Service Tax 12% - Sales</field>
+        <field name="description">Service Tax 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="a2163"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="service_private_ser12_purchase" model="account.tax.template">
+        <field name="name">Input Service Tax 12%</field>
+        <field name="description">Input Service Tax 12%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="a189300"/>
+        <field name="account_paid_id" ref="a189300"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="service_private_ser2_purchase" model="account.tax.template">
+        <field name="name">Input Service Tax Edu. Cess. 2%</field>
+        <field name="description">Input Service Tax Edu. Cess. 2%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="a189300"/>
+        <field name="account_paid_id" ref="a189300"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_ic_st"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="service_private_ser1_purchase" model="account.tax.template">
+        <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
+        <field name="description">Input Service Tax Seco. &amp; HEC 1%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">5</field>
+        <field name="account_collected_id" ref="a189300"/>
+        <field name="account_paid_id" ref="a189300"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_ic_st"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 9a743dfd080..91d285408d5 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -668,7 +668,7 @@
         </record>
 
         <record model="account.account.template" id="p154002">
-            <field name="name">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
+            <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
             <field name="code">154002</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -716,7 +716,7 @@
         </record>
 
         <record model="account.account.template" id="p154008">
-            <field name="name">Input Credit - Service Tax 12%</field>
+            <field name="name">Input Service Tax 12%</field>
             <field name="code">154008</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
@@ -724,7 +724,7 @@
         </record>
 
         <record model="account.account.template" id="p154009">
-            <field name="name">Input Credit - Service Tax Edu. Cess. 2%</field>
+            <field name="name">Input Service Tax Edu. Cess. 2%</field>
             <field name="code">154009</field>
             <field name="type">other</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 124f0f6975e..c97167f0b43 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -107,8 +107,8 @@
     </record>
 
     <record id="account_tax_ic_st" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax 12%</field>
-        <field name="description">Input Credit - Service Tax 12%</field>
+        <field name="name">Input Service Tax 12%</field>
+        <field name="description">Input Service Tax 12%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
@@ -125,8 +125,8 @@
     </record>
 
     <record id="account_tax_in_edu_cess_st" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax Edu. Cess. 2%</field>
-        <field name="description">Input Credit - Service Tax Edu. Cess. 2%</field>
+        <field name="name">Input Service Tax Edu. Cess. 2%</field>
+        <field name="description">Input Service Tax Edu. Cess. 2%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -141,8 +141,8 @@
     </record>
 
     <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
-        <field name="name">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
-        <field name="description">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
+        <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
+        <field name="description">Input Service Tax Seco. &amp; HEC 1%</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
@@ -249,9 +249,9 @@
         <field name="include_base_amount" eval="True"/>
         <field name="account_collected_id" ref="p247001"/>
         <field name="account_paid_id" ref="p247001"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_sales_vat"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_sales_vat"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
         <field name="ref_tax_sign" eval="-1"/>
@@ -454,10 +454,10 @@
         <field name="account_collected_id" ref="p154025"/>
         <field name="account_paid_id" ref="p154025"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat4"/>
         <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat4"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -544,9 +544,9 @@
         <field name="include_base_amount" eval="True"/>
         <field name="account_collected_id" ref="p247005"/>
         <field name="account_paid_id" ref="p247005"/>
-        <field name="base_code_id" ref="vat_code_tax_sale_cst12"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_cst2"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst2"/>
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2"/>
         <field name="ref_tax_sign" eval="-1"/>
@@ -580,9 +580,9 @@
         <field name="sequence">60</field>
         <field name="account_collected_id" ref="p154028"/>
         <field name="account_paid_id" ref="p154028"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat12"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12"/>
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
         <field name="ref_tax_sign" eval="-1"/>
@@ -598,9 +598,9 @@
         <field name="sequence">80</field>
         <field name="account_collected_id" ref="p154029"/>
         <field name="account_paid_id" ref="p154029"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat25"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat25"/>
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
         <field name="ref_tax_sign" eval="-1"/>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index b067ef6a601..7d5e5a11736 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -48,23 +48,33 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
-            <field name="name">Excise Duty 12.36% - Sales</field>
-            <field name="parent_id" ref="vat_code_tax_rec"/>
-        </record>
-
         <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
             <field name="name">Sales Service Tax 12%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
+            <field name="name">Excise Duty 12.36% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
             <field name="name">Excise Duty 12% - Sales</field>
             <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice2">
+            <field name="name">Excise Duty 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice1">
+            <field name="name">Excise Duty 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
-            <field name="name">Input Credit - Service Tax 12.36% - Purchase</field>
+            <field name="name">Input Service Tax 12.36% - Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -104,22 +114,22 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_base">
-            <field name="name">Input Credit - Service Tax 12.36%</field>
+            <field name="name">Input Service Tax 12.36%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
-            <field name="name">Input Credit - Service Tax 12%</field>
+            <field name="name">Input Service Tax 12%</field>
             <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
-            <field name="name">Input Credit - Service Tax Edu. Cess. 2%</field>
+            <field name="name">Input Service Tax Edu. Cess. 2%</field>
             <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
-            <field name="name">Input Credit - Service Tax Seco. &amp; HEC 1%</field>
+            <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
             <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
         </record>
 
@@ -163,13 +173,48 @@
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat10">
+            <field name="name">Input VAT 10%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat8">
+            <field name="name">Input VAT 8%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat5">
+            <field name="name">Input VAT 5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
             <field name="name">Input VAT 4%</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
-            <field name="name">Output Adi. VAT 1%</field>
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat15">
+            <field name="name">Output VAT 15%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat12">
+            <field name="name">Output VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat10">
+            <field name="name">Output VAT 10%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat8">
+            <field name="name">Output VAT 8%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat5">
+            <field name="name">Output VAT 5%</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
@@ -178,6 +223,11 @@
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
+            <field name="name">Output Adi. VAT 1%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
             <field name="name">CST 2% on Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
@@ -263,12 +313,12 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pur_sales_vat">
-            <field name="name">Sales VAT 4% / Sales CST 2% / Sales CST 5%</field>
+        <record model="account.tax.code.template" id="vat_code_tax_sales_excise">
+            <field name="name">Sales Excise</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_sale_cst12">
+        <record model="account.tax.code.template" id="vat_code_tax_sale_cst2">
             <field name="name">Sales CST 2%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
@@ -278,13 +328,8 @@
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat4">
-            <field name="name">Purchase VAT 4%</field>
-            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
-        </record>
-
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat12_vat15">
-            <field name="name">Purchase VAT 12.5% / VAT 15%</field>
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat15">
+            <field name="name">Purchase VAT 15%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
@@ -293,11 +338,56 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
-        <record model="account.tax.code.template" id="vat_code_tax_pur_vat15">
-            <field name="name">Purchase VAT 15%</field>
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat10">
+            <field name="name">Purchase VAT 10%</field>
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat8">
+            <field name="name">Purchase VAT 8%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat5">
+            <field name="name">Purchase VAT 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat4">
+            <field name="name">Purchase VAT 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat25">
+            <field name="name">Purchase VAT 2.5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat15">
+            <field name="name">Sales VAT 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat12">
+            <field name="name">Sales VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat10">
+            <field name="name">Sales VAT 10%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat8">
+            <field name="name">Sales VAT 8%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat5">
+            <field name="name">Sales VAT 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_sal_vat4">
             <field name="name">Sales VAT 4%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
@@ -428,5 +518,45 @@
             <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_base_tax_sale15">
+            <field name="name">Sale Tax 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_rec_sale15">
+            <field name="name">Sale Tax - 15%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_sale12">
+            <field name="name">Sale Tax 12%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_rec_sale12">
+            <field name="name">Sale Tax - 12%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_sale4">
+            <field name="name">Sale Tax 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_rec_sale4">
+            <field name="name">Sale Tax - 4%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_pur15">
+            <field name="name">Purchase Tax 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_pay_pur4">
+            <field name="name">Purchase Tax - 15%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
     </data>
 </openerp>

From 3946ab9daea8ba8c9f6cdddc116c365fbc62be0d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 3 May 2013 15:26:52 +0530
Subject: [PATCH 059/197] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20130503095652-6tjtg1hy08d43ssv
---
 .../l10n_in/l10n_in_private_tax_template.xml  | 76 ++++++++-----------
 .../l10n_in/l10n_in_public_tax_template.xml   | 44 +++++------
 addons/l10n_in/l10n_in_tax_code_template.xml  | 19 +++--
 3 files changed, 65 insertions(+), 74 deletions(-)

diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml
index 9516774c547..ede6f5c998e 100644
--- a/addons/l10n_in/l10n_in_private_tax_template.xml
+++ b/addons/l10n_in/l10n_in_private_tax_template.xml
@@ -4,7 +4,8 @@
     <!-- Taxes Sale Tax -->
 
     <record id="sales_private" model="account.tax.template">
-        <field name="name">Sale Tax 15%</field>
+        <field name="name">Sales Tax 15%</field>
+        <field name="description">Sales Tax 15%</field>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
@@ -20,7 +21,8 @@
     </record>
 
     <record id="sales_private_main" model="account.tax.template">
-        <field name="name">Sale Tax 12%</field>
+        <field name="name">Sales Tax 12%</field>
+        <field name="description">Sales Tax 12%</field>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
@@ -36,7 +38,8 @@
     </record>
 
     <record id="sales_private_main_4" model="account.tax.template">
-        <field name="name">Sale Tax 4%</field>
+        <field name="name">Sales Tax 4%</field>
+        <field name="description">Sales Tax 4%</field>
         <field name="amount">0.04</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
@@ -55,6 +58,7 @@
 
     <record id="purchase_tax_private" model="account.tax.template">
         <field name="name">Purchase Tax 15%</field>
+        <field name="description">Purchase Tax 15%</field>
         <field name="account_collected_id" ref="a189"/>
         <field name="account_paid_id" ref="a189"/>
         <field name="amount">0.15</field>
@@ -165,10 +169,10 @@
         <field name="account_collected_id" ref="a2162"/>
         <field name="account_paid_id" ref="a2162"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat8"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat8"/>
         <field name="ref_base_code_id" ref="vat_code_tax_sal_vat8"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat8"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
@@ -199,10 +203,10 @@
         <field name="account_collected_id" ref="a2162"/>
         <field name="account_paid_id" ref="a2162"/>         
         <field name="base_code_id" ref="vat_code_tax_sal_vat10"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat10"/>
         <field name="ref_base_code_id" ref="vat_code_tax_sal_vat10"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat10"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
@@ -233,10 +237,10 @@
         <field name="account_collected_id" ref="a2162"/>
         <field name="account_paid_id" ref="a2162"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat12"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
         <field name="ref_base_code_id" ref="vat_code_tax_sal_vat12"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat12"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
@@ -278,8 +282,8 @@
     </record>
 
     <record id="exice_duty_private_sale1" model="account.tax.template">
-        <field name="name">Excise Duty 1% - Sales</field>
-        <field name="description">Excise Duty 1% - Sales</field>
+        <field name="name">Output Excise Duty 1%</field>
+        <field name="description">Output Excise Duty 1%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
@@ -297,8 +301,8 @@
     <!-- Service Tax -->
 
     <record id="service_private_ser12_sale" model="account.tax.template">
-        <field name="name">Service Tax 12% - Sales</field>
-        <field name="description">Service Tax 12% - Sales</field>
+        <field name="name">Output Service Tax 12%</field>
+        <field name="description">Output Service Tax 12%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.12</field>
@@ -311,12 +315,12 @@
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
         <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <record id="service_private_ser2_sale" model="account.tax.template">
-        <field name="name">Service Tax 2% - Sales</field>
-        <field name="description">Service Tax 2% - Sales</field>
+        <field name="name">Output Sales Service Tax 2%</field>
+        <field name="description">Output Sales Service Tax 2%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
@@ -327,12 +331,12 @@
         <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="service_private_ser12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <record id="service_private_ser1_sale" model="account.tax.template">
-        <field name="name">Service Tax 1% - Sales</field>
-        <field name="description">Service Tax 1% - Sales</field>
+        <field name="name">Output Service Tax 1%</field>
+        <field name="description">Output Service Tax 1%</field>
         <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
@@ -343,25 +347,7 @@
         <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="service_private_ser12_sale"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-
-    <record id="service_private_ser12_sale" model="account.tax.template">
-        <field name="name">Service Tax 12% - Sales</field>
-        <field name="description">Service Tax 12% - Sales</field>
-        <field name="type_tax_use">sale</field>
-        <field name="type">percent</field>
-        <field name="amount">0.12</field>
-        <field name="sequence">1</field>
-        <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/>
-        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
-        <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
-        <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <record id="service_private_ser12_purchase" model="account.tax.template">
@@ -373,13 +359,13 @@
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="a189300"/>
         <field name="account_paid_id" ref="a189300"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
         <field name="ref_tax_sign" eval="-1"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <record id="service_private_ser2_purchase" model="account.tax.template">
@@ -394,8 +380,8 @@
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
         <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_ic_st"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
+        <field name="parent_id" ref="service_private_ser12_purchase"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <record id="service_private_ser1_purchase" model="account.tax.template">
@@ -410,8 +396,8 @@
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
         <field name="ref_tax_sign" eval="-1"/>
-        <field name="parent_id" ref="account_tax_ic_st"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
+        <field name="parent_id" ref="service_private_ser12_purchase"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     </data>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index c97167f0b43..77b897ccbd8 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -107,17 +107,17 @@
     </record>
 
     <record id="account_tax_ic_st" model="account.tax.template">
-        <field name="name">Input Service Tax 12%</field>
-        <field name="description">Input Service Tax 12%</field>
+        <field name="name">Service Tax 12% - Purchase</field>
+        <field name="description">Service Tax 12% - Purchase</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.1200</field>
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="p154008"/>
         <field name="account_paid_id" ref="p154008"/>
-        <field name="base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
-        <field name="ref_base_code_id" ref="vat_code_tax_pur_exp_act"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
         <field name="ref_tax_sign" eval="-1"/>
@@ -125,8 +125,8 @@
     </record>
 
     <record id="account_tax_in_edu_cess_st" model="account.tax.template">
-        <field name="name">Input Service Tax Edu. Cess. 2%</field>
-        <field name="description">Input Service Tax Edu. Cess. 2%</field>
+        <field name="name">Service Tax Edu. Cess. 2% - Purchase</field>
+        <field name="description">Service Tax Edu. Cess. 2% - Purchase</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0200</field>
@@ -141,8 +141,8 @@
     </record>
 
     <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
-        <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
-        <field name="description">Input Service Tax Seco. &amp; HEC 1%</field>
+        <field name="name">Service Tax Seco. &amp; HEC 1% - Purchase</field>
+        <field name="description">Service Tax Seco. &amp; HEC 1% - Purchase</field>
         <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
@@ -472,10 +472,10 @@
         <field name="account_collected_id" ref="p154026"/>
         <field name="account_paid_id" ref="p154026"/>
         <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
         <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -526,10 +526,10 @@
         <field name="account_collected_id" ref="p247004"/>
         <field name="account_paid_id" ref="p247004"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
         <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
@@ -628,7 +628,7 @@
     <record id="account_tax_no_form_h" model="account.tax.template">
         <field name="name">No Tax Form H</field>
         <field name="description">No Tax Form H</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
         <field name="base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
@@ -643,7 +643,7 @@
     <record id="account_tax_cst2_sale_cst3_against_c" model="account.tax.template">
         <field name="name">CST 2% on Sales - CT3  Against Form - C</field>
         <field name="description">CST 2% on Sales - CT3  Against Form - C</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.02</field>
         <field name="account_collected_id" ref="p247007"/>
@@ -660,7 +660,7 @@
     <record id="account_tax_out_vat4_sal_ct3" model="account.tax.template">
         <field name="name">Output VAT 4% on Sales - CT3</field>
         <field name="description">Output VAT 4% on Sales - CT3</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.04</field>
         <field name="account_collected_id" ref="p247008"/>
@@ -677,7 +677,7 @@
     <record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
         <field name="name">Output Adi. VAT 1% on Sales - CT3</field>
         <field name="description">Output Adi. VAT 1% on Sales - CT3</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="amount">0.01</field>
         <field name="account_collected_id" ref="p247009"/>
@@ -694,7 +694,7 @@
     <record id="account_no_tax_sez_ogs" model="account.tax.template">
         <field name="name">No Tax SEZ OGS</field>
         <field name="description">No Tax SEZ OGS</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">fixed</field>
         <field name="base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
         <field name="tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
@@ -708,7 +708,7 @@
     <record id="account_no_tax_sez_guj" model="account.tax.template">
         <field name="name">No Tax SEZ Gujarat</field>
         <field name="description">No Tax SEZ Gujarat</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
         <field name="tax_code_id" ref="vat_code_tax_no_sez_guj"/>
@@ -722,7 +722,7 @@
     <record id="account_no_tax_h_with_bed" model="account.tax.template">
         <field name="name">No Tax Form H with BED</field>
         <field name="description">No Tax Form H with BED</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_formh_tax"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
@@ -736,7 +736,7 @@
     <record id="account_no_tax_export_out_country" model="account.tax.template">
         <field name="name">No Tax Exports - Out of Country</field>
         <field name="description">No Tax Exports - Out of Country</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_out_country"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
@@ -750,7 +750,7 @@
     <record id="account_no_tax_proj" model="account.tax.template">
         <field name="name">No Tax Projects</field>
         <field name="description">No Tax Projects</field>
-        <field name="type_tax_use">purchase</field>
+        <field name="type_tax_use">sale</field>
         <field name="type">percent</field>
         <field name="base_code_id" ref="vat_code_tax_sal_proj"/>
         <field name="tax_code_id" ref="vat_code_tax_rec_no_proj"/>
@@ -798,7 +798,7 @@
     <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
         <field name="name">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
         <field name="description">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
-        <field name="type_tax_use">all</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
         <field name="amount">0.0100</field>
         <field name="sequence">22</field>
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 7d5e5a11736..1b6f0732ba1 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -48,6 +48,11 @@
             <field name="parent_id" ref="vat_code_base_tax_purchase"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pur_ser12">
+            <field name="name">Purchase Service Tax 12%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
         <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
             <field name="name">Sales Service Tax 12%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
@@ -74,7 +79,7 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
-            <field name="name">Input Service Tax 12.36% - Purchase</field>
+            <field name="name">Excise Duty 12.36% - Purchase</field>
             <field name="parent_id" ref="vat_code_payable"/>
         </record>
 
@@ -519,32 +524,32 @@
         </record>
 
         <record model="account.tax.code.template" id="vat_code_base_tax_sale15">
-            <field name="name">Sale Tax 15%</field>
+            <field name="name">Sales Tax 15%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_rec_sale15">
-            <field name="name">Sale Tax - 15%</field>
+            <field name="name">Sales Tax - 15%</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_base_tax_sale12">
-            <field name="name">Sale Tax 12%</field>
+            <field name="name">Sales Tax 12%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_rec_sale12">
-            <field name="name">Sale Tax - 12%</field>
+            <field name="name">Sales Tax - 12%</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_base_tax_sale4">
-            <field name="name">Sale Tax 4%</field>
+            <field name="name">Sales Tax 4%</field>
             <field name="parent_id" ref="vat_code_base_tax_sale"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_rec_sale4">
-            <field name="name">Sale Tax - 4%</field>
+            <field name="name">Sales Tax - 4%</field>
             <field name="parent_id" ref="vat_code_tax_rec"/>
         </record>
 

From 1cc8485b27cda35ed55b8af4c2354a3c0a778dc4 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 3 May 2013 15:48:16 +0530
Subject: [PATCH 060/197] [IMP] improved code

bzr revid: tpa@tinyerp.com-20130503101816-yspfiqfkps6q49pn
---
 addons/l10n_in/l10n_in_public_tax_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 77b897ccbd8..887e051121a 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -134,7 +134,7 @@
         <field name="account_collected_id" ref="p154009"/>
         <field name="account_paid_id" ref="p154009"/>
         <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="parent_id" ref="account_tax_ic_st"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>

From 88dd2644d5cfc5f3282767fe26da67994bbd4853 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 6 May 2013 14:26:45 +0530
Subject: [PATCH 061/197] [IMP] improved tax code for vat 15%

bzr revid: tpa@tinyerp.com-20130506085645-z2h2hnl485xoxwap
---
 addons/l10n_in/l10n_in_private_tax_template.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml
index ede6f5c998e..5cb835d950c 100644
--- a/addons/l10n_in/l10n_in_private_tax_template.xml
+++ b/addons/l10n_in/l10n_in_private_tax_template.xml
@@ -135,10 +135,10 @@
         <field name="account_collected_id" ref="a2162"/>
         <field name="account_paid_id" ref="a2162"/>
         <field name="base_code_id" ref="vat_code_tax_sal_vat15"/>
-        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat15"/>
         <field name="ref_base_code_id" ref="vat_code_tax_sal_vat15"/>
         <field name="ref_base_sign" eval="-1"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat15"/>
         <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>

From 212081200289edd4c60253946514e6e1ed9e0a50 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 24 May 2013 17:26:13 +0530
Subject: [PATCH 062/197] [IMP] Little improvement.

bzr revid: psa@tinyerp.com-20130524115613-vnj5i3pe0nc9rkdv
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 66bbaacb91e..31b20c64c96 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -719,7 +719,7 @@ class account_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
-        'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries are automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
+        'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
         'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
 

From c61329943a702f88003bf4001806f3f23f744a89 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 27 May 2013 14:18:23 +0200
Subject: [PATCH 063/197] [IMP] mail: add breadcrumb from inbox

bzr revid: chm@openerp.com-20130527121823-tfjevhu5zl5at4ar
---
 addons/mail/static/src/js/mail.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 21b0f5a9a87..5d54a6acc48 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -967,6 +967,24 @@ openerp.mail = function (session) {
             this.$('.oe_reply').on('click', this.on_message_reply);
             this.$('.oe_star').on('click', this.on_star);
             this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+        },
+
+        on_record_clicked: function  (event) {
+            event.stopPropagation();
+            var state = {
+                'model': this.model,
+                'id': this.res_id,
+                'title': this.record_name
+            };
+            session.webclient.action_manager.do_push_state(state);
+            this.do_action({
+                res_model: state.model,
+                res_id: state.id,
+                type: 'ir.actions.act_window',
+                views: [[false, 'form']]
+            });
+            return false;
         },
 
         /* Call the on_compose_message on the thread of this message. */

From 2208354292bfc75a635856c7880d858230e2725a Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Tue, 28 May 2013 15:05:17 +0530
Subject: [PATCH 064/197] [IMP] Sign In/ Sing out by project wizard, imporve
 the usability issues.

bzr revid: nco@tinyerp.com-20130528093517-h4zc0t6op8xt033y
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py      | 2 +-
 .../hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index d0cbdc78c31..36504033429 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -32,7 +32,7 @@ class hr_so_project(osv.osv_memory):
         'date_start': fields.datetime('Starting Date', readonly=True),
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
+        'name': fields.char('Employees Name', size=32, required=True, readonly=True),
         'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index ea8d37ad454..c91b794b1f1 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -43,7 +43,7 @@
         </record>
 
         <record id="action_hr_timesheet_sign_in" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out by project</field>
+            <field name="name">Sign in / Sign out by Project</field>
             <field name="res_model">hr.sign.in.project</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -67,7 +67,7 @@
                         <field name="account_id" colspan="2"/>
                         <field name="info" colspan="2"/>
                         <field name="date"/>
-                        <label string="(Keep empty for current_time)" colspan="2"/>
+                        <label string="(Keep empty for current time)" colspan="2"/>
                         <field name="analytic_amount"/>
                     </group>
 
@@ -82,7 +82,7 @@
         </record>
 
         <record id="action_hr_timesheet_sign_out" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out by project</field>
+            <field name="name">Sign in / Sign out by Project</field>
             <field name="res_model">hr.sign.out.project</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

From 2114adf97e83aabd49411c5fc070ce2304275b93 Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP Trainee)" <baradmahendra344@gmail.com>
Date: Tue, 28 May 2013 15:59:50 +0530
Subject: [PATCH 065/197] [IMP] current status value.

bzr revid: nco@tinyerp.com-20130528102950-txs9fjuodrzrv0ue
---
 addons/hr_attendance/hr_attendance.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index dcff0ad5085..fcb1ea7a161 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -108,7 +108,7 @@ class hr_employee(osv.osv):
                         AND hr_attendance.name = foo.name) \
                 WHERE hr_attendance.employee_id IN %s',(tuple(ids),))
         for res in cr.fetchall():
-            result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
+            result[res[1]] = res[0] == 'sign_in' and 'Present' or 'Absent'
         return result
     
     def _last_sign(self, cr, uid, ids, name, args, context=None):
@@ -152,8 +152,8 @@ class hr_employee(osv.osv):
         warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
         for employee in self.browse(cr, uid, ids, context=context):
             if not action:
-                if employee.state == 'present': action = 'sign_out'
-                if employee.state == 'absent': action = 'sign_in'
+                if employee.state == 'Present': action = 'sign_out'
+                if employee.state == 'Absent': action = 'sign_in'
 
             if not self._action_check(cr, uid, employee.id, action_date, context):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))

From 6644f6555b4b6625310610d78280865ba2488f24 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Tue, 28 May 2013 16:01:19 +0530
Subject: [PATCH 066/197] [IMP] improve string Employee Name

bzr revid: nco@tinyerp.com-20130528103119-569eqxi0hyb7906t
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 36504033429..a554fc73d3d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -109,7 +109,7 @@ class hr_si_project(osv.osv_memory):
     _name = 'hr.sign.in.project'
     _description = 'Sign In By Project'
     _columns = {
-        'name': fields.char('Employees name', size=32,  readonly=True),
+        'name': fields.char('Employees Name', size=32,  readonly=True),
         'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),

From 87f399689445a26cab892140203617532b85834f Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Tue, 28 May 2013 17:12:16 +0530
Subject: [PATCH 067/197] [IMP] put computed balance field.

bzr revid: nco@tinyerp.com-20130528114216-2ow9907o6ckrse12
---
 addons/account/account_view.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 603c4254b19..5c29d23ba0a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -609,6 +609,13 @@
                             </field>
                         </page>
                     </notebook>
+                    <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
+                        <div class="oe_subtotal_footer_separator oe_inline">
+                            <label for="balance_end" />
+                        </div>
+                        <field name="balance_end" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
+                    </group>
+                    <div class="oe_clear"/>
                 </sheet>
                 </form>
             </field>

From 8c8a9378d831c970db3e865f021f34f6d6e4ad4a Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Wed, 29 May 2013 10:18:35 +0530
Subject: [PATCH 068/197] [FIX] set the missing selection on related field
 currunt status.

bzr revid: nco@tinyerp.com-20130529044835-a3faab0nasqfntvk
---
 addons/hr_attendance/hr_attendance.py                  | 6 +++---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index fcb1ea7a161..dcff0ad5085 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -108,7 +108,7 @@ class hr_employee(osv.osv):
                         AND hr_attendance.name = foo.name) \
                 WHERE hr_attendance.employee_id IN %s',(tuple(ids),))
         for res in cr.fetchall():
-            result[res[1]] = res[0] == 'sign_in' and 'Present' or 'Absent'
+            result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
         return result
     
     def _last_sign(self, cr, uid, ids, name, args, context=None):
@@ -152,8 +152,8 @@ class hr_employee(osv.osv):
         warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
         for employee in self.browse(cr, uid, ids, context=context):
             if not action:
-                if employee.state == 'Present': action = 'sign_out'
-                if employee.state == 'Absent': action = 'sign_in'
+                if employee.state == 'present': action = 'sign_out'
+                if employee.state == 'absent': action = 'sign_in'
 
             if not self._action_check(cr, uid, employee.id, action_date, context):
                 raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index a554fc73d3d..04ddc87ef10 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import time
+from lxml import etree
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -33,7 +34,7 @@ class hr_so_project(osv.osv_memory):
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
         'name': fields.char('Employees Name', size=32, required=True, readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
@@ -110,7 +111,7 @@ class hr_si_project(osv.osv_memory):
     _description = 'Sign In By Project'
     _columns = {
         'name': fields.char('Employees Name', size=32,  readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')

From b5346ce6bb4b6e3e6e88cd448d3e403fa7cae0dd Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Wed, 29 May 2013 10:28:44 +0530
Subject: [PATCH 069/197] [IMP] remove unused import.

bzr revid: nco@tinyerp.com-20130529045844-e03p9l3rgu17n2xk
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 04ddc87ef10..9b3ea9af058 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 import time
-from lxml import etree
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _

From 8e35f1789797bfe8bc9c070ce10353344f0f5186 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Wed, 29 May 2013 11:26:24 +0530
Subject: [PATCH 070/197] [IMP] Employees name.

bzr revid: nco@tinyerp.com-20130529055624-pcsyqbm0s5mkm3oo
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index c91b794b1f1..54dce78369a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -26,7 +26,7 @@
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
-                        <field name="name" readonly="True" />
+                        <field name="name" string="Employee's Name" readonly="True" />
                         <field name="state" readonly="True" />
                         <field name="server_date"/>
                         <label string="(local time on the server side)" colspan="2"/>
@@ -59,7 +59,7 @@
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
-                        <field name="name" readonly="True" />
+                        <field name="name" string="Employee's Name" readonly="True" />
                         <field name="state" readonly="True" />
                         <field name="date_start"/>
                         <field name="server_date"/>

From ec9bddf2b36c2f2e5cbc79f7a758dc5b036e1d19 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Wed, 29 May 2013 13:21:29 +0530
Subject: [PATCH 071/197] [IMP] add action type in selection

bzr revid: nco@tinyerp.com-20130529075129-o0031upq7wqd6jep
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 9b3ea9af058..05f65ce7a6f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -33,7 +33,7 @@ class hr_so_project(osv.osv_memory):
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
         'name': fields.char('Employees Name', size=32, required=True, readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent'), ('action','Action')], required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
@@ -110,7 +110,7 @@ class hr_si_project(osv.osv_memory):
     _description = 'Sign In By Project'
     _columns = {
         'name': fields.char('Employees Name', size=32,  readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent'), ('action','Action')], required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')

From 1941b9c244dc71ff7a76ce2abb71c24d81009a71 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Wed, 29 May 2013 19:27:34 +0530
Subject: [PATCH 072/197] [Product Pricelist] Default value for based on price

bzr revid: amb@tinyerp.com-20130529135734-62rvtw3yocxvsmq1
---
 addons/product/pricelist.py       | 11 ++++++++++-
 addons/product/pricelist_view.xml |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 705844abae2..2396c56df34 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -376,11 +376,20 @@ class product_pricelist_item(osv.osv):
         result.append((-2, _('Supplier Prices on the product form')))
         return result
 
+    def _default_get(self, cr, uid, fields, context=None):
+        result = self._price_field_get(cr,uid,context)
+        if fields.get('type') == 'purchase':
+            base_value = [item for item in result if 'Cost Price' in item]
+            return base_value[0]
+        else:
+            base_value = [item for item in result if 'Public Price' in item]
+            return base_value[0]
+
     _name = "product.pricelist.item"
     _description = "Pricelist item"
     _order = "sequence, min_quantity desc"
     _defaults = {
-        'base': lambda *a: 1,
+        'base': _default_get,
         'min_quantity': lambda *a: 0,
         'sequence': lambda *a: 5,
         'price_discount': lambda *a: 0,
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index a1b996b891b..784a14228d5 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -152,7 +152,7 @@
                         <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <field name="version_id">
+                    <field name="version_id" context="{'type':type}">
                         <form string="Pricelist Version" version="7.0">
                             <group col="4">
                                 <field name="name"/>
@@ -160,7 +160,7 @@
                                 <field name="date_start"/>
                                 <field name="date_end"/>
                             </group>
-                            <field name="items_id"/>
+                            <field name="items_id" context="{'type':type}"/>
                         </form>
                         <tree string="Pricelist Version">
                             <field name="name"/>

From 133ad0b97c0029e5902a836d821112b4928c465c Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 30 May 2013 10:10:37 +0530
Subject: [PATCH 073/197] [IMP] Improved code for removing the div of dialog
 everytime when the dialog box is created.

bzr revid: psa@tinyerp.com-20130530044037-02cw9gap03qhz087
---
 addons/mail/static/src/js/mail_followers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 7a4052e123b..d40f135d7db 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -82,6 +82,7 @@ openerp_mail_followers = function(session, mail) {
         on_edit_subtype: function(event) {
             var self = this;
             var partner_id = $(event.target).data('id');
+            $('div.oe_edit_actions').remove();
             self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
                             width: 'auto',

From 55d54b2de346f26285cee8c9f89d0da3807af210 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Thu, 30 May 2013 10:34:46 +0530
Subject: [PATCH 074/197] [Project] Project delegated task: Improve Error
 Message.

bzr revid: amb@tinyerp.com-20130530050446-6h2l67ck1ymoi8ee
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 53bfd53f393..9a03658b9bc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -956,7 +956,7 @@ class task(base_stage, osv.osv):
             if task.child_ids:
                 for child in task.child_ids:
                     if child.state in ['draft', 'open', 'pending']:
-                        raise osv.except_osv(_("Warning !"), _("One or more delegated tasks are still open. Please cancel or complete delegated tasks first."))
+                        raise osv.except_osv(_("Error !"), _("You can not done a parent task.\nPlease cancel or complete child task first."))
         return True
 
     def action_close(self, cr, uid, ids, context=None):

From dfb516fb5daadfe3a2a13c6b5c4f71ef2aea6593 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 31 May 2013 18:39:12 +0530
Subject: [PATCH 075/197] [IMP] created a new record rule for the technical
 features group.

bzr revid: psa@tinyerp.com-20130531130912-ee0ptpjv27id4l32
---
 addons/mail/security/mail_security.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index c369e96102b..92b0ca3fc0f 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -14,11 +14,21 @@
         <record id="mail_followers_read_write_own" model="ir.rule">
             <field name="name">mail.followers: read and write its own entries</field>
             <field name="model_id" ref="model_mail_followers"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
         </record>
 
+        <record id="mail_followers_read_write_others" model="ir.rule">
+            <field name="name">mail.followers: read and write its own entries</field>
+            <field name="model_id" ref="model_mail_followers"/>
+            <field name="groups" eval="[(4, ref('base.group_no_one'))]"/>
+            <field name="domain_force">[]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
         <record id="mail_notification_read_write_own" model="ir.rule">
             <field name="name">mail.notification: read and write its own entries</field>
             <field name="model_id" ref="model_mail_notification"/>

From c649ef07062008105ae0db319d358a2155e333d6 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Mon, 3 Jun 2013 14:15:49 +0530
Subject: [PATCH 076/197] [IMP] rename other information tab to Accounting
 Information

bzr revid: fka@tinyerp.com-20130603084549-qyqsj5t8t11pwqus
---
 addons/hr_payroll/hr_payroll_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ccd87ba2616..a856bcdfdd4 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -322,7 +322,7 @@
                                 </tree>
                             </field>
                        </page>
-                       <page string="Other Information">
+                       <page string="Accounting Information">
                             <group>
                                 <group string="Miscellaneous">
                                     <field name="company_id" groups="base.group_multi_company"/>

From 1f451c737f1de2f35dd1f408dbbeee3daae0c781 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 3 Jun 2013 15:54:34 +0530
Subject: [PATCH 077/197] [Project] Remove space from error meassge

bzr revid: amb@tinyerp.com-20130603102434-ak50ximjqehn350h
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 9a03658b9bc..02271e79319 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -956,7 +956,7 @@ class task(base_stage, osv.osv):
             if task.child_ids:
                 for child in task.child_ids:
                     if child.state in ['draft', 'open', 'pending']:
-                        raise osv.except_osv(_("Error !"), _("You can not done a parent task.\nPlease cancel or complete child task first."))
+                        raise osv.except_osv(_("Error!"), _("You can not done a parent task.\nPlease cancel or complete child task first."))
         return True
 
     def action_close(self, cr, uid, ids, context=None):

From 872a688fbe4fba647f51169f2d3fe7d8715974fd Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 3 Jun 2013 18:02:27 +0530
Subject: [PATCH 078/197] [IMP] Added code for the access right on specific
 model.

bzr revid: psa@tinyerp.com-20130603123227-76kykft5jl3u5egl
---
 addons/mail/static/src/js/mail_followers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index d40f135d7db..c43b557e982 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -91,9 +91,9 @@ openerp_mail_followers = function(session, mail) {
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.do_update_subscription(event, partner_id);
-                                        $(this).remove();
+                                        $(this).dialog("close");
                                     }},
-                                    { text: _t("Cancel"), click: function() { $(this).remove(); }}
+                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
              return self.fetch_subtypes(partner_id);
@@ -291,6 +291,7 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
+            this.ds_model.call('check_access_rights', ['write','read'])
             var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
              if (partner_id) {
                 subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))

From 388a3e14a15c9d18cc179cee0779a07e45424b82 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 4 Jun 2013 15:17:22 +0530
Subject: [PATCH 079/197] [ImP] method name change and removed the access call
 which is not needed bcz the system is calling it self.

bzr revid: psa@tinyerp.com-20130604094722-2b8i6ba7blz1g2rc
---
 addons/mail/mail_thread.py                  | 2 +-
 addons/mail/static/src/js/mail_followers.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b248247202b..cf8f5828650 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -152,7 +152,7 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def check_access_right(self, cr, uid, ids, context=None):
+    def check_technical_rights(self, cr, uid, ids, context=None):
         grp_id =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
         user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
         if uid in user_pid:
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index c43b557e982..74a59d5abba 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -198,7 +198,7 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_access_right', [self.session.uid]).then(function(result){
+                self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
                     self.check_access = result;
                     record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                     $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
@@ -291,7 +291,6 @@ openerp_mail_followers = function(session, mail) {
             var self = this;
 
             var checklist = new Array();
-            this.ds_model.call('check_access_rights', ['write','read'])
             var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
              if (partner_id) {
                 subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))

From 52b02c879b0e2b23194f6c08fc30e38a22b42c4a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 5 Jun 2013 18:40:31 +0530
Subject: [PATCH 080/197] [IMP] Improved code without disturbing the others
 methods and solved the issue of unfollowing the specific user by specific id.

bzr revid: psa@tinyerp.com-20130605131031-bppkpzdwmi8sp4f7
---
 addons/mail/mail_thread.py                  | 19 ++++-----
 addons/mail/static/src/js/mail_followers.js | 46 +++++++++++++--------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index cf8f5828650..778419968e2 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -159,12 +159,13 @@ class mail_thread(osv.AbstractModel):
             return True
         return False
 
-    def _get_subscription_data(self, cr, uid, ids, name, args, user_id=None, context=None):
+    def _get_subscription_data(self, cr, uid, ids, name, args, user_pid=None, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
                 available, which are followed if any """
         res = dict((id, dict(message_subtype_data='')) for id in ids)
-        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        if user_pid is None:
+            user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
 
         # find current model subtypes, add them to a dictionary
         subtype_obj = self.pool.get('mail.message.subtype')
@@ -173,8 +174,6 @@ class mail_thread(osv.AbstractModel):
         for id in ids:
             res[id]['message_subtype_data'] = subtype_dict.copy()
 
-        if user_id:
-            user_pid = user_id
         # find the document followers, update the data
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, uid, [
@@ -1257,23 +1256,21 @@ class mail_thread(osv.AbstractModel):
     # Followers API
     #------------------------------------------------------
 
-    def message_get_subscription_data(self, cr, uid, ids, user_id=None, context=None):
+    def message_get_subscription_data(self, cr, uid, ids, user_pid=None, context=None):
         """ Wrapper to get subtypes data. """
-        return self._get_subscription_data(cr, uid, ids, None, None, user_id=user_id, context=context)
+        return self._get_subscription_data(cr, uid, ids, None, None, user_pid=user_pid, context=context)
 
-    def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, user_id=None, context=None):
+    def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
             provided, subscribe uid instead. """
         if user_ids is None:
             user_ids = [uid]
         partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
-        return self.message_subscribe(cr, uid, ids, partner_ids, subtype_ids=subtype_ids, user_id=user_id, context=context)
+        return self.message_subscribe(cr, uid, ids, partner_ids, subtype_ids=subtype_ids, context=context)
 
-    def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, user_id=None, context=None):
+    def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
-        if user_id:
-            partner_ids = [user_id]
         if set(partner_ids) == set([user_pid]):
             try:
                 self.check_access_rights(cr, uid, 'read')
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 74a59d5abba..8b4f044740d 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -81,7 +81,7 @@ openerp_mail_followers = function(session, mail) {
 
         on_edit_subtype: function(event) {
             var self = this;
-            var partner_id = $(event.target).data('id');
+            var user_pid = $(event.target).data('id');
             $('div.oe_edit_actions').remove();
             self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
@@ -90,13 +90,13 @@ openerp_mail_followers = function(session, mail) {
                             title: _t('Edit Subscription of ') + $(event.target).siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
-                                        self.do_update_subscription(event, partner_id);
+                                        self.do_update_subscription(event, user_pid);
                                         $(this).dialog("close");
                                     }},
                                     { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
-             return self.fetch_subtypes(partner_id);
+             return self.fetch_subtypes(user_pid);
         },
 
         on_invite_follower: function (event) {
@@ -231,17 +231,17 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function (partner_id) {
+        fetch_subtypes: function (user_pid) {
             var self = this;
             var mode = "";
-            if (partner_id) {
+            if (user_pid) {
                 mode = "edit_follower";
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id], partner_id, new session.web.CompoundContext(this.build_context(), {})])
+            this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
                 .then(function (data) {self.display_subtypes(data, id, mode);});
         },
 
@@ -267,7 +267,7 @@ openerp_mail_followers = function(session, mail) {
 
         do_follow: function () {
             var context = new session.web.CompoundContext(this.build_context(), {});
-            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, undefined, context])
+            this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], undefined, context])
                 .then(this.proxy('read_value'));
 
             _.each(this.$('.oe_subtype_list input'), function (record) {
@@ -275,39 +275,49 @@ openerp_mail_followers = function(session, mail) {
             });
         },
         
-        do_unfollow: function () {
+        do_unfollow: function (user_pid) {
             if (confirm(_t("Warning! \nYou won't be notified of any email or discussion on this document. Do you really want to unfollow this document ?"))) {
                 _(this.$('.oe_msg_subtype_check')).each(function (record) {
                     $(record).attr('checked',false);
                 });
+            var unsubscribe = 'message_unsubscribe_users';
+            var follower_ids = [this.session.uid];
+            if (user_pid) {
+                unsubscribe = 'message_unsubscribe';
+                follower_ids = [user_pid];
+            }
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context])
-                    .then(this.proxy('read_value'));
+                return this.ds_model.call(unsubscribe, [[this.view.datarecord.id], follower_ids, context])
+                     .then(this.proxy('read_value'));
             }
             return false;
         },
 
-        do_update_subscription: function (event, partner_id) {
+        do_update_subscription: function (event, user_pid) {
             var self = this;
 
+            var subscribe = 'message_subscribe_users';
+            var follower_ids = [this.session.uid];
+            var oe_action = this.$('.oe_actions input[type="checkbox"]');
+            if (user_pid) {
+                subscribe = 'message_subscribe';
+                follower_ids = [user_pid];
+                oe_action = $('.oe_edit_actions input[type="checkbox"]');
+            }
             var checklist = new Array();
-            var subtype_checkbox = _(this.$('.oe_actions input[type="checkbox"]'))
-             if (partner_id) {
-                subtype_checkbox = _($('.oe_edit_actions input[type="checkbox"]'))
-             }
-            subtype_checkbox.each(function (record) {
+            _(oe_action).each(function (record) {
                 if ($(record).is(':checked')) {
                     checklist.push(parseInt($(record).data('id')));
                 }
             });
 
             if (!checklist.length) {
-                if (!this.do_unfollow()) {
+                if (!this.do_unfollow(user_pid)) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, partner_id, context])
+                return this.ds_model.call(subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },

From da775672ea6742a40d5827a30e49761e05868f94 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 6 Jun 2013 11:18:17 +0530
Subject: [PATCH 081/197] [IMP] Improved code.

bzr revid: psa@tinyerp.com-20130606054817-k3bbkb4j1u9rolpi
---
 addons/mail/static/src/js/mail_followers.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 8b4f044740d..6394ccf27c8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -249,16 +249,13 @@ openerp_mail_followers = function(session, mail) {
         display_subtypes:function (data, id, mode) {
             var self = this;
             var $list = this.$('.oe_subtype_list');
-            if (mode.length == 0){ $list.empty().hide();}
+            if (mode.length != 0){ $list = self.$dialog; }
+            $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                if (mode.length == 0) {
-                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( self.$('.oe_subtype_list') );
-                } else {
-                    $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo(self.$dialog);
-                }
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( $list );
             });
             if (_.size(records) > 1) {
                 $list.show();

From 1e26218dd3d20df4d193794912ee49bf778d94c5 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 6 Jun 2013 16:42:06 +0530
Subject: [PATCH 082/197] [IMP] Added description of record and name.

bzr revid: psa@tinyerp.com-20130606111206-01ykdwfohp73uhy2
---
 addons/mail/security/mail_security.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index 92b0ca3fc0f..5384e2aba95 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -20,8 +20,9 @@
             <field name="perm_unlink" eval="False"/>
         </record>
 
+        <!-- If technical rights then read and write others subscriptions -->
         <record id="mail_followers_read_write_others" model="ir.rule">
-            <field name="name">mail.followers: read and write its own entries</field>
+            <field name="name">mail.followers: read and write others entries</field>
             <field name="model_id" ref="model_mail_followers"/>
             <field name="groups" eval="[(4, ref('base.group_no_one'))]"/>
             <field name="domain_force">[]</field>

From b2ce2ae9bc4724a2bf5dba414d6e86c7042768d3 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 12 Jun 2013 10:56:45 +0530
Subject: [PATCH 083/197] [IMP] variable name improvements added action_ ahead
 of subscribe and unsubscribe to clearly understad the work of it.

bzr revid: psa@tinyerp.com-20130612052645-x1wv4e1t2zyig4t2
---
 addons/mail/static/src/js/mail_followers.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 2f010d6812b..faab16947d5 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -280,14 +280,14 @@ openerp_mail_followers = function(session, mail) {
                 _(this.$('.oe_msg_subtype_check')).each(function (record) {
                     $(record).attr('checked',false);
                 });
-            var unsubscribe = 'message_unsubscribe_users';
+            var action_unsubscribe = 'message_unsubscribe_users';
             var follower_ids = [this.session.uid];
             if (user_pid) {
-                unsubscribe = 'message_unsubscribe';
+                action_unsubscribe = 'message_unsubscribe';
                 follower_ids = [user_pid];
             }
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call(unsubscribe, [[this.view.datarecord.id], follower_ids, context])
+                return this.ds_model.call(action_unsubscribe, [[this.view.datarecord.id], follower_ids, context])
                      .then(this.proxy('read_value'));
             }
             return false;
@@ -296,11 +296,11 @@ openerp_mail_followers = function(session, mail) {
         do_update_subscription: function (event, user_pid) {
             var self = this;
 
-            var subscribe = 'message_subscribe_users';
+            var action_subscribe = 'message_subscribe_users';
             var follower_ids = [this.session.uid];
             var oe_action = this.$('.oe_actions input[type="checkbox"]');
             if (user_pid) {
-                subscribe = 'message_subscribe';
+                action_subscribe = 'message_subscribe';
                 follower_ids = [user_pid];
                 oe_action = $('.oe_edit_actions input[type="checkbox"]');
             }
@@ -317,7 +317,7 @@ openerp_mail_followers = function(session, mail) {
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call(subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
+                return this.ds_model.call(action_subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },

From 14f157e395304c288e116e1759fdaf74128d8877 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 12 Jun 2013 17:15:38 +0530
Subject: [PATCH 084/197] [IMP] When the subtypes are not displayed in subtype
 list below the follow button than the edit subtype pencil will also not
 displayed.

bzr revid: psa@tinyerp.com-20130612114538-21ohwb0l50or62fe
---
 addons/mail/static/src/js/mail_followers.js   | 2 ++
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index faab16947d5..6bcc0bb2a4e 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -252,6 +252,8 @@ openerp_mail_followers = function(session, mail) {
             if (mode.length != 0){ $list = self.$dialog; }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
+            this.records_length = $.map(records, function(value, index) { return index; }).length;
+            if (this.records_length > 1) { self.display_followers(); }
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 876cead3b50..0693b7c9532 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug and widget.check_access" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.session.debug and widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 7bd70a095a096171514ef5c57dbcdbbce0f56b64 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 13 Jun 2013 13:12:24 +0530
Subject: [PATCH 085/197] [IMP]: change field string employee name

bzr revid: atp@tinyerp.com-20130613074224-7y8ec47hrpcd1ahw
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py       | 4 ++--
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 05f65ce7a6f..086a17abc6c 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -32,7 +32,7 @@ class hr_so_project(osv.osv_memory):
         'date_start': fields.datetime('Starting Date', readonly=True),
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
-        'name': fields.char('Employees Name', size=32, required=True, readonly=True),
+        'name': fields.char('Employee\'s Name', size=32, required=True, readonly=True),
         'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent'), ('action','Action')], required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
@@ -109,7 +109,7 @@ class hr_si_project(osv.osv_memory):
     _name = 'hr.sign.in.project'
     _description = 'Sign In By Project'
     _columns = {
-        'name': fields.char('Employees Name', size=32,  readonly=True),
+        'name': fields.char('Employee\'s Name', size=32,  readonly=True),
         'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent'), ('action','Action')], required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 54dce78369a..17592cc8e4d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -26,7 +26,7 @@
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
-                        <field name="name" string="Employee's Name" readonly="True" />
+                        <field name="name" readonly="True" />
                         <field name="state" readonly="True" />
                         <field name="server_date"/>
                         <label string="(local time on the server side)" colspan="2"/>
@@ -59,7 +59,7 @@
                 <form string="Sign In/Out by Project" version="7.0">
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
-                        <field name="name" string="Employee's Name" readonly="True" />
+                        <field name="name"  readonly="True" />
                         <field name="state" readonly="True" />
                         <field name="date_start"/>
                         <field name="server_date"/>

From 8c4fe4779afdfb796c415f304de13e8d62e9ae9d Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 13 Jun 2013 14:49:26 +0530
Subject: [PATCH 086/197] [FIX]:  REMOVE ACTION from selection

bzr revid: atp@tinyerp.com-20130613091926-9aixud1f0h2mcnoe
---
 addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 086a17abc6c..87425b9cb3f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -33,7 +33,7 @@ class hr_so_project(osv.osv_memory):
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
         'name': fields.char('Employee\'s Name', size=32, required=True, readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent'), ('action','Action')], required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
@@ -110,7 +110,7 @@ class hr_si_project(osv.osv_memory):
     _description = 'Sign In By Project'
     _columns = {
         'name': fields.char('Employee\'s Name', size=32,  readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent'), ('action','Action')], required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')

From e726cf913f309d7ecdb198f771fdeaf52ae8e9fd Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 17 Jun 2013 13:14:44 +0530
Subject: [PATCH 087/197] [FIX]: Fix yaml issue.

bzr revid: atp@tinyerp.com-20130617074444-w9j0lyk7t4th8ox3
---
 addons/hr_timesheet/test/test_hr_timesheet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 59d688f183b..2a2101ff186 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -35,7 +35,7 @@
     new_id = self.create(cr, uid, {'account_id': ref('account.analytic_nebula'),'analytic_amount': 7.0,
     'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S') ,
     'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module',
-    'name': 'Quentin Paolino', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'action'})
+    'name': 'Quentin Paolino', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'})
     self.sign_out_result(cr, uid, [new_id], context)
 -
   My work for this project "Sednacom" is over and I stop working by clicking on "Stop Work" button of this wizard.

From ae8302a3d6108d305c38190214b348a5e6715b7f Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 19 Jun 2013 19:18:17 +0530
Subject: [PATCH 088/197] [IMP] Now the edit_subtype pencil will be visible
 when the cursor goes on to the follower_list. And made the edit_subtype icon
 visible without debug mode.

bzr revid: psa@tinyerp.com-20130619134817-n390r4dsgmpo33nb
---
 addons/mail/static/src/css/mail.css           | 6 ++++++
 addons/mail/static/src/js/mail_followers.js   | 9 +++++++++
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d976ce05f38..d5c1ffeedc7 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -628,6 +628,9 @@
     text-overflow: ellipsis;
     margin-right: 10px;
 }
+.openerp .oe_followers .oe_partner_name {
+    margin-right: 26px;
+}
 .openerp .oe_followers .oe_partner img{
     width: 32px;
     margin-right:4px;
@@ -647,6 +650,9 @@
     width: 10px !important;
     height: 12px !important;
 }
+img.hidden {
+    display: none;
+}
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
     padding-right: 20px;
 }
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 6bcc0bb2a4e..24dadec25ab 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -195,6 +195,15 @@ openerp_mail_followers = function(session, mail) {
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
+            // On mouseenter it will show the edit_subtype penil
+            this.$el.on('mouseenter', 'div.oe_follower_list', function() {
+                $("img.oe_edit_subtype").removeClass("hidden");
+                $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
+            }).on('mouseleave', 'div.oe_follower_list', function(){
+                $("img.oe_edit_subtype").addClass("hidden");
+                $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
+            });
+
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 0693b7c9532..db58abb1441 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.session.debug and widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
+        <img t-if="widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     

From 4180da8a406acc8a55c329e6d90e4df377aba170 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 20 Jun 2013 10:30:26 +0530
Subject: [PATCH 089/197] [IMP] Improved code and removed unwanted code.

bzr revid: psa@tinyerp.com-20130620050026-3kwfmowqfa9f4quz
---
 addons/mail/static/src/css/mail.css         |  2 +-
 addons/mail/static/src/js/mail_followers.js | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d5c1ffeedc7..4d46319a490 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -650,7 +650,7 @@
     width: 10px !important;
     height: 12px !important;
 }
-img.hidden {
+.openerp .oe_followers .oe_partner img.hidden{
     display: none;
 }
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 24dadec25ab..351031b9711 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -195,14 +195,6 @@ openerp_mail_followers = function(session, mail) {
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
-            // On mouseenter it will show the edit_subtype penil
-            this.$el.on('mouseenter', 'div.oe_follower_list', function() {
-                $("img.oe_edit_subtype").removeClass("hidden");
-                $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
-            }).on('mouseleave', 'div.oe_follower_list', function(){
-                $("img.oe_edit_subtype").addClass("hidden");
-                $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
-            });
 
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
@@ -211,6 +203,16 @@ openerp_mail_followers = function(session, mail) {
                     self.check_access = result;
                     record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                     $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                    // On mouseenter it will show the edit_subtype penil
+                    if (self.check_access == true) {
+                        self.$el.on('mouseenter', 'div.oe_follower_list', function() {
+                            $("img.oe_edit_subtype").removeClass("hidden");
+                            $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
+                        }).on('mouseleave', 'div.oe_follower_list', function(){
+                            $("img.oe_edit_subtype").addClass("hidden");
+                            $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
+                        });
+                    }
               })
             });
             // FVA note: be sure it is correctly translated
@@ -271,9 +273,6 @@ openerp_mail_followers = function(session, mail) {
             if (_.size(records) > 1) {
                 $list.show();
             }
-            if (this.check_access && this.session.debug) {
-                $('div.oe_follower_list').find('.oe_partner').css('margin-right', '28px');
-            }
         },
 
         do_follow: function () {

From cc05ab11dfd7e2070d2af9642808de34ec031add Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 26 Jun 2013 16:17:22 +0530
Subject: [PATCH 090/197] [IMP] Little Improvement.

bzr revid: psa@tinyerp.com-20130626104722-jpzcu0gnbbggitv8
---
 addons/mail/static/src/js/mail_followers.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index eafbb3ac4e1..b7862564732 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -74,6 +74,7 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
             // event: click on 'invite' button, that opens the invite wizard
             this.$('.oe_invite').on('click', self.on_invite_follower);
+            // event: click on 'edit_subtype(pencil)' button to edit subscription
             this.$el.on('click', '.oe_edit_subtype', self.on_edit_subtype);
             this.$el.on('click', '.oe_remove_follower', self.on_remove_follower);
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
@@ -81,13 +82,14 @@ openerp_mail_followers = function(session, mail) {
 
         on_edit_subtype: function(event) {
             var self = this;
-            var user_pid = $(event.target).data('id');
+            var $currentTarget = $(event.currentTarget);
+            var user_pid = $currentTarget.data('id');
             $('div.oe_edit_actions').remove();
             self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
                             modal: true,
                             width: 'auto',
                             height: 'auto',
-                            title: _t('Edit Subscription of ') + $(event.target).siblings('a').text(),
+                            title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(),
                             buttons: [
                                     { text: _t("Apply"), click: function() { 
                                         self.do_update_subscription(event, user_pid);
@@ -96,7 +98,7 @@ openerp_mail_followers = function(session, mail) {
                                     { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
                                 ],
                     });
-             return self.fetch_subtypes(user_pid);
+            return self.fetch_subtypes(user_pid);
         },
 
         on_invite_follower: function (event) {

From 8fbfc997aebb788d79200e711389817e9ce719df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 15:25:19 +0200
Subject: [PATCH 091/197] [REF] project: stage/status refactoring Removed
 concept of state on project.task (and propagated report) Removed python
 inheritance towards base_stage (specific code will be re-added)

bzr revid: tde@openerp.com-20130626132519-988nfq8pw8h8c8e8
---
 addons/mail/mail_thread.py                    |  13 +-
 addons/project/__openerp__.py                 |   2 -
 addons/project/board_project_view.xml         |   3 +-
 addons/project/project.py                     | 214 ++++++------------
 addons/project/project_data.xml               |  48 ++--
 addons/project/project_demo.xml               |  20 +-
 addons/project/project_view.xml               |  64 ++----
 addons/project/report/project_report.py       |  26 ++-
 addons/project/report/project_report_view.xml |  40 ++--
 addons/project/test/task_process.yml          |  11 +-
 addons/project/wizard/__init__.py             |   2 -
 .../project/wizard/project_task_reevaluate.py |  84 -------
 .../wizard/project_task_reevaluate_view.xml   |  32 ---
 addons/project_issue/project_issue.py         |   8 -
 14 files changed, 164 insertions(+), 403 deletions(-)
 delete mode 100644 addons/project/wizard/project_task_reevaluate.py
 delete mode 100644 addons/project/wizard/project_task_reevaluate_view.xml

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 403cfab7d61..7181e52e9b6 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -328,8 +328,8 @@ class mail_thread(osv.AbstractModel):
         # Track initial values of tracked fields
         tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
         if tracked_fields:
-            initial = self.read(cr, uid, ids, tracked_fields.keys(), context=context)
-            initial_values = dict((item['id'], item) for item in initial)
+            records = self.browse(cr, uid, ids, context=context)
+            initial_values = dict((this.id, dict((key, getattr(this, key)) for key in tracked_fields.keys())) for this in records)
 
         # Perform write, update followers
         result = super(mail_thread, self).write(cr, uid, ids, values, context=context)
@@ -388,7 +388,8 @@ class mail_thread(osv.AbstractModel):
             if not value:
                 return ''
             if col_info['type'] == 'many2one':
-                return value[1]
+                # return value[1]
+                return value.name_get()[0][1]
             if col_info['type'] == 'selection':
                 return dict(col_info['selection'])[value]
             return value
@@ -407,7 +408,9 @@ class mail_thread(osv.AbstractModel):
         if not tracked_fields:
             return True
 
-        for record in self.read(cr, uid, ids, tracked_fields.keys(), context=context):
+        for browse_record in self.browse(cr, uid, ids, context=context):
+            record = dict((key, getattr(browse_record, key)) for key in tracked_fields.keys())
+            record['id'] = browse_record.id
             initial = initial_values[record['id']]
             changes = []
             tracked_values = {}
@@ -433,7 +436,7 @@ class mail_thread(osv.AbstractModel):
                 if field not in changes:
                     continue
                 for subtype, method in track_info.items():
-                    if method(self, cr, uid, record, context):
+                    if method(self, cr, uid, browse_record, context):
                         subtypes.append(subtype)
 
             posted = False
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index c0a516cf555..634f79d12ac 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -40,7 +40,6 @@
     ],
     'depends': [
         'base_setup',
-        'base_status',
         'product',
         'analytic',
         'board',
@@ -66,7 +65,6 @@ Dashboard / Reports for Project Management will include:
     'data': [
         'security/project_security.xml',
         'wizard/project_task_delegate_view.xml',
-        'wizard/project_task_reevaluate_view.xml',
         'security/ir.model.access.csv',
         'project_data.xml',
         'project_view.xml',
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 931c661d211..3a14f7b6274 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -16,7 +16,6 @@
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -26,7 +25,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+            <field name="domain">[('user_id', '=', uid), ('stage_id.fold', '!=', True)]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
 
diff --git a/addons/project/project.py b/addons/project/project.py
index cadc4d8afb8..738c512fe16 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -28,10 +28,8 @@ from openerp import tools
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-from openerp.addons.base_status.base_stage import base_stage
 from openerp.addons.resource.faces import task as Task
 
-_TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -44,9 +42,6 @@ class project_task_type(osv.osv):
         'case_default': fields.boolean('Default for New Projects',
                         help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
-        'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
-                        help="The status of your document is automatically changed regarding the selected stage. " \
-                            "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         'fold': fields.boolean('Folded by Default',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
@@ -57,7 +52,6 @@ class project_task_type(osv.osv):
         return proj
     _defaults = {
         'sequence': 1,
-        'state': 'open',
         'fold': False,
         'case_default': False,
         'project_ids': _get_default_project_id
@@ -152,11 +146,13 @@ class project(osv.osv):
         cr.execute("""
             SELECT project_id, COALESCE(SUM(planned_hours), 0.0),
                 COALESCE(SUM(total_hours), 0.0), COALESCE(SUM(effective_hours), 0.0)
-            FROM project_task WHERE project_id IN %s AND state <> 'cancelled'
+            FROM project_task
+            LEFT JOIN project_task_type ON project_task.stage_id = project_task_type.id
+            WHERE project_task.project_id IN %s AND project_task_type.fold = False
             GROUP BY project_id
             """, (tuple(child_parent.keys()),))
         # aggregate results into res
-        res = dict([(id, {'planned_hours':0.0,'total_hours':0.0,'effective_hours':0.0}) for id in ids])
+        res = dict([(id, {'planned_hours':0.0, 'total_hours':0.0, 'effective_hours':0.0}) for id in ids])
         for id, planned, total, effective in cr.fetchall():
             # add the values specific to id to all parent projects of id in the result
             while id:
@@ -253,22 +249,22 @@ class project(osv.osv):
         'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -327,22 +323,16 @@ class project(osv.osv):
         return res
 
     def set_done(self, cr, uid, ids, context=None):
-        task_obj = self.pool.get('project.task')
-        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', 'not in', ('cancelled', 'done'))])
-        task_obj.case_close(cr, uid, task_ids, context=context)
-        return self.write(cr, uid, ids, {'state':'close'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'close'}, context=context)
 
     def set_cancel(self, cr, uid, ids, context=None):
-        task_obj = self.pool.get('project.task')
-        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', '!=', 'done')])
-        task_obj.case_cancel(cr, uid, task_ids, context=context)
-        return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
 
     def set_pending(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'pending'}, context=context)
 
     def set_open(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'open'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def reset_project(self, cr, uid, ids, context=None):
         return self.setActive(cr, uid, ids, value=True, context=context)
@@ -459,7 +449,8 @@ class project(osv.osv):
             if project.user_id and (project.user_id.id not in u_ids):
                 u_ids.append(project.user_id.id)
             for task in project.tasks:
-                if task.state in ('done','cancelled'):
+                # TDE: be sure about this, was if task.state in ('done','cancelled')
+                if task.stage_id and task.stage_id.fold:
                     continue
                 if task.user_id and (task.user_id.id not in u_ids):
                     u_ids.append(task.user_id.id)
@@ -525,7 +516,8 @@ def Project():
         for project in projects:
             project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
             for task in project.tasks:
-                if task.state in ('done', 'cancelled'):
+                # TDE CHECK: was if task.state in ('done', 'cancelled')
+                if task.stage_id and task.stage_id.fold:
                     continue
 
                 p = getattr(project_gantt, 'Task_%d' % (task.id,))
@@ -566,23 +558,20 @@ def Project():
             vals.update(alias_model_id=model_ids[0])
         return super(project, self).write(cr, uid, ids, vals, context=context)
 
-class task(base_stage, osv.osv):
+
+class task(osv.osv):
     _name = "project.task"
     _description = "Task"
     _date_name = "date_start"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     _track = {
-        'state': {
-            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
-            'project.mt_task_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
-            'project.mt_task_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-        },
         'stage_id': {
-            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'done', 'open'],
+            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
+            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id.sequence != 1,
         },
         'kanban_state': {  # kanban state: tracked, but only block subtype
-            'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
+            'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
     }
 
@@ -593,14 +582,15 @@ class task(base_stage, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', '1')], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
             context key, or None if it cannot be resolved to a single
             project.
         """
-        if context is None: context = {}
+        if context is None:
+            context = {}
         if type(context.get('default_project_id')) in (int, long):
             return context['default_project_id']
         if isinstance(context.get('default_project_id'), basestring):
@@ -669,7 +659,8 @@ class task(base_stage, osv.osv):
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
-            if task.state in ('done','cancelled'):
+            # TDE CHECK: if task.state in ('done','cancelled'):
+            if task.stage_id and task.stage_id.fold:
                 res[task.id]['progress'] = 100.0
         return res
 
@@ -690,6 +681,13 @@ class task(base_stage, osv.osv):
             return {'value':{'partner_id':partner_id.id}}
         return {}
 
+    def onchange_user_id(self, cr, uid, ids, user_id, context=None):
+        vals = {}
+        if user_id:
+            vals['date_start'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            vals['date_end'] = False
+        return {'value': vals}
+
     def duplicate_task(self, cr, uid, map_ids, context=None):
         for new in map_ids.values():
             task = self.browse(cr, uid, new, context)
@@ -743,17 +741,12 @@ class task(base_stage, osv.osv):
         'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True, select=True),
         'description': fields.text('Description'),
-        'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
+        'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'),
+                                        ('1', 'Important'), ('0', 'Very important')],
+            string='Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
                         domain="[('project_ids', '=', project_id)]"),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
         'categ_ids': fields.many2many('project.category', string='Tags'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          track_visibility='onchange',
@@ -766,6 +759,7 @@ class task(base_stage, osv.osv):
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
         'date_deadline': fields.date('Deadline',select=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select="1", track_visibility='onchange'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
@@ -782,7 +776,7 @@ class task(base_stage, osv.osv):
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
+        'progress': fields.function(_hours_get, string='Working Time Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
@@ -805,6 +799,7 @@ class task(base_stage, osv.osv):
     _defaults = {
         'stage_id': _get_default_stage_id,
         'project_id': _get_default_project_id,
+        'date_last_stage_update': lambda *a: fields.datetime.now(),
         'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
@@ -931,10 +926,11 @@ class task(base_stage, osv.osv):
                 section_ids.append(task.project_id.id)
         search_domain = []
         if section_ids:
-            search_domain = [('|')] * (len(section_ids)-1)
+            search_domain = [('|')] * (len(section_ids) - 1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain += list(domain)
+        if domain:
+            search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
         if stage_ids:
@@ -948,82 +944,11 @@ class task(base_stage, osv.osv):
         for task in tasks:
             if task.child_ids:
                 for child in task.child_ids:
-                    if child.state in ['draft', 'open', 'pending']:
+                    # TDE CHECK: was 'if child.state in ['draft', 'open', 'pending']''
+                    if child.stage_id and not child.stage_id.fold:
                         raise osv.except_osv(_("Warning!"), _("Child task still open.\nPlease cancel or complete child task first."))
         return True
 
-    def action_close(self, cr, uid, ids, context=None):
-        """ This action closes the task
-        """
-        task_id = len(ids) and ids[0] or False
-        self._check_child_task(cr, uid, ids, context=context)
-        if not task_id: return False
-        return self.do_close(cr, uid, [task_id], context=context)
-
-    def do_close(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_close. """
-        return self.case_close(cr, uid, ids, context=context)
-
-    def case_close(self, cr, uid, ids, context=None):
-        """ Closes Task """
-        if not isinstance(ids, list): ids = [ids]
-        for task in self.browse(cr, uid, ids, context=context):
-            vals = {}
-            project = task.project_id
-            for parent_id in task.parent_ids:
-                if parent_id.state in ('pending','draft'):
-                    reopen = True
-                    for child in parent_id.child_ids:
-                        if child.id != task.id and child.state not in ('done','cancelled'):
-                            reopen = False
-                    if reopen:
-                        self.do_reopen(cr, uid, [parent_id.id], context=context)
-            # close task
-            vals['remaining_hours'] = 0.0
-            if not task.date_end:
-                vals['date_end'] = fields.datetime.now()
-            self.case_set(cr, uid, [task.id], 'done', vals, context=context)
-        return True
-
-    def do_reopen(self, cr, uid, ids, context=None):
-        for task in self.browse(cr, uid, ids, context=context):
-            project = task.project_id
-            self.case_set(cr, uid, [task.id], 'open', {}, context=context)
-        return True
-
-    def do_cancel(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_cancel. """
-        return self.case_cancel(cr, uid, ids, context=context)
-
-    def case_cancel(self, cr, uid, ids, context=None):
-        tasks = self.browse(cr, uid, ids, context=context)
-        self._check_child_task(cr, uid, ids, context=context)
-        for task in tasks:
-            self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context)
-        return True
-
-    def do_open(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_open. """
-        return self.case_open(cr, uid, ids, context=context)
-
-    def case_open(self, cr, uid, ids, context=None):
-        if not isinstance(ids,list): ids = [ids]
-        return self.case_set(cr, uid, ids, 'open', {'date_start': fields.datetime.now()}, context=context)
-
-    def do_draft(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_draft. """
-        return self.case_draft(cr, uid, ids, context=context)
-
-    def case_draft(self, cr, uid, ids, context=None):
-        return self.case_set(cr, uid, ids, 'draft', {}, context=context)
-
-    def do_pending(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_pending. """
-        return self.case_pending(cr, uid, ids, context=context)
-
-    def case_pending(self, cr, uid, ids, context=None):
-        return self.case_set(cr, uid, ids, 'pending', {}, context=context)
-
     def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
         attachment = self.pool.get('ir.attachment')
         attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', task_id)], context=context)
@@ -1044,6 +969,7 @@ class task(base_stage, osv.osv):
             delegated_task_id = self.copy(cr, uid, task.id, {
                 'name': delegate_data['name'],
                 'project_id': delegate_data['project_id'] and delegate_data['project_id'][0] or False,
+                'stage_id': delegate_data.get('stage_id', [False])[0],
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
                 'planned_hours': delegate_data['planned_hours'] or 0.0,
                 'parent_ids': [(6, 0, [task.id])],
@@ -1058,16 +984,13 @@ class task(base_stage, osv.osv):
                 'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
                 'name': newname,
             }, context=context)
-            if delegate_data['state'] == 'pending':
-                self.do_pending(cr, uid, [task.id], context=context)
-            elif delegate_data['state'] == 'done':
-                self.do_close(cr, uid, [task.id], context=context)
             delegated_tasks[task.id] = delegated_task_id
         return delegated_tasks
 
     def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
         for task in self.browse(cr, uid, ids, context=context):
-            if (task.state=='draft') or (task.planned_hours==0.0):
+            # TDE CHECK: was (task.state=='draft')
+            if (task.stage_id and task.stage_id.sequence == 1) or (task.planned_hours == 0.0):
                 self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
         self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
         return True
@@ -1102,50 +1025,57 @@ class task(base_stage, osv.osv):
                 'planned_hours': task.planned_hours,
                 'kanban_state': task.kanban_state,
                 'type_id': task.stage_id.id,
-                'state': task.state,
                 'user_id': task.user_id.id
 
             }, context=context)
         return True
 
+    # ------------------------------------------------
+    # CRUD overrides
+    # ------------------------------------------------
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
+        # generate a default stage based on context / given project value
         if not vals.get('stage_id'):
             ctx = context.copy()
             if vals.get('project_id'):
                 ctx['default_project_id'] = vals['project_id']
             vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
+
         # context: no_log, because subtype already handle this
         create_context = dict(context, mail_create_nolog=True)
         task_id = super(task, self).create(cr, uid, vals, context=create_context)
         self._store_history(cr, uid, [task_id], context=context)
         return task_id
 
-    # Overridden to reset the kanban_state to normal whenever
-    # the stage (stage_id) of the task changes.
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if vals.get('project_id'):
-            project_id = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
-            if project_id:
-                vals.setdefault('message_follower_ids', [])
-                vals['message_follower_ids'] += [(6, 0,[follower.id]) for follower in project_id.message_follower_ids]
+        # stage change: update date_last_stage_update
+        if 'stage_id' in vals:
+            vals['date_last_stage_update'] = fields.datetime.now()
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
+
+        # Overridden to reset the kanban_state to normal whenever
+        # the stage (stage_id) of the task changes.
         if vals and not 'kanban_state' in vals and 'stage_id' in vals:
             new_stage = vals.get('stage_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
             for t in self.browse(cr, uid, ids, context=context):
-                #TO FIX:Kanban view doesn't raise warning
-                #stages = [stage.id for stage in t.project_id.type_ids]
-                #if new_stage not in stages:
-                    #raise osv.except_osv(_('Warning!'), _('Stage is not defined in the project.'))
                 write_vals = vals_reset_kstate if t.stage_id != new_stage else vals
                 super(task, self).write(cr, uid, [t.id], write_vals, context=context)
             result = True
         else:
             result = super(task, self).write(cr, uid, ids, vals, context=context)
-        if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):
+
+        if any(item in vals for item in ['stage_id', 'remaining_hours', 'user_id', 'kanban_state']):
             self._store_history(cr, uid, ids, context=context)
         return result
 
@@ -1161,7 +1091,8 @@ class task(base_stage, osv.osv):
         result = ""
         ident = ' '*ident
         for task in tasks:
-            if task.state in ('done','cancelled'):
+            # TDE CHECK: if task.state in ('done','cancelled'):
+            if task.stage_id and task.stage_id.fold:
                 continue
             result += '''
 %sdef Task_%s():
@@ -1231,13 +1162,14 @@ class task(base_stage, osv.osv):
                         update_vals[field] = float(res.group(2).lower())
                     except (ValueError, TypeError):
                         pass
-                elif match.lower() == 'state' \
-                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
-                    act = 'do_%s' % res.group(2).lower()
+                # elif match.lower() == 'state' \
+                #         and res.group(2).lower() in ['cancel','close','draft','open','pending']:
+                #     act = 'do_%s' % res.group(2).lower()
         if act:
             getattr(self,act)(cr, uid, ids, context=context)
         return super(task,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
+    # TDE NOTE: FIXME
     def project_task_reevaluate(self, cr, uid, ids, context=None):
         if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'):
             return {
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7bf1a623a2c..0f48dfe9a2b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -30,51 +30,43 @@
         <record id="project_tt_analysis" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Analysis</field>
-            <field name="state">draft</field>
-            <field name="case_default" eval="False"/>
+            <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_specification" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">10</field>
             <field name="name">Specification</field>
-            <field name="state">pending</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_design" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">11</field>
             <field name="name">Design</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">3</field>
+            <field name="sequence">12</field>
             <field name="name">Development</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">4</field>
+            <field name="sequence">13</field>
             <field name="name">Testing</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">5</field>
+            <field name="sequence">14</field>
             <field name="name">Merge</field>
-            <field name="state">open</field>
             <field name="case_default" eval="False"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_deployment" model="project.task.type">
-            <field name="sequence">100</field>
+            <field name="sequence">20</field>
             <field name="name">Done</field>
-            <field name="state">done</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
-            <field name="sequence">200</field>
+            <field name="sequence">30</field>
             <field name="name">Cancelled</field>
-            <field name="state">cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
@@ -86,11 +78,11 @@
             <field name="default" eval="False"/>
             <field name="description">Task created</field>
         </record>
-        <record id="mt_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+        <record id="mt_task_assigned" model="mail.message.subtype">
+            <field name="name">Task Assigned</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
-            <field name="description">Task started</field>
+            <field name="description">Task Assigned</field>
         </record>
         <record id="mt_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
@@ -98,12 +90,6 @@
             <field name="default" eval="False"/>
             <field name="description">Task blocked</field>
         </record>
-        <record id="mt_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="description">Task closed</field>
-        </record>
         <record id="mt_task_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.task</field>
@@ -118,11 +104,11 @@
             <field name="parent_id" eval="ref('mt_task_new')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+        <record id="mt_project_task_assigned" model="mail.message.subtype">
+            <field name="name">Task Assigned</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_started')"/>
+            <field name="parent_id" eval="ref('mt_task_assigned')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
@@ -131,12 +117,6 @@
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
-            <field name="res_model">project.project</field>
-            <field name="parent_id" eval="ref('mt_task_closed')"/>
-            <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="res_model">project.project</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index b7e1524c2c8..b53c3bb359f 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -225,7 +225,7 @@
                     ref('project.project_category_04')])]"/>
             <field name="stage_id" ref="project_tt_merge"/>
         </record>
-        <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/> -->
 
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
@@ -237,7 +237,7 @@
             <field name="stage_id" ref="project_tt_merge"/>
             <field name="color">6</field>
         </record>
-        <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/> -->
 
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -248,7 +248,7 @@
             <field name="name">Design Use Cases</field>
             <field name="stage_id" ref="project_tt_analysis"/>
         </record>
-        <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/> -->
 
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -282,7 +282,7 @@
             <field name="name">Set target for all deparments</field>
              <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/> -->
 
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
@@ -293,7 +293,7 @@
             <field name="name">Integration of core components</field>
             <field name="stage_id" ref="project_tt_testing"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/> -->
 
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
@@ -315,7 +315,7 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_03')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/> -->
 
         <record id="project_task_20" model="project.task">
             <field name="planned_hours">42.0</field>
@@ -325,7 +325,7 @@
             <field name="project_id" ref="project.project_project_4"/>
             <field name="name">Create new components</field>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/> -->
 
         <record id="project_task_21" model="project.task">
             <field name="planned_hours">14.0</field>
@@ -337,7 +337,7 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_04')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/> -->
 
         <record id="project_task_22" model="project.task">
             <field name="planned_hours">12.0</field>
@@ -371,7 +371,7 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_01')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/> -->
 
         <record id="project_task_25" model="project.task">
             <field name="sequence">20</field>
@@ -382,7 +382,7 @@
             <field name="name">Data importation + Doc</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/>
+        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/> -->
 
         <record id="project_task_26" model="project.task">
             <field name="sequence">20</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 33842a9a19c..8eafacd3bc0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,23 +18,20 @@
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
                     <field name="categ_ids"/>
-                    <separator/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                    <separator/>
-                    <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
-                    <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
-                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                    <separator/>
-                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
-                    <separator/>
-                    <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
-                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
-                    <separator/>
-                    <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
-                        help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                     <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
+                    <separator/>
+                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]"/>
+                    <separator/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
+                    <separator/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <separator/>
+                    <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
+                        help="Show only tasks having a deadline"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -371,18 +368,6 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <!--
-                        <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_highlight"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
-                        -->
-                        <button name="project_task_reevaluate" string="Reactivate" type="object"
-                                states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
-                        <button name="do_cancel" string="Cancel Task" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet string="Task">
@@ -396,8 +381,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" 
-                                attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" 
+                            <field name="user_id"
                                 options='{"no_open": True}'
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                             <field name="planned_hours" widget="float_time"
@@ -405,15 +389,15 @@
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline"/>
                             <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
+                            <field name="description" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
@@ -427,7 +411,7 @@
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                              </group>
@@ -436,7 +420,7 @@
                         </page>
                         <page string="Delegation" groups="project.group_delegate_task">
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                    states="pending,open,draft" groups="project.group_delegate_task"/>
+                                    groups="project.group_delegate_task"/>
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -445,7 +429,6 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -453,12 +436,11 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                        <page string="Extra Info">
                             <group col="4">
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
-                                <field name="state" invisible="1"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
@@ -467,6 +449,7 @@
                                     <field name="date_end"/>
                                 </group>
                                 <group>
+                                    <field name="date_last_stage_update" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
@@ -493,7 +476,6 @@
                     <field name="user_email"/>
                     <field name="description"/>
                     <field name="sequence"/>
-                    <field name="state" groups="base.group_no_one"/>
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
@@ -513,7 +495,7 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
+                                        <!-- <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li> -->
                                       </ul>
                                     </li>
                                     <br/>
@@ -562,7 +544,7 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <tree fonts="bold:message_unread==True" colors="red:date_deadline and (date_deadline&lt;current_date)" string="Tasks">
                     <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
@@ -575,7 +557,6 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" groups="base.group_no_one"/>
                     <field name="date_end" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -706,7 +687,6 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
@@ -723,7 +703,7 @@
                 <tree string="Task Stage">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="state"/>
+                    <field name="fold"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 006aae1085c..a14ca10dfce 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from openerp import tools
 
 class report_project_task_user(osv.osv):
@@ -31,10 +31,12 @@ class report_project_task_user(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=64, required=False, readonly=True),
         'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
-        'date_start': fields.date('Starting Date',readonly=True),
+        'date_start': fields.date('Assignation Date', readonly=True),
         'no_of_days': fields.integer('# of Days', size=128, readonly=True),
         'date_end': fields.date('Ending Date', readonly=True),
         'date_deadline': fields.date('Deadline', readonly=True),
+        'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
+        'month_last_stage_update': fields.date('Month of Last Stage Update', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
@@ -44,16 +46,17 @@ class report_project_task_user(osv.osv):
         'total_hours': fields.float('Total Hours', readonly=True),
         'closing_days': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the task"),
-        'opening_days': fields.float('Days to Open', digits=(16,2), readonly=True, group_operator="avg",
+        'opening_days': fields.float('Days to Assign', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to Open the task"),
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
-        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
-('0','Very urgent')], 'Priority', readonly=True),
+        'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')],
+            string='Priority', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
+        'stage_id': fields.many2one('project.task.type', 'Stage'),
     }
     _order = 'name desc, project_id'
 
@@ -69,19 +72,20 @@ class report_project_task_user(osv.osv):
                     to_char(date_start, 'YYYY-MM-DD') as day,
                     date_trunc('day',t.date_start) as date_start,
                     date_trunc('day',t.date_end) as date_end,
+                    date_trunc('day',t.date_last_stage_update) as date_last_stage_update,
+                    to_char(date_last_stage_update, 'MM') as month_last_stage_update,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
 --                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
                     abs((extract('epoch' from (t.date_end-t.date_start)))/(3600*24))  as no_of_days,
                     t.user_id,
                     progress as progress,
                     t.project_id,
-                    t.state,
                     t.effective_hours as hours_effective,
                     t.priority,
                     t.name as name,
                     t.company_id,
                     t.partner_id,
-                    t.stage_id,
+                    t.stage_id as stage_id,
                     remaining_hours as remaining_hours,
                     total_hours as total_hours,
                     t.delay_hours as hours_delay,
@@ -106,15 +110,13 @@ class report_project_task_user(osv.osv):
                     date_start,
                     date_end,
                     date_deadline,
+                    date_last_stage_update,
+                    month_last_stage_update,
                     t.user_id,
                     t.project_id,
-                    t.state,
                     t.priority,
                     name,
                     t.company_id,
                     t.partner_id,
-                    t.stage_id
-
+                    stage_id
         """)
-
-
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index d9650e165ce..38107ab9bcf 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -15,9 +15,10 @@
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
+                    <field name="date_last_stage_update" invisible="1"/>
+                    <field name="month_last_stage_update" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -44,7 +45,7 @@
             <field name="arch" type="xml">
                 <graph string="Tasks Analysis" type="bar">
                      <field name="name"/>
-                     <field name="state" group="True"/>
+                     <field name="stage_id" group="True"/>
                      <field name="no_of_days" operator="+"/>
                  </graph>
              </field>
@@ -58,31 +59,32 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="date_deadline"/>
-                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
-                    <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
-                    <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
-                    <filter string="Done" icon="terp-dialog-close" name="done" domain="[('state','=','done')]"/>
-                    <separator/>
-                    <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                    <separator/>
-                    <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />
-                    <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
+                    <field name="date_last_stage_update"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
+                    <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
+                    <filter string="Done" name="done" domain="[('stage_id.fold', '=', True)]"
+                            help="Tasks beloging to a folded stage"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]"/>
+                    <separator/>
+                    <filter string="My Task" domain="[('user_id','=',uid)]" />
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <group expand="1" string="Group By...">
-                        <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
-                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
-                        <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
+                        <filter string="Project" name="project" context="{'group_by':'project_id'}"/>
+                        <filter string="Task" context="{'group_by':'name'}" />
+                        <filter string="Contact" context="{'group_by':'partner_id'}" />
+                        <filter string="Assigned to" name="User" context="{'group_by':'user_id'}" />
+                        <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" context="{'group_by':'day'}" help="Creation Date"/>
+                        <filter string="Month" context="{'group_by':'month'}" help="Creation Date"/>
+                        <filter string="Year" context="{'group_by':'year'}" help="Creation Date"/>
+                        <filter string="Last Stage Update" context="{'group_by':'month_last_stage_update'}" help="Month of Last Stage Update"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index e37b2116714..471642610a1 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -1,14 +1,5 @@
 -
-  I put task in pending due to specification is not clear.
--
-  !python {model: project.task}: |
-    self.do_pending(cr, uid, [ref("project_task_1")])
-    context.update({"active_id": ref("project_task_1")})
--
-  I check state  of task after put in pending.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
-    - state == "pending"
+  I open a delegation wizard.
 -
   !record {model: project.task.delegate, id: delegate_id}:
     user_id: base.user_demo
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 7a9a734b2bd..24017d9cbe8 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -20,7 +20,5 @@
 ##############################################################################
 
 import project_task_delegate
-import project_task_reevaluate
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
deleted file mode 100644
index eeb8cccc5d2..00000000000
--- a/addons/project/wizard/project_task_reevaluate.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from lxml import etree
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class project_task_reevaluate(osv.osv_memory):
-    _name = 'project.task.reevaluate'
-
-    def _get_remaining(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        active_id = context.get('active_id', False)
-        res = False
-        if active_id:
-            res = self.pool.get('project.task').browse(cr, uid, active_id, context=context).remaining_hours
-        return res
-
-    _columns = {
-        'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
-    }
-
-    _defaults = {
-        'remaining_hours': _get_remaining,
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-        users_pool = self.pool.get('res.users')
-        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
-        time_mode_name = time_mode and time_mode.name or 'Hours'
-        if time_mode_name in ['Hours','Hour']:
-            return res
-
-        eview = etree.fromstring(res['arch'])
-
-        def _check_rec(eview):
-            if eview.attrib.get('widget','') == 'float_time':
-                eview.set('widget','float')
-            for child in eview:
-                _check_rec(child)
-            return True
-
-        _check_rec(eview)
-
-        res['arch'] = etree.tostring(eview)
-
-        for field in res['fields']:
-            if 'Hours' in res['fields'][field]['string']:
-                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
-        return res
-
-    def compute_hours(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.browse(cr, uid, ids, context=context)[0]
-        task_id = context.get('active_id')
-        if task_id:
-            task_pool = self.pool.get('project.task')
-            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
-            if context.get('button_reactivate'):
-                task_pool.do_reopen(cr, uid, [task_id], context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
deleted file mode 100644
index 6dfe58e8cfd..00000000000
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    <record id="view_project_task_reevaluate" model="ir.ui.view">
-            <field name="name">Re-evaluate Task</field>
-            <field name="model">project.task.reevaluate</field>
-            <field name="arch" type="xml">
-                <form string="Reevaluate Task" version="7.0">
-                    <separator string="Reevaluation Task"/>
-                    <group>
-                        <field name="remaining_hours" widget="float_time"/>
-                    </group>
-                    <footer>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_project_task_reevaluate" model="ir.actions.act_window">
-            <field name="name">Re-evaluate Task</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.task.reevaluate</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
- </data>
-</openerp>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 33e4fcb409c..4c89c4def60 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -21,7 +21,6 @@
 
 from openerp import SUPERUSER_ID
 from openerp.addons.base_status.base_stage import base_stage
-from openerp.addons.project.project import _TASK_STATE
 from openerp.addons.crm import crm
 from datetime import datetime
 from openerp.osv import fields, osv, orm
@@ -247,13 +246,6 @@ class project_issue(base_stage, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Contact', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Private Note'),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          track_visibility='onchange',
                                          help="A Issue's kanban state indicates special situations affecting it:\n"

From 9e17dd58d819d00fa6c00d7f28355d6c1ba94d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 16:22:42 +0200
Subject: [PATCH 092/197] [FIX] project: fixed various report views + some
 filters.

bzr revid: tde@openerp.com-20130626142242-aztr40zazsl20eif
---
 addons/project/project.py                     | 11 ++++---
 addons/project/project_view.xml               |  3 +-
 addons/project/report/project_cumulative.xml  |  4 +--
 addons/project/report/project_report.py       |  6 ++--
 addons/project/report/project_report_view.xml | 29 ++++++++++---------
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 738c512fe16..2e6e351fefb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1301,7 +1301,7 @@ class project_task_history(osv.osv):
     def _get_date(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for history in self.browse(cr, uid, ids, context=context):
-            if history.state in ('done','cancelled'):
+            if history.type_id and history.type_id.fold:
                 result[history.id] = history.date
                 continue
             cr.execute('''select
@@ -1335,14 +1335,13 @@ class project_task_history(osv.osv):
     _columns = {
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'Status'),
-        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', required=False),
+        'kanban_state': fields.selection([('normal', 'Normal'), ('blocked', 'Blocked'), ('done', 'Ready for next stage')], 'Kanban State', required=False),
         'date': fields.date('Date', select=True),
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
             'project.task.history': (_get_related_date, None, 20)
         }),
-        'remaining_hours': fields.float('Remaining Time', digits=(16,2)),
-        'planned_hours': fields.float('Planned Time', digits=(16,2)),
+        'remaining_hours': fields.float('Remaining Time', digits=(16, 2)),
+        'planned_hours': fields.float('Planned Time', digits=(16, 2)),
         'user_id': fields.many2one('res.users', 'Responsible'),
     }
     _defaults = {
@@ -1372,7 +1371,7 @@ class project_task_history_cumulative(osv.osv):
                 SELECT
                     h.id AS history_id,
                     h.date+generate_series(0, CAST((coalesce(h.end_date, DATE 'tomorrow')::date - h.date) AS integer)-1) AS date,
-                    h.task_id, h.type_id, h.user_id, h.kanban_state, h.state,
+                    h.task_id, h.type_id, h.user_id, h.kanban_state,
                     greatest(h.remaining_hours, 1) AS remaining_hours, greatest(h.planned_hours, 1) AS planned_hours,
                     t.project_id
                 FROM
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8eafacd3bc0..cc040983030 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -36,8 +36,9 @@
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Last Action" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
                     </group>
                 </search>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 17e059c8de7..9b9490f0b28 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -14,7 +14,6 @@
                     <field name="user_id"/>
                     <field name="remaining_hours"/>
                     <field name="kanban_state"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -40,8 +39,7 @@
                     <field name="date"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <filter name="open" string="In Progress Tasks" domain="[('state','in',('open','draft'))]"/>
-                    <filter string="Pending Tasks" domain="[('state','=','pending')]" context="{'show_delegated':False}"/>
+                    <filter name="new" string="New" domain="[('type_id.sequence', '=', 1)]"/>
                     <separator/>
                     <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]"/>
                     <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index a14ca10dfce..e7d431662b3 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -19,9 +19,11 @@
 #
 ##############################################################################
 
+from openerp.tools.misc import MONTHS
 from openerp.osv import fields, osv
 from openerp import tools
 
+
 class report_project_task_user(osv.osv):
     _name = "report.project.task.user"
     _description = "Tasks by user and project"
@@ -36,7 +38,7 @@ class report_project_task_user(osv.osv):
         'date_end': fields.date('Ending Date', readonly=True),
         'date_deadline': fields.date('Deadline', readonly=True),
         'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
-        'month_last_stage_update': fields.date('Month of Last Stage Update', readonly=True),
+        'month_last_stage_update': fields.selection(MONTHS, 'Month of Last Stage Update', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
@@ -52,7 +54,7 @@ class report_project_task_user(osv.osv):
         'nbr': fields.integer('# of tasks', readonly=True),
         'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')],
             string='Priority', readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
+        'month':fields.selection(MONTHS, 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 38107ab9bcf..ffaf23ccc4e 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -11,19 +11,6 @@
             <field name="model">report.project.task.user</field>
             <field name="arch" type="xml">
                 <tree string="Tasks Analysis" create="false">
-                    <field name="name" invisible="1"/>
-                    <field name="project_id" invisible="1"/>
-                    <field name="user_id" invisible="1"/>
-                    <field name="date_deadline" invisible="1"/>
-                    <field name="date_start" invisible="1"/>
-                    <field name="date_end" invisible="1"/>
-                    <field name="date_last_stage_update" invisible="1"/>
-                    <field name="month_last_stage_update" invisible="1"/>
-                    <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                    <field name="month" invisible="1"/>
-                    <field name="year" invisible="1"/>
                     <field name="nbr" sum='# of tasks'/>
                     <field name="no_of_days" sum="# of Days"/>
                     <field name="total_hours" sum='Total Hours'/>
@@ -35,6 +22,21 @@
                     <field name="closing_days" sum='Days to Close'/>
                     <field name="delay_endings_days" sum='OverPass delay'/>
                     <field name="progress" sum='Progress' widget='progressbar'/>
+
+                    <field name="name" invisible="1"/>
+                    <field name="project_id" invisible="1"/>
+                    <field name="stage_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="date_deadline" invisible="1"/>
+                    <field name="date_start" invisible="1"/>
+                    <field name="date_end" invisible="1"/>
+                    <field name="date_last_stage_update" invisible="1"/>
+                    <field name="month_last_stage_update" invisible="1"/>
+                    <field name="company_id" invisible="1" groups="base.group_multi_company"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="year" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -63,6 +65,7 @@
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="stage_id"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
                     <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
                     <filter string="Done" name="done" domain="[('stage_id.fold', '=', True)]"

From 669c5caedb54135bb207b34893b0840141e90c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 16:26:28 +0200
Subject: [PATCH 093/197] [FIX] project_gtd: fixed reference to state field of
 task

bzr revid: tde@openerp.com-20130626142628-30ti78hg5xh0kue0
---
 addons/project_gtd/wizard/project_gtd_empty.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index 3233e2534af..b477c12567a 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -52,7 +52,7 @@ class project_timebox_empty(osv.osv_memory):
             raise osv.except_osv(_('Error!'), _('No timebox child of this one!'))
         tids = obj_task.search(cr, uid, [('timebox_id', '=', context['active_id'])])
         for task in obj_task.browse(cr, uid, tids, context):
-            if (task.state in ('cancel','done')) or (task.user_id.id <> uid):
+            if (task.stage_id and task.stage_id.fold) or (task.user_id.id <> uid):
                 close.append(task.id)
             else:
                 up.append(task.id)

From 991f907dece1e58e8279d54b688904e205cab5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 16:31:29 +0200
Subject: [PATCH 094/197] [FIX] project_gtd: some fixes and improvements in
 task related views

bzr revid: tde@openerp.com-20130626143129-zio6ied20h7nnjct
---
 addons/project_gtd/project_gtd_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 4bfd5b783c7..8335ae35c93 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -79,7 +79,6 @@
             <field name="remaining_hours" position="after">
                 <field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/>
                 <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/>
-                <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
             </field>
         </field>
     </record>
@@ -103,16 +102,17 @@
         <field name="arch" type="xml">
            <search string="My Tasks">
                 <field name="name" string="My Tasks"/>
-                <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
-                <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter name="message_unread" string="Unread Messages" domain="[('message_unread','=',True)]"/>
-                <separator/>
-                <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
+                <filter string="No Timebox" domain="[('timebox_id', '=', False)]" help="Tasks having no timebox assigned yet"/>
                 <group expand="0" string="Display">
                     <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
                     <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                 </group>
+                <group expand="0" string="Group By...">
+                    <filter string="Stage" name="group_stage_id" context="{'group_by':'stage_id'}"/>
+                    <filter string="Timebox" name="group_timebox_id" context="{'group_by':'timebox_id'}"/>
+                </group>
             </search>
         </field>
     </record>

From 362aabce1a03b3dabdbbb1c168b7b11672462668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 16:35:59 +0200
Subject: [PATCH 095/197] [FIX] project_long_term: fixed reference to
 task.state

bzr revid: tde@openerp.com-20130626143559-mxg8k5m8fbtkf06u
---
 addons/project_long_term/project_long_term_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e61af0c6c32..e2f47489b4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -200,7 +200,7 @@
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
                                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-                                    <field name="state"/>
+                                    <field name="stage_id"/>
                                   </tree>
                              </field>
                         </page>

From a497545cfdd5a4d74ca7b6797a6c697e75ee14d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 17:52:17 +0200
Subject: [PATCH 096/197] [REF] project_issue: removed state concept, updated
 views + reports + tracking.

bzr revid: tde@openerp.com-20130626155217-333zsa7hj8wjckcn
---
 .../portal_project_issue_view.xml             |  2 +-
 addons/project/report/project_report.py       |  5 +-
 .../board_project_issue_view.xml              |  5 +-
 addons/project_issue/project_issue.py         | 49 ++++++-------------
 addons/project_issue/project_issue_data.xml   | 27 +++-------
 addons/project_issue/project_issue_view.xml   | 27 +++-------
 .../report/project_issue_report.py            | 11 +----
 .../report/project_issue_report_view.xml      | 14 +++---
 8 files changed, 44 insertions(+), 96 deletions(-)

diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 2750edf300f..c4f1e0aca57 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -26,7 +26,7 @@
                                         </div>
                                         <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
                                         <div class="oe_text_right">
-                                            <h1><field name="state" readonly="1"/></h1>
+                                            <h1><field name="stage_id" readonly="1"/></h1>
                                         </div>
                                     </div>
                                     <div>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index e7d431662b3..def0e0edd97 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from openerp.tools.misc import MONTHS
 from openerp.osv import fields, osv
 from openerp import tools
 
@@ -38,7 +37,7 @@ class report_project_task_user(osv.osv):
         'date_end': fields.date('Ending Date', readonly=True),
         'date_deadline': fields.date('Deadline', readonly=True),
         'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
-        'month_last_stage_update': fields.selection(MONTHS, 'Month of Last Stage Update', readonly=True),
+        'month_last_stage_update': fields.selection(fields.date.MONTHS, 'Month of Last Stage Update', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
@@ -54,7 +53,7 @@ class report_project_task_user(osv.osv):
         'nbr': fields.integer('# of tasks', readonly=True),
         'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')],
             string='Priority', readonly=True),
-        'month':fields.selection(MONTHS, 'Month', readonly=True),
+        'month':fields.selection(fields.date.MONTHS, 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index d7574042c37..6eb48f5572d 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -6,7 +6,7 @@
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree">
                     <field name="id"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -16,7 +16,6 @@
                     <field name="version_id" widget="selection"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -28,7 +27,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
+            <field name="domain">[('user_id', '=', uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
 
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 4c89c4def60..30f8845fa40 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -25,7 +25,6 @@ from openerp.addons.crm import crm
 from datetime import datetime
 from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
-import binascii
 import time
 from openerp import tools
 from openerp.tools import html2plaintext
@@ -48,16 +47,15 @@ class project_issue(base_stage, osv.osv):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     _track = {
-        'state': {
-            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
-            'project_issue.mt_issue_closed': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'done',
-            'project_issue.mt_issue_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
-        },
         'stage_id': {
-            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'done', 'open'],
+            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
+            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
+        },
+        'user_id': {
+            'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id,
         },
         'kanban_state': {
-            'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
+            'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
     }
 
@@ -80,7 +78,7 @@ class project_issue(base_stage, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', 1)], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
@@ -353,7 +351,7 @@ class project_issue(base_stage, osv.osv):
             })
             vals = {
                 'task_id': new_task_id,
-                'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('state', '=', 'pending')], context=context),
+                'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('sequence', '=', 1)], context=context),
             }
             message = _("Project issue <b>converted</b> to task.")
             self.message_post(cr, uid, [bug.id], body=message, context=context)
@@ -382,18 +380,12 @@ class project_issue(base_stage, osv.osv):
                 context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-    
-        #Update last action date every time the user changes the stage
+        # stage change: update date_last_stage_update
         if 'stage_id' in vals:
-            vals['date_action_last'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            state = self.pool.get('project.task.type').browse(cr, uid, vals['stage_id'], context=context).state
-            for issue in self.browse(cr, uid, ids, context=context):
-                # Change from draft to not draft EXCEPT cancelled: The issue has been opened -> set the opening date
-                if issue.state == 'draft' and state not in ('draft', 'cancelled'):
-                    vals['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-                # Change from not done to done: The issue has been closed -> set the closing date
-                if issue.state != 'done' and state == 'done':
-                    vals['date_closed'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            vals['date_action_last'] = fields.datetime.now()
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
 
         return super(project_issue, self).write(cr, uid, ids, vals, context)
 
@@ -403,13 +395,6 @@ class project_issue(base_stage, osv.osv):
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
         return {'value': {'user_id': task.user_id.id, }}
 
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(project_issue, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
-        return res
-
     def get_empty_list_help(self, cr, uid, help, context=None):
         context['empty_list_help_model'] = 'project.project'
         context['empty_list_help_id'] = context.get('default_project_id')
@@ -458,11 +443,6 @@ class project_issue(base_stage, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Cancels case """
-        self.case_set(cr, uid, ids, 'cancelled', {'active': True}, context=context)
-        return True
-
     def case_escalate(self, cr, uid, ids, context=None):
         cases = self.browse(cr, uid, ids)
         for case in cases:
@@ -585,7 +565,8 @@ class project(osv.Model):
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
         for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
-            if issue.state not in ('done', 'cancelled'):
+            # TDE CHECK: if issue.state not in ('done', 'cancelled'):
+            if issue.stage_id and not issue.stage_id.fold:
                 res[issue.project_id.id] += 1
         return res
 
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 2e43ca69193..f8c006beaff 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <!-- <data noupdate="1"> -->
+    <data>
 
         <!-- Case type_id -->
         <!--    For Bugs    -->
@@ -35,11 +36,11 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="default" eval="False"/>
             <field name="description">Issue created</field>
         </record>
-        <record id="mt_issue_started" model="mail.message.subtype">
-            <field name="name">Issue Started</field>
+        <record id="mt_issue_assigned" model="mail.message.subtype">
+            <field name="name">Issue Assigned</field>
             <field name="res_model">project.issue</field>
             <field name="default" eval="False"/>
-            <field name="description">Issue started</field>
+            <field name="description">Issue assigned</field>
         </record>
         <record id="mt_issue_blocked" model="mail.message.subtype">
             <field name="name">Issue Blocked</field>
@@ -47,12 +48,6 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="default" eval="False"/>
             <field name="description">Issue blocked</field>
         </record>
-        <record id="mt_issue_closed" model="mail.message.subtype">
-            <field name="name">Issue Closed</field>
-            <field name="res_model">project.issue</field>
-            <field name="default" eval="False"/>
-            <field name="description">Issue closed</field>
-        </record>
         <record id="mt_issue_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.issue</field>
@@ -67,11 +62,11 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="parent_id" eval="ref('mt_issue_new')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_issue_started" model="mail.message.subtype">
-            <field name="name">Issue Started</field>
+        <record id="mt_project_issue_assigned" model="mail.message.subtype">
+            <field name="name">Issue Assigned</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_issue_started')"/>
+            <field name="parent_id" eval="ref('mt_issue_assigned')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_blocked" model="mail.message.subtype">
@@ -80,12 +75,6 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="parent_id" eval="ref('mt_issue_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_issue_closed" model="mail.message.subtype">
-            <field name="name">Issue Closed</field>
-            <field name="res_model">project.project</field>
-            <field name="parent_id" eval="ref('mt_issue_closed')"/>
-            <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="res_model">project.project</field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index da3034c72f5..8a535e3bc96 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -48,12 +48,6 @@
             <field name="arch" type="xml">
                 <form string="Issue" version="7.0">
                 <header>
-                    <button name="case_close" string="Done" type="object"
-                            states="open" groups="base.group_user"/>
-                    <button name="case_close" string="Done" type="object"
-                            states="draft,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Cancel Issue" type="object"
-                            states="draft,open,pending" groups="base.group_user"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Issue">
@@ -76,7 +70,7 @@
                             <label for="project_id"/>
                             <div>
                                 <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"
+                                <button name="case_escalate" string="⇒ Escalate" type="object" class="oe_link"
                                         groups="base.group_user"/>
                             </div>
                         </group>
@@ -106,7 +100,6 @@
                             </group>
                             <group string="Status" groups="base.group_no_one">
                                 <field name="active"/>
-                                <field name="state" string="Status"/>
                             </group>
                         </page>
                     </notebook>
@@ -123,7 +116,7 @@
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True">
                     <field name="message_unread" invisible="1"/>
                     <field name="id"/>
                     <field name="name"/>
@@ -135,7 +128,6 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -149,17 +141,15 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|', '|', ('partner_id','child_of',self), ('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                    <separator/>
-                    <filter name="filter_new" string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
-                    <filter name="filter_open" string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                    <separator/>
-                    <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-"/>
-                    <separator/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
+                    <separator/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <separator/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -269,7 +259,7 @@
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True">
                     <field name="id"/>
                     <field name="message_unread" invisible="1"/>
                     <field name="name" string="Feature description"/>
@@ -278,7 +268,6 @@
                     <field name="version_id"/>
                     <field name="user_id"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 5cca0ff8689..48c3628832a 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -20,17 +20,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from openerp import tools
 from openerp.addons.crm import crm
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
 class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
@@ -38,7 +31,6 @@ class project_issue_report(osv.osv):
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -80,7 +72,6 @@ class project_issue_report(osv.osv):
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
-                    c.state,
                     c.user_id,
                     c.working_hours_open,
                     c.working_hours_close,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index a885dcd8a7f..a2956bd0999 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -20,7 +20,6 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
                     <field name="delay_open" avg="Avg Opening Delay"/>
@@ -36,9 +35,9 @@
             <field name="model">project.issue.report</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Project Issue" type="bar">
-                    <field name="state"/>
                     <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
+                    <field name="user_id" group="True"/>
+                    <field name="stage_id" group="True"/>
                 </graph>
             </field>
         </record>
@@ -49,14 +48,15 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="creation_date"/>
-                    <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
-                    <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
-                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="version_id"/>
+                    <field name="stage_id"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
+                    <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
+                    <filter string="Done" name="done" domain="[('stage_id.fold', '=', True)]"
+                            help="Tasks beloging to a folded stage"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />

From 658079a4a9d785d8cb39b2ae0acd6586d499c5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 26 Jun 2013 17:58:02 +0200
Subject: [PATCH 097/197] [REF] addons: _track now uses browse records, not
 read dictionaries.

bzr revid: tde@openerp.com-20130626155802-mkquyzdrbp3zgg6b
---
 addons/account/account_invoice.py       | 4 ++--
 addons/analytic/analytic.py             | 6 +++---
 addons/crm/crm_lead.py                  | 8 ++++----
 addons/hr_expense/hr_expense.py         | 6 +++---
 addons/hr_holidays/hr_holidays.py       | 6 +++---
 addons/hr_recruitment/hr_recruitment.py | 6 +++---
 addons/mail/tests/test_mail_features.py | 4 ++--
 addons/purchase/purchase.py             | 6 +++---
 addons/sale/sale.py                     | 4 ++--
 9 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 0fb6af05e58..87e6a66740c 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -221,8 +221,8 @@ class account_invoice(osv.osv):
         'type': {
         },
         'state': {
-            'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'paid' and obj['type'] in ('out_invoice', 'out_refund'),
-            'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open' and obj['type'] in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj.state == 'paid' and obj.type in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj.state == 'open' and obj.type in ('out_invoice', 'out_refund'),
         },
     }
     _columns = {
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index ce79c4d5ffb..df852181709 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -33,9 +33,9 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
     _track = {
         'state': {
-            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'pending',
-            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'close',
-            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
+            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending',
+            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj.state == 'close',
+            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
         },
     }
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 44ada2ffcc0..1070af22b3c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -77,12 +77,12 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     _track = {
         'state': {
-            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
-            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
+            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.state in ['new', 'draft'],
+            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.state == 'done',
+            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancel',
         },
         'stage_id': {
-            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'cancel', 'done'],
+            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj.state not in ['new', 'draft', 'cancel', 'done'],
         },
     }
 
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 8d707baa50e..5d5be0eec97 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -65,9 +65,9 @@ class hr_expense_expense(osv.osv):
     _order = "id desc"
     _track = {
         'state': {
-            'hr_expense.mt_expense_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'accepted',
-            'hr_expense.mt_expense_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancelled',
-            'hr_expense.mt_expense_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirm',
+            'hr_expense.mt_expense_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'accepted',
+            'hr_expense.mt_expense_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancelled',
+            'hr_expense.mt_expense_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirm',
         },
     }
 
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0eb3c0cbf16..f2be4844d27 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -110,9 +110,9 @@ class hr_holidays(osv.osv):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
         'state': {
-            'hr_holidays.mt_holidays_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'validate',
-            'hr_holidays.mt_holidays_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'refuse',
-            'hr_holidays.mt_holidays_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirm',
+            'hr_holidays.mt_holidays_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'validate',
+            'hr_holidays.mt_holidays_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'refuse',
+            'hr_holidays.mt_holidays_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirm',
         },
     }
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c25583cba77..d8c00c40a31 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -94,11 +94,11 @@ class hr_applicant(base_stage, osv.Model):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
         'state': {
-            'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
+            'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj.state == 'done',
+            'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancel',
         },
         'stage_id': {
-            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'cancel'],
+            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.state not in ['done', 'cancel'],
         },
     }
 
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 91ede8b8449..3d914dd7e1d 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -745,10 +745,10 @@ class test_mail(TestMailBase):
         # Data: alter mail_group model for testing purposes (test on classic, selection and many2one fields)
         self.mail_group._track = {
             'public': {
-                'mail.mt_private': lambda self, cr, uid, obj, ctx=None: obj['public'] == 'private',
+                'mail.mt_private': lambda self, cr, uid, obj, ctx=None: obj.public == 'private',
             },
             'name': {
-                'mail.mt_name_supername': lambda self, cr, uid, obj, ctx=None: obj['name'] == 'supername',
+                'mail.mt_name_supername': lambda self, cr, uid, obj, ctx=None: obj.name == 'supername',
             },
             'group_public_id': {
                 'mail.mt_group_public': lambda self, cr, uid, obj, ctx=None: True,
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 707012fc063..77151026765 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -162,9 +162,9 @@ class purchase_order(osv.osv):
     ]
     _track = {
         'state': {
-            'purchase.mt_rfq_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirmed',
-            'purchase.mt_rfq_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'approved',
-            'purchase.mt_rfq_done': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
+            'purchase.mt_rfq_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirmed',
+            'purchase.mt_rfq_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'approved',
+            'purchase.mt_rfq_done': lambda self, cr, uid, obj, ctx=None: obj.state == 'done',
         },
     }
     _columns = {
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 67c6f82ced3..55bd34009bf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -34,8 +34,8 @@ class sale_order(osv.osv):
     _description = "Sales Order"
     _track = {
         'state': {
-            'sale.mt_order_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['manual'],
-            'sale.mt_order_sent': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['sent']
+            'sale.mt_order_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state in ['manual'],
+            'sale.mt_order_sent': lambda self, cr, uid, obj, ctx=None: obj.state in ['sent']
         },
     }
 

From 48648073959b30c76ec0385a7fe36ae68991a120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 09:54:24 +0200
Subject: [PATCH 098/197] [FIX] project_*: various fixes in views.

bzr revid: tde@openerp.com-20130627075424-j9ggzi62b24yk3g7
---
 addons/pad_project/project_task.xml     | 2 +-
 addons/project/project_view.xml         | 8 +++++---
 addons/project_mrp/project_mrp_view.xml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/pad_project/project_task.xml b/addons/pad_project/project_task.xml
index 24efbc9dad0..c8cbbe1c626 100644
--- a/addons/pad_project/project_task.xml
+++ b/addons/pad_project/project_task.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="description" position="replace">
-                    <field name="description_pad" attrs="{'readonly':[('state','=','done')]}" widget="pad"/>
+                    <field name="description_pad" widget="pad"/>
                 </field>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cc040983030..e8ed9ed6ede 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -496,7 +496,6 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <!-- <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li> -->
                                       </ul>
                                     </li>
                                     <br/>
@@ -643,7 +642,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,kanban</field>
-            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
+            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d'))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
@@ -748,7 +747,10 @@
         </record>
 
         <!-- User Form -->
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
+                    domain="[('stage_id.fold', '!=', True)]"
+                    id="act_res_users_2_project_task_opened" name="Assigned Tasks"
+                    res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
         <!-- Tags -->
         <record model="ir.ui.view" id="project_category_search_view">
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 881ed9b6b29..a4c9dbcc9aa 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -26,7 +26,7 @@
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
+                <field name="company_id" position="before">
                     <field name="sale_line_id" string="Order Line"/>
                 </field>
             </field>

From 77f99af456c671f9eb3bd5a96fdbd9a034e5a16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 11:02:57 +0200
Subject: [PATCH 099/197] [FIX] crm_todo: fixed reference to state

bzr revid: tde@openerp.com-20130627090257-g6dk131mtbfj4jlx
---
 addons/crm_todo/crm_todo_view.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 851c2abfba4..2b5797e2c52 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -18,10 +18,6 @@
                             <field string="Timebox" name="timebox_id"/>
                             <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
                             <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
-
-                            <field name="state"/>
-                            <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                         </tree>
                     </field>
                 </page>

From 41ea3d6eaf421fb8c98f3841c5d9ec869d2344c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 11:04:30 +0200
Subject: [PATCH 100/197] [FIX] crm_todo: still fixing views

bzr revid: tde@openerp.com-20130627090430-zkz6auqcjoj5r95x
---
 addons/crm_todo/crm_todo_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 2b5797e2c52..96d00e76932 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -16,8 +16,8 @@
                             <field name="user_id"/>
 
                             <field string="Timebox" name="timebox_id"/>
-                            <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
-                            <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
+                            <button name="prev_timebox" type="object" string="Previous"/>
+                            <button name="next_timebox" type="object" string="Next"/>
                         </tree>
                     </field>
                 </page>

From 9dfa8563ef54a87e7aa8ac3f91b44f1b4dacdd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 11:48:07 +0200
Subject: [PATCH 101/197] [REF] hr_recruitment: removed base_stage inheritance,
 state field. Updated views / reports. Still not updated subtypes.

bzr revid: tde@openerp.com-20130627094807-8vg21s2w0lqblrza
---
 .../board_hr_recruitment_statistical_view.xml |  2 +-
 addons/hr_recruitment/hr_recruitment.py       | 71 +++----------------
 addons/hr_recruitment/hr_recruitment_data.xml | 23 +++---
 addons/hr_recruitment/hr_recruitment_view.xml | 23 ++----
 .../report/hr_recruitment_report.py           | 15 +---
 .../report/hr_recruitment_report_view.xml     | 15 ++--
 .../test/recruitment_process.yml              | 62 +---------------
 7 files changed, 36 insertions(+), 175 deletions(-)

diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 79e09937705..2bec80858a5 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -22,7 +22,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','open'))]</field>
+        <field name="domain">[('stage_id.fold', '!=', True)]</field>
         <field name="view_id" ref="view_applicants_status_tree"/>
     </record>
 
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c25583cba77..4745672179b 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -19,23 +19,13 @@
 #
 ##############################################################################
 
-import time
 from openerp import tools
 
-from openerp.addons.base_status.base_stage import base_stage
 from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-AVAILABLE_STATES = [
-    ('draft', 'New'),
-    ('cancel', 'Refused'),
-    ('open', 'In Progress'),
-    ('pending', 'Pending'),
-    ('done', 'Hired')
-]
-
 AVAILABLE_PRIORITIES = [
     ('', ''),
     ('5', 'Not Good'),
@@ -62,13 +52,11 @@ class hr_recruitment_stage(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
         'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."),
         'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
         'requirements': fields.text('Requirements'),
     }
     _defaults = {
         'sequence': 1,
-        'state': 'draft',
         'fold': False,
     }
 
@@ -87,19 +75,19 @@ class hr_recruitment_degree(osv.osv):
         ('name_uniq', 'unique (name)', 'The name of the Degree of Recruitment must be unique!')
     ]
 
-class hr_applicant(base_stage, osv.Model):
+class hr_applicant(osv.Model):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
-        'state': {
-            'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
-        },
-        'stage_id': {
-            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'cancel'],
-        },
+        # 'state': {
+        #     'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
+        #     'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
+        # },
+        # 'stage_id': {
+        #     'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'cancel'],
+        # },
     }
 
     def _get_default_department_id(self, cr, uid, context=None):
@@ -109,7 +97,7 @@ class hr_applicant(base_stage, osv.Model):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         department_id = self._get_default_department_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], department_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
 
     def _resolve_department_id_from_context(self, cr, uid, context=None):
         """ Returns ID of department based on the value of 'default_department_id'
@@ -197,13 +185,6 @@ class hr_applicant(base_stage, osv.Model):
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',
                         domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=AVAILABLE_STATES, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
         'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'),
@@ -409,20 +390,6 @@ class hr_applicant(base_stage, osv.Model):
             self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context)
         return obj_id
 
-    def case_open(self, cr, uid, ids, context=None):
-        """
-            open Request of the applicant for the hr_recruitment
-        """
-        res = super(hr_applicant, self).case_open(cr, uid, ids, context)
-        date = self.read(cr, uid, ids, ['date_open'])[0]
-        if not date['date_open']:
-            self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
-        return res
-
-    def case_close(self, cr, uid, ids, context=None):
-        res = super(hr_applicant, self).case_close(cr, uid, ids, context)
-        return res
-
     def case_close_with_emp(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -454,26 +421,6 @@ class hr_applicant(base_stage, osv.Model):
         dict_act_window['view_mode'] = 'form,tree'
         return dict_act_window
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """Overrides cancel for crm_case for setting probability
-        """
-        res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_pending(self, cr, uid, ids, context=None):
-        """Marks case as pending"""
-        res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(hr_applicant, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
-        return res
-
     def set_priority(self, cr, uid, ids, priority, *args):
         """Set applicant priority
         """
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index f3f1b3e712d..854dea0548f 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -51,34 +51,29 @@
         <field name="name">Doctoral Degree</field>
         <field name="sequence">4</field>
     </record>
+
     <record model="hr.recruitment.stage" id="stage_job1">
         <field name="name">Initial Qualification</field>
-        <field name="state">draft</field>
         <field name="sequence">1</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="state">open</field>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
         <field name="name">Second Interview</field>
-        <field name="state">open</field>
         <field name="sequence">3</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
-        <field name="state">pending</field>
         <field name="sequence">4</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
-        <field name="state">done</field>
         <field name="sequence">5</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
-        <field name="state">cancel</field>
         <field name="sequence">6</field>
         <field name="fold" eval="True"/>
     </record>
@@ -467,24 +462,24 @@
         <field name="res_model">hr.job</field>
     </record>
     <!-- Applicant-related subtypes for messaging / Chatter -->
-    <record id="mt_stage_changed" model="mail.message.subtype">
+    <record id="mt_applicant_new" model="mail.message.subtype">
+        <field name="name">New Applicant</field>
+        <field name="res_model">hr.applicant</field>
+        <field name="default" eval="False"/>
+        <field name="description">Applicant created</field>
+    </record>
+    <record id="mt_applicant_stage_changed" model="mail.message.subtype">
         <field name="name">Stage Changed</field>
         <field name="res_model">hr.applicant</field>
         <field name="default" eval="False"/>
         <field name="description">Stage changed</field>
     </record>
-    <record id="mt_applicant_hired" model="mail.message.subtype">
+    <record id="mt_applicant_employee" model="mail.message.subtype">
         <field name="name">Applicant Hired</field>
         <field name="res_model">hr.applicant</field>
         <field name="default" eval="False"/>
         <field name="description">Applicant hired</field>
     </record>
-    <record id="mt_applicant_refused" model="mail.message.subtype">
-        <field name="name">Applicant Refused</field>
-        <field name="res_model">hr.applicant</field>
-        <field name="default" eval="False"/>
-        <field name="description">Applicant refused</field>
-    </record>
     <!-- Applicant Categories(Tag) -->
     <record id="tag_applicant_reserve" model="hr.applicant_category">
         <field name="name">Reserve</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9cbfd4560e7..e751fd5bb04 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -39,7 +39,7 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+            <tree string="Applicants" fonts="bold:message_unread==True">
                 <field name="message_unread" invisible="1"/>
                 <field name="create_date"/>
                 <field name="name" string="Subject"/>
@@ -58,7 +58,6 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -69,11 +68,9 @@
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
-                <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
+                <!-- <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
                         class="oe_highlight"
-                        attrs="{'invisible':['|', ('emp_id','!=',False), ('state','=','cancel')]}"/>
-                <button name="case_cancel" string="Refuse" type="object"
-                        states="draft,open,pending" class="oe_highlight"/>
+                        attrs="{'invisible':[('emp_id','!=',False)]}"/> -->
                 <field name="stage_id" widget="statusbar" clickable="True"/>
                 <field name="emp_id" invisible="1"/>
             </header>
@@ -115,7 +112,6 @@
                             <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                         </div>
                         <field name="priority"/>
-                        <field name="state" invisible="1"/>
                         <field name="source_id"/>
                         <field name="reference"/>
                     </group>
@@ -165,7 +161,7 @@
               <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
                 <field name="job_id"/>
                 <field name="salary_expected" operator="+"/>
-                <field name="state" group="True"/>
+                <field name="stage_id" group="True"/>
             </graph>
         </field>
     </record>
@@ -176,14 +172,11 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+                <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
+                <filter string="My" domain="[('user_id', '=', uid)]"/>
+                <separator/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
-                <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
-                <filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
-                <separator/>
-                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
-                <separator/>
                 <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <field name="job_id"/>
@@ -342,7 +335,6 @@
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
                 <field name="department_id"/>
-                <field name="state"/>
             </tree>
         </field>
     </record>
@@ -360,7 +352,6 @@
                         <field name="department_id"/>
                     </group>
                     <group>
-                        <field name="state"/>
                         <field name="sequence"/>
                         <field name="fold"/>
                     </group>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 8c365b10070..b733655e51e 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -18,20 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from .. import hr_recruitment
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
-AVAILABLE_STATES = [
-    ('draft','New'),
-    ('open','Open'),
-    ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending','Pending')
-]
-
 class hr_recruitment_report(osv.osv):
     _name = "hr.recruitment.report"
     _description = "Recruitments Statistics"
@@ -41,7 +34,7 @@ class hr_recruitment_report(osv.osv):
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'nbr': fields.integer('# of Applications', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
+        # TDE TODO: use MONTHS
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -79,7 +72,6 @@ class hr_recruitment_report(osv.osv):
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     s.state,
                      s.partner_id,
                      s.company_id,
                      s.user_id,
@@ -105,7 +97,6 @@ class hr_recruitment_report(osv.osv):
                      s.date_open,
                      s.create_date,
                      s.date_closed,
-                     s.state,
                      s.partner_id,
                      s.company_id,
                      s.user_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index b33b2eaa053..1845a97014e 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -14,7 +14,6 @@
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company" invisible="1"/>
-                <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
@@ -46,17 +45,15 @@
         <field name="model">hr.recruitment.report</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
-                <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
-                <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
-                <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
-                <separator/>
-                <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
                 <field name="job_id"/>
                 <field name="department_id"/>
-                <field name="user_id" string="Responsible"/>
+                <field name="user_id"/>
+                <filter string="New" domain="[('sequence', '=', 1)]"/>
+                <separator/>
+                <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
+                <filter string="My" domain="[('user_id', '=', uid)]"/>
+                <separator/>
                 <group expand="0" string="Extended Filters...">
-                    <!--field name="job_id"/-->
                     <field name="priority"/>
                     <field name="stage_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 335edc71892..0a6d5426e0d 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -17,33 +17,8 @@
     resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.pdf'),('res_model','=',self._name),('res_id','=',applicant.id)])
     assert applicant.name == "Application for the post of Jr.application Programmer.", "Applicant name does not match."
     assert applicant.stage_id.id == ref('hr_recruitment.stage_job1'), "Stage should be 'Initial qualification' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "draft", "Applicant state should be 'draft'."
+    assert applicant.stage_id.sequence == 1, "Applicant stage sequence should be 1."
     assert len(resume_ids), "Resume is not attached."
--
-  I refuse the applicant (hr_case_programmer)
--
-  !python {model: hr.applicant}: |
-    self.case_cancel(cr, uid, [ref("hr_case_programmer")])
--
-  I check the details of the refused applicant.
--
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job6'), "Stage should be 'Refused' and is %s." % (applicant.stage_id.name)
-    assert applicant.state == 'cancel', "Applicant is not in 'cancel' state."
--
-  I reset and re-open the previously refused applicant.
--
-  !python {model: hr.applicant}: |
-    self.case_reset(cr, uid, [ref("hr_case_programmer")])
-    self.case_open(cr, uid, [ref("hr_case_programmer")])
--
-  I check the details of the re-opened applicant.
--
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job2'), "Stage should be 'First interview' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "open", "Applicant state should be 'open'."
 -
   I assign the Job position to the applicant
 -
@@ -54,21 +29,6 @@
 -
   !python {model: hr.applicant}: |
      self.action_makeMeeting(cr, uid, [ref('hr_case_programmer')])
--
-  I check Initial Qualification of applicant.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
--
-  I schedule First Interview of applicant.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
--
-  On a successful First Interview of applicant, I schedule Second Interview.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
 -
   Applicant fillup the answer of the interview quetion.
 -
@@ -84,39 +44,19 @@
 -
   !python {model: hr.applicant}: |
     self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
--
-  On a successful Second Interview of applicant Contract is Proposed to applicant.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
-     self.stage_previous(cr, uid, [ref('hr_case_programmer')])
--
-  I Hired Applicant.
--
-  !python {model: hr.applicant}: |
-     self.case_close_with_emp(cr, uid, [ref('hr_case_programmer')])
--
-  I check that applicant is "Hired".
--
-  !assert {model: hr.applicant, id: hr_case_programmer, string: Applicant state is done}:
-    - state == 'done'
 -
   I do not give employment to the hired the applicant.
 -
   !python {model: hired.employee}: |
     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
     emp_id = self.create(cr, uid, {}, context=context)
-    self.case_close(cr, uid, [emp_id], context=context)
 -
   Now I give employment to hired applicant .
 -
   !python {model: hr.applicant}: |
      hired_emp_obj = self.pool.get('hired.employee')
-     self.case_reset(cr, uid, [ref("hr_case_programmer")])
-     self.case_open(cr, uid, [ref("hr_case_programmer")])
      context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
      emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
-     hired_emp_obj.case_close_with_emp(cr, uid, [emp_hr_id], context=context)
 -
   Now hired employee want to be a partner of company.
 -

From 944f9f7f0bbe7d645b8c7c3524eb8f9c124c821f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 12:05:35 +0200
Subject: [PATCH 102/197] [FIX] project_issue: fixed loop, added
 date_last_stage_update field

bzr revid: tde@openerp.com-20130627100535-romfzhxuvb5awls2
---
 addons/project_issue/project_issue.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 30f8845fa40..ab7d9824fc6 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -257,6 +257,7 @@ class project_issue(base_stage, osv.osv):
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
         'categ_ids': fields.many2many('project.category', string='Tags'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
@@ -299,6 +300,7 @@ class project_issue(base_stage, osv.osv):
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'kanban_state': 'normal',
+        'date_last_stage_update': fields.datetime.now(),
     }
 
     _group_by_full = {
@@ -382,7 +384,7 @@ class project_issue(base_stage, osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         # stage change: update date_last_stage_update
         if 'stage_id' in vals:
-            vals['date_action_last'] = fields.datetime.now()
+            vals['date_last_stage_update'] = fields.datetime.now()
         # user_id change: update date_start
         if vals.get('user_id'):
             vals['date_start'] = fields.datetime.now()
@@ -551,7 +553,7 @@ class project_issue(base_stage, osv.osv):
             context = {}
         res = super(project_issue, self).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, content_subtype=content_subtype, **kwargs)
         if thread_id:
-            self.write(cr, SUPERUSER_ID, thread_id, {'date_action_last': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
+            self.write(cr, SUPERUSER_ID, thread_id, {'date_action_last': fields.datetime.now()}, context=context)
         return res
 
 

From 2bd74561ad9979385c091a4c22b34a4b5a5cea31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 12:09:22 +0200
Subject: [PATCH 103/197] [FIX] hr_recruitment: removed get_default_email that
 was in most cases unnecessary

bzr revid: tde@openerp.com-20130627100922-upqi33ex4v601gng
---
 addons/hr_recruitment/hr_recruitment.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 4745672179b..81097820c5a 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -221,8 +221,7 @@ class hr_applicant(osv.Model):
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id':  lambda s, cr, uid, c: uid,
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),

From c8b6f2f370a1e084b2cf04b4a7b56931e3900def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 13:07:33 +0200
Subject: [PATCH 104/197] [REF] project_issue: removed reference to base_stage,
 removed some unnecessary defaults, removed now unnecessary tests.

bzr revid: tde@openerp.com-20130627110733-8zh0xooq71zz2g0j
---
 addons/project_issue/__openerp__.py         |  1 -
 addons/project_issue/project_issue.py       | 16 +++---
 addons/project_issue/test/cancel_issue.yml  | 60 ---------------------
 addons/project_issue/test/issue_process.yml | 42 +--------------
 4 files changed, 7 insertions(+), 112 deletions(-)
 delete mode 100644 addons/project_issue/test/cancel_issue.yml

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 2c5f311c044..d41144253dd 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -55,7 +55,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'test': [
         'test/subscribe_issue.yml',
         'test/issue_process.yml',
-        'test/cancel_issue.yml',
         'test/issue_demo.yml'
     ],
     'installable': True,
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ab7d9824fc6..7a7d0724161 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from openerp import SUPERUSER_ID
-from openerp.addons.base_status.base_stage import base_stage
 from openerp.addons.crm import crm
 from datetime import datetime
 from openerp.osv import fields, osv, orm
@@ -29,7 +28,7 @@ import time
 from openerp import tools
 from openerp.tools import html2plaintext
 
-class project_issue_version(osv.osv):
+class project_issue_version(osv.Model):
     _name = "project.issue.version"
     _order = "name desc"
     _columns = {
@@ -40,7 +39,7 @@ class project_issue_version(osv.osv):
         'active': 1,
     }
 
-class project_issue(base_stage, osv.osv):
+class project_issue(osv.Model):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
@@ -51,9 +50,9 @@ class project_issue(base_stage, osv.osv):
             'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
             'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
         },
-        'user_id': {
-            'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id,
-        },
+        # 'user_id': {
+        #     'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
+        # },
         'kanban_state': {
             'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
@@ -293,10 +292,7 @@ class project_issue(base_stage, osv.osv):
 
     _defaults = {
         'active': 1,
-        'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
-        'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'kanban_state': 'normal',
@@ -552,7 +548,7 @@ class project_issue(base_stage, osv.osv):
         if context is None:
             context = {}
         res = super(project_issue, self).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, content_subtype=content_subtype, **kwargs)
-        if thread_id:
+        if thread_id and subtype:
             self.write(cr, SUPERUSER_ID, thread_id, {'date_action_last': fields.datetime.now()}, context=context)
         return res
 
diff --git a/addons/project_issue/test/cancel_issue.yml b/addons/project_issue/test/cancel_issue.yml
deleted file mode 100644
index 76ffa212638..00000000000
--- a/addons/project_issue/test/cancel_issue.yml
+++ /dev/null
@@ -1,60 +0,0 @@
--
-  In order to test process of issue tracking in OpenERP, I cancel the unqualified Issue.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled' 
--
-  I re-open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the state of issue after open it. 
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in open state}:
-    - state == 'open' 
--
-  I put the issue in pending state.
--
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check the state of issue after put it in pending state.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
--
-  I cancel the issue is in pending state.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled'
--
-  I close Issue.
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I check state of Issue after close.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in done state}:
-    - state == 'done'
--
-  I cancel the issue is in done state.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled'
diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml
index afb68a9b6c2..280df50ebea 100644
--- a/addons/project_issue/test/issue_process.yml
+++ b/addons/project_issue/test/issue_process.yml
@@ -1,23 +1,3 @@
--
-  In order to test process of issue tracking in OpenERP, I Open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state of Issue after opened it.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'       
-- 
-  Now I put Issue in pending due to need more information.
-- 
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state after put in pending.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
 -
   I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
@@ -29,29 +9,9 @@
         new_id = self.create(cr, uid, {'email_from': 'support@mycompany.com','email_to': 'Robert_Adersen@yahoo.com', 'subject': 'Regarding error in account module we nees more details'})
         self.send_mail(cr, uid, [new_id], context=ctx)
     except Exception, e:
-        pass  
--
-  After getting sufficient details, I re-open Issue from pending state.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check state of Issue after re-opened.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'   
+        pass
 -
   I create Task for Issue.
 -
   !python {model: project.issue}: |
     self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I close Issue after resolving it
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I Check state of Issue after closed.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in done state}:
-    - state == 'done'

From d39855e1dc62b8a846c094212c03c5f055af0704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 14:08:40 +0200
Subject: [PATCH 105/197] [FIX] project: fixed various tests

bzr revid: tde@openerp.com-20130627120840-1k3xabner2q0b7hl
---
 addons/project/test/task_process.yml | 54 +++-------------------------
 1 file changed, 5 insertions(+), 49 deletions(-)

diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index 471642610a1..20113ed8bef 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -1,5 +1,10 @@
 -
   I open a delegation wizard.
+-
+  !python {model: project.task}: |
+    context.update({"active_id": ref("project_task_1")})
+-
+  ze
 -
   !record {model: project.task.delegate, id: delegate_id}:
     user_id: base.user_demo
@@ -16,52 +21,3 @@
   !python {model: project.task}: |
     task = self.browse(cr, uid, ref("project_task_1"), context=context)
     assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
-    assert task.state == "pending", "Task should be in Pending after delegated."
--
-  I re-open the task.
--
-  !python {model: project.task}: |
-    self.do_reopen(cr, uid, [ref("project_task_1")])
--
-  I check reopened task details.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
-    - state == "open"
--
-  I change the stage of task to next stage.
--
-  !python {model: project.task}: |
-    self.stage_next(cr, uid, [ref("project_task_1")])
--
-  !record {model: project.task.reevaluate, id: reevaluate_id}:
-    remaining_hours : 120
--
-  I reevaluate task with remaining hours.
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
--
-  I check remaining hours after reevaluated task.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
-    - remaining_hours == 120.0
--
-  I close the task.
--
-  !python {model: project.task}: |
-    self.action_close(cr, uid, [ref("project_task_1")])
--
-  I check state after closed.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
-    - state == "done"
--
-  I change the stage of task to previous stage.
--
-  !python {model: project.task}: |
-    self.stage_previous(cr, uid, [ref("project_task_1")])
--
-  I cancel Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_2")])

From 079dceda032e5271394924ee432e3b56f3a0846c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 14:53:06 +0200
Subject: [PATCH 106/197] [FIX] project_mrp: added close field on task.type;
 commented some tests to clean afterwards.

bzr revid: tde@openerp.com-20130627125306-mgai12779onkgyc2
---
 .../project_long_term/test/task_process.yml   |  2 +-
 addons/project_mrp/project_mrp.py             | 36 +++++++---
 addons/project_mrp/project_mrp_view.xml       | 10 +++
 addons/project_mrp/project_procurement.py     |  4 +-
 .../test/project_task_procurement.yml         | 72 +++++++++----------
 5 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
index a7065de315f..060abcf43f3 100644
--- a/addons/project_long_term/test/task_process.yml
+++ b/addons/project_long_term/test/task_process.yml
@@ -14,6 +14,6 @@
   !python {model: project.project}: |
     prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
-        if task.state in ('done','cancelled'):
+        if task.stage_id and task.stage_id.fold:
             continue
         assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index bb25b4aae24..97e468ce51a 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -22,6 +22,24 @@
 from openerp.osv import fields, osv
 from openerp import netsvc
 
+
+class ProjectTaskStageMrp(osv.Model):
+    """ Override project.task.type model to add a 'closed' boolean field allowing
+        to know that tasks in this stage are considered as closed. Indeed since
+        OpenERP 8.0 status is not present on tasks anymore, only stage_id. """
+    _name = 'project.task.type'
+    _inherit = 'project.task.type'
+
+    _columns = {
+        'closed': fields.boolean('Close',
+            help="Tasks in this stage are considered as closed."),
+    }
+
+    _defaults = {
+        'closed': False,
+    }
+
+
 class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"
@@ -30,21 +48,20 @@ class project_task(osv.osv):
         'sale_line_id': fields.related('procurement_id', 'sale_line_id', type='many2one', relation='sale.order.line', store=True, string='Sales Order Line'),
     }
 
-    def _validate_subflows(self, cr, uid, ids):
+    def _validate_subflows(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         for task in self.browse(cr, uid, ids):
             if task.procurement_id:
                 wf_service.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
 
-    def do_close(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)
-        self._validate_subflows(cr, uid, ids)
-        return res
+    def write(self, cr, uid, ids, values, context=None):
+        """ When closing tasks, validate subflows. """
+        if values.get('stage_id'):
+            stage = self.pool.get('project.task.type').browse(cr, uid, values.get('stage_id'), context=context)
+            if stage.closed:
+                self._validate_subflows(cr, uid, ids, context=context)
+        return super(project_task, self).write(cr, uid, ids, values, context=context)
 
-    def do_cancel(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
-        self._validate_subflows(cr, uid, ids)
-        return res
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -52,6 +69,7 @@ class product_product(osv.osv):
         'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
     }
 
+
 class sale_order(osv.osv):
     _inherit ='sale.order'
 
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index a4c9dbcc9aa..f724a3c76b6 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -21,6 +21,16 @@
                 </field>
             </field>
         </record>
+        <record id="task_type_edit_mrp_inherit" model="ir.ui.view">
+            <field name="name">project.task.type.mrp.inherit</field>
+            <field name="model">project.task.type</field>
+            <field name="inherit_id" ref="project.task_type_edit"/>
+            <field name="arch" type="xml">
+                <field name="case_default" position="after">
+                    <field name="closed"/>
+                </field>
+            </field>
+        </record>
         <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
             <field name="name">project.mrp.form.view.inherit</field>
             <field name="model">project.task</field>
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index f4b4a28db46..3587e2167a2 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -33,13 +33,13 @@ class procurement_order(osv.osv):
     def action_check_finished(self, cr, uid, ids):
         res = super(procurement_order, self).action_check_finished(cr, uid, ids)
         return res and self.check_task_done(cr, uid, ids)
-    
+
     def check_task_done(self, cr, uid, ids, context=None):
         """ Checks if task is done or not.
         @return: True or False.
         """
         for p in self.browse(cr, uid, ids, context=context):
-            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+            if (p.product_id.type == 'service') and (p.procure_method == 'make_to_order') and p.task_id and p.task_id.stage_id and p.task_id.stage_id.closed:
                 return False
         return True
 
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index 967461ca30a..50199d40a11 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -9,39 +9,39 @@
     self.run_scheduler(cr, uid)
 -
   Now I check that task details after run procurement
--
-  !python {model: procurement.order}: |
-    from datetime import datetime
-    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-    assert procurement_ids, "Procurement is not generated for Service Order Line."
-    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
-    assert procurement.state != 'done' , "Procurement should not be closed."
-    task = procurement.task_id
-    assert task, "Task is not generated."
-    # check whether task project either is the product's project, or corresponds to the analytic account of sale order
-    project = task.project_id
-    if procurement.product_id.project_id:
-        assert project == procurement.product_id.project_id, "Project does not correspond."
-    elif procurement.sale_line_id:
-        account = procurement.sale_line_id.order_id.project_id
-        assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
-    planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
-    assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
-    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
-    if procurement.product_id.product_manager:
-        assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
--
-  I close that task.
--
-  !python {model: project.task}: |
-    task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-    assert task_ids, "Task is not generated for Service Order Line."
-    self.do_close(cr, uid, task_ids, context=context)
--
-  I check procurement of Service Order Line after closed task.
--
-  !python {model: procurement.order}: |
-    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-    assert procurement_ids, "Procurement is not generated for Service Order Line."
-    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
-    assert procurement.state == 'done' , "Procurement should be closed."
+# -
+#   !python {model: procurement.order}: |
+#     from datetime import datetime
+#     procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+#     assert procurement_ids, "Procurement is not generated for Service Order Line."
+#     procurement = self.browse(cr, uid, procurement_ids[0], context=context)
+#     assert procurement.state != 'done' , "Procurement should not be closed."
+#     task = procurement.task_id
+#     assert task, "Task is not generated."
+#     # check whether task project either is the product's project, or corresponds to the analytic account of sale order
+#     project = task.project_id
+#     if procurement.product_id.project_id:
+#         assert project == procurement.product_id.project_id, "Project does not correspond."
+#     elif procurement.sale_line_id:
+#         account = procurement.sale_line_id.order_id.project_id
+#         assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
+#     planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
+#     assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
+#     assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
+#     if procurement.product_id.product_manager:
+#         assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
+# -
+#   I close that task.
+# -
+#   !python {model: project.task}: |
+#     task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+#     assert task_ids, "Task is not generated for Service Order Line."
+#     self.do_close(cr, uid, task_ids, context=context)
+# -
+#   I check procurement of Service Order Line after closed task.
+# -
+#   !python {model: procurement.order}: |
+#     procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+#     assert procurement_ids, "Procurement is not generated for Service Order Line."
+#     procurement = self.browse(cr, uid, procurement_ids[0], context=context)
+#     assert procurement.state == 'done' , "Procurement should be closed."
\ No newline at end of file

From e362775853dd65475d8e7aa55e8cfc040934baf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 15:09:50 +0200
Subject: [PATCH 107/197] [FIX] project_timesheet: removed reference to state
 field of task

bzr revid: tde@openerp.com-20130627130950-wguigeottgr2dck4
---
 .../test/worktask_entry_to_timesheetline_entry.yml               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 3efd133ffb6..a12aca07ec9 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -66,7 +66,6 @@
     planned_hours: 20.0
     project_id: project_project_timesheetmanagement0
     remaining_hours: 20.0
-    state: draft
     user_id: res_users_hrmanager0
 -
   Open the task

From f35f2d01dccc012f7eb127aa07c2d3170c77168f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 15:32:21 +0200
Subject: [PATCH 108/197] [FIX] project_timesheet: still tracking references to
 stage management.

bzr revid: tde@openerp.com-20130627133221-o2or8el0dlxf89cv
---
 .../test/worktask_entry_to_timesheetline_entry.yml        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index a12aca07ec9..7d7566bdd0c 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -67,14 +67,6 @@
     project_id: project_project_timesheetmanagement0
     remaining_hours: 20.0
     user_id: res_users_hrmanager0
--
-  Open the task
--
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_getalltimesheetrecords0")], {"lang":
-      "en_US", "active_ids": [ref("project_project_timesheetmanagement0")], "tz":
-      False, "active_model": "project.project", "department_id": False, "project_id":
-      False, "active_id": ref("project_project_timesheetmanagement0"), })
 -
   Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager
 -

From 589826e1874d5406737f69626761c9420306cce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 27 Jun 2013 17:45:05 +0200
Subject: [PATCH 109/197] [IMP] hr_recruitment: button 'create employee' now a
 link next to the emp_id field.

bzr revid: tde@openerp.com-20130627154505-oe8wb62brm927knr
---
 addons/hr_recruitment/hr_recruitment.py       | 10 +++++-----
 addons/hr_recruitment/hr_recruitment_view.xml | 11 +++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e97108ad241..354221977e1 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -212,7 +212,8 @@ class hr_applicant(osv.Model):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
-        'emp_id': fields.many2one('hr.employee', 'employee'),
+        'emp_id': fields.many2one('hr.employee', string='Employee',
+            help='Employee linked to the applicant.'),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
 
@@ -396,17 +397,16 @@ class hr_applicant(osv.Model):
         for applicant in self.browse(cr, uid, ids, context=context):
             address_id = contact_name = False
             if applicant.partner_id:
-                address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact']
-                contact_name = self.pool.get('res.partner').name_get(cr,uid,[applicant.partner_id.id])[0][1]
+                address_id = self.pool.get('res.partner').address_get(cr, uid, [applicant.partner_id.id], ['contact'])['contact']
+                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})
-                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or contact_name,
+                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,
                                                      'department_id': applicant.department_id.id
                                                      })
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
-                self.case_close(cr, uid, [applicant.id], context)
             else:
                 raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index e751fd5bb04..faf43ebdc15 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -68,11 +68,7 @@
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
-                <!-- <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
-                        class="oe_highlight"
-                        attrs="{'invisible':[('emp_id','!=',False)]}"/> -->
                 <field name="stage_id" widget="statusbar" clickable="True"/>
-                <field name="emp_id" invisible="1"/>
             </header>
             <sheet>
                 <div class="oe_right oe_button_box">
@@ -138,6 +134,13 @@
                             <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}"> + </span>
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
+                        <label for="emp_id"/>
+                        <div>
+                            <field name="emp_id" readonly="1"/>
+                            <button string="Create Employee" name="case_close_with_emp" type="object"
+                                    class="oe_link oe_inline"
+                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
+                        </div>
                     </group>
                 </group>
                 <group>

From aa28839fb1818db22ce58606cc2a831ee39546ef Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 27 Jun 2013 19:11:37 +0200
Subject: [PATCH 110/197] [ADD]google_spreadsheet

bzr revid: dle@openerp.com-20130627171137-5r1gyciz92c8abbr
---
 addons/google_spreadsheet/__init__.py         |  1 +
 addons/google_spreadsheet/__openerp__.py      | 43 +++++++++++++++
 .../google_spreadsheet/google_spreadsheet.py  | 34 ++++++++++++
 .../google_spreadsheet_data.xml               | 11 ++++
 .../static/src/js/search.js                   | 54 +++++++++++++++++++
 .../static/src/xml/addtospreadsheet.xml       |  5 ++
 6 files changed, 148 insertions(+)
 create mode 100644 addons/google_spreadsheet/__init__.py
 create mode 100644 addons/google_spreadsheet/__openerp__.py
 create mode 100644 addons/google_spreadsheet/google_spreadsheet.py
 create mode 100644 addons/google_spreadsheet/google_spreadsheet_data.xml
 create mode 100644 addons/google_spreadsheet/static/src/js/search.js
 create mode 100644 addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml

diff --git a/addons/google_spreadsheet/__init__.py b/addons/google_spreadsheet/__init__.py
new file mode 100644
index 00000000000..f57aaed7749
--- /dev/null
+++ b/addons/google_spreadsheet/__init__.py
@@ -0,0 +1 @@
+import google_spreadsheet
\ No newline at end of file
diff --git a/addons/google_spreadsheet/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
new file mode 100644
index 00000000000..10a9a28de76
--- /dev/null
+++ b/addons/google_spreadsheet/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Google Spreadsheet',
+    'version': '1.0',
+    'category': 'Tools',
+    'description': """
+The module adds the possibility to display data from OpenERP in Google Spreadsheets in real time.
+========================================
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['board', 'google_drive'],
+    'js': [
+        'static/src/js/search.js',
+    ],
+    'qweb': ['static/src/xml/*.xml'],
+    'data': ['google_spreadsheet_data.xml'],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
new file mode 100644
index 00000000000..08a8fa8d2cd
--- /dev/null
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -0,0 +1,34 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2012 OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv
+
+
+class config(osv.osv):
+    _inherit = 'google.drive.config'
+
+    def set_spreadsheet(self, cr, uid, model, domain, groupbys, view_id, context=None):
+        try:
+            config_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'google_spreadsheet', 'google_spreadsheet_template')[1]
+        except ValueError:
+            raise
+        config = self.browse(cr, uid, config_id, context=context)
+        res = self.copy_doc(cr, uid, 1, config.google_drive_resource_id, 'Spreadsheet %s' % model, model, context=context)
+        return res
diff --git a/addons/google_spreadsheet/google_spreadsheet_data.xml b/addons/google_spreadsheet/google_spreadsheet_data.xml
new file mode 100644
index 00000000000..04c2122fabb
--- /dev/null
+++ b/addons/google_spreadsheet/google_spreadsheet_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      <record id="google_spreadsheet_template" model="google.drive.config">
+            <field name="name">Base Spreadsheet Template</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0ApGVjjwUC-ygdDZ0TG5EQnRlLVFQNlFGdFN5b1ZrY1E</field>
+            <field name="name_template">Reporting %(name)s</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_spreadsheet/static/src/js/search.js b/addons/google_spreadsheet/static/src/js/search.js
new file mode 100644
index 00000000000..beac52c4d6f
--- /dev/null
+++ b/addons/google_spreadsheet/static/src/js/search.js
@@ -0,0 +1,54 @@
+openerp.google_spreadsheet = function(instance) {
+    var _t = instance.web._t;
+    instance.web.FormView.include({
+    	on_processed_onchange: function(result, processed) {
+    		var self = this;
+    		
+    			var fields = self.fields;
+		        _(result.selection).each(function (selection, fieldname) {
+		            var field = fields[fieldname];
+		            if (!field) { return; }
+		            field.field.selection = selection;
+		            field.values = selection;
+		            field.renderElement(); 
+		        });
+    		return this._super(result, processed);
+    	},
+    });
+    instance.board.AddToGoogleSpreadsheet = instance.web.search.Input.extend({
+	    template: 'SearchView.addtogooglespreadsheet',
+	    _in_drawer: true,
+	    start: function () {
+	        var self = this;
+	        this.$el.on('click', 'h4', function(){
+    		 	var view = self.view;
+				var data = view.build_search_data();
+				var model = view.model;
+				var list_view = self.view.getParent().views['list'];
+				var view_id = list_view ? list_view.view_id : false; 
+		        var context = new instance.web.CompoundContext(view.dataset.get_context() || []);
+		        var domain = new instance.web.CompoundDomain(view.dataset.get_domain() || []);
+		        _.each(data.contexts, context.add, context);
+		        _.each(data.domains, domain.add, domain);
+		        domain = JSON.stringify(domain.eval());
+		        var groupbys = instance.web.pyeval.eval('groupbys', data.groupbys).join(" ");
+		        var view_id = view_id;
+                var ds = new instance.web.DataSet(self, 'google.drive.config');
+                ds.call('set_spreadsheet', [model, domain, groupbys, view_id]).done(function (url) {
+        			if (url){
+            			window.open(url, '_blank');
+        			}
+				});
+	        });
+	    },
+	});
+	instance.web.SearchView.include({
+	    add_common_inputs: function() {
+	        this._super();
+	        var vm = this.getParent().getParent();
+	        if (vm.inner_action && vm.inner_action.views) {
+	            (new instance.board.AddToGoogleSpreadsheet(this));
+	        }
+	    }
+	});
+};
\ No newline at end of file
diff --git a/addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml b/addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml
new file mode 100644
index 00000000000..faf984141a6
--- /dev/null
+++ b/addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml
@@ -0,0 +1,5 @@
+<template>
+<div t-name="SearchView.addtogooglespreadsheet" class="oe_searchview_dashboard">
+    <h4>Add to Google Spreadsheet</h4>
+</div>
+</template>
\ No newline at end of file

From 39151ca2af306adb202394c54fffba26d2e53d40 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 28 Jun 2013 19:07:12 +0530
Subject: [PATCH 111/197] [IMP] Improved code for the followers which are
 visually duplicated when you click on a follower's name and get back to the
 sales order form.

bzr revid: psa@tinyerp.com-20130628133712-tcfoaisr3o9wdv7x
---
 addons/mail/static/src/js/mail_followers.js | 27 ++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index b7862564732..260ff6092ea 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -36,6 +36,7 @@ openerp_mail_followers = function(session, mail) {
             this.followers = [];
             
             this.view_is_editable = this.__parentedParent.is_action_enabled('edit');
+            this.check_access = false;
         },
 
         start: function() {
@@ -45,6 +46,7 @@ openerp_mail_followers = function(session, mail) {
             this.reinit();
             this.bind_events();
             this._super();
+            this.check_group_tech_feature();
         },
 
         on_check_visibility_mode: function () {
@@ -188,33 +190,36 @@ openerp_mail_followers = function(session, mail) {
             this.$('.oe_follower_title').html(this._format_followers(this.value.length));
         },
 
+        check_group_tech_feature: function(){
+            var self = this;
+            self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
+                self.check_access = result;
+            });
+        },
+
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
             this.followers = records || this.followers;
             this.message_is_follower = this.set_is_follower(this.followers);
-            this.check_access = false;
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
-                    self.check_access = result;
-                    record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                    $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
-                    // On mouseenter it will show the edit_subtype penil
-                    if (self.check_access == true) {
-                        self.$el.on('mouseenter', 'div.oe_follower_list', function() {
-                            $("img.oe_edit_subtype").removeClass("hidden");
-                            $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                // On mouseenter it will show the edit_subtype penil
+                if (self.check_access == true) {
+                    self.$el.on('mouseenter', 'div.oe_follower_list', function() {
+                        $("img.oe_edit_subtype").removeClass("hidden");
+                        $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
                         }).on('mouseleave', 'div.oe_follower_list', function(){
                             $("img.oe_edit_subtype").addClass("hidden");
                             $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
                         });
                     }
-              })
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {

From 67446c03c8d315b7c656a65e0e6b7422a1cfc1f5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 8 Jul 2013 05:25:57 +0000
Subject: [PATCH 112/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130706060601-g53uexsat5353d0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704051222-8312iolzes0iz0mg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130707052839-7kjpq3lenydfn435
bzr revid: launchpad_translations_on_behalf_of_openerp-20130708052557-b3sap5jqvv13mzuz
---
 addons/portal_anonymous/i18n/zh_CN.po  | 25 +++++++++++++++++++++++++
 addons/project/i18n/zh_CN.po           | 14 +++++++-------
 addons/project_long_term/i18n/zh_CN.po | 10 +++++-----
 addons/web/i18n/ar.po                  |  4 ++--
 addons/web/i18n/bg.po                  |  4 ++--
 addons/web/i18n/bn.po                  |  4 ++--
 addons/web/i18n/bs.po                  |  4 ++--
 addons/web/i18n/ca.po                  |  4 ++--
 addons/web/i18n/cs.po                  |  4 ++--
 addons/web/i18n/da.po                  |  4 ++--
 addons/web/i18n/de.po                  |  4 ++--
 addons/web/i18n/en_AU.po               |  4 ++--
 addons/web/i18n/en_GB.po               |  4 ++--
 addons/web/i18n/es.po                  |  4 ++--
 addons/web/i18n/es_CL.po               |  4 ++--
 addons/web/i18n/es_CR.po               |  4 ++--
 addons/web/i18n/es_DO.po               |  4 ++--
 addons/web/i18n/es_EC.po               |  4 ++--
 addons/web/i18n/es_MX.po               |  4 ++--
 addons/web/i18n/et.po                  |  4 ++--
 addons/web/i18n/eu.po                  |  4 ++--
 addons/web/i18n/fa.po                  |  4 ++--
 addons/web/i18n/fi.po                  |  4 ++--
 addons/web/i18n/fr.po                  |  4 ++--
 addons/web/i18n/fr_CA.po               |  4 ++--
 addons/web/i18n/gl.po                  |  8 ++++----
 addons/web/i18n/gu.po                  |  4 ++--
 addons/web/i18n/hi.po                  |  4 ++--
 addons/web/i18n/hr.po                  |  4 ++--
 addons/web/i18n/hu.po                  |  4 ++--
 addons/web/i18n/id.po                  |  4 ++--
 addons/web/i18n/it.po                  |  4 ++--
 addons/web/i18n/ja.po                  |  4 ++--
 addons/web/i18n/ka.po                  |  4 ++--
 addons/web/i18n/ko.po                  |  4 ++--
 addons/web/i18n/lo.po                  |  4 ++--
 addons/web/i18n/lt.po                  |  4 ++--
 addons/web/i18n/lv.po                  |  4 ++--
 addons/web/i18n/mk.po                  |  4 ++--
 addons/web/i18n/mn.po                  |  4 ++--
 addons/web/i18n/nb.po                  |  4 ++--
 addons/web/i18n/nl.po                  |  4 ++--
 addons/web/i18n/nl_BE.po               |  4 ++--
 addons/web/i18n/pl.po                  |  4 ++--
 addons/web/i18n/pt.po                  |  4 ++--
 addons/web/i18n/pt_BR.po               |  4 ++--
 addons/web/i18n/ro.po                  |  4 ++--
 addons/web/i18n/ru.po                  |  4 ++--
 addons/web/i18n/sk.po                  |  4 ++--
 addons/web/i18n/sl.po                  |  4 ++--
 addons/web/i18n/sq.po                  |  4 ++--
 addons/web/i18n/sr@latin.po            |  4 ++--
 addons/web/i18n/sv.po                  |  4 ++--
 addons/web/i18n/th.po                  |  4 ++--
 addons/web/i18n/tr.po                  |  4 ++--
 addons/web/i18n/uk.po                  |  4 ++--
 addons/web/i18n/zh_CN.po               |  6 +++---
 addons/web/i18n/zh_TW.po               |  4 ++--
 addons/web_calendar/i18n/ar.po         |  4 ++--
 addons/web_calendar/i18n/bg.po         |  4 ++--
 addons/web_calendar/i18n/bn.po         |  4 ++--
 addons/web_calendar/i18n/bs.po         |  4 ++--
 addons/web_calendar/i18n/ca.po         |  4 ++--
 addons/web_calendar/i18n/cs.po         |  4 ++--
 addons/web_calendar/i18n/da.po         |  4 ++--
 addons/web_calendar/i18n/de.po         |  4 ++--
 addons/web_calendar/i18n/en_AU.po      |  4 ++--
 addons/web_calendar/i18n/en_GB.po      |  4 ++--
 addons/web_calendar/i18n/es.po         |  4 ++--
 addons/web_calendar/i18n/es_CL.po      |  4 ++--
 addons/web_calendar/i18n/es_CR.po      |  4 ++--
 addons/web_calendar/i18n/es_DO.po      |  4 ++--
 addons/web_calendar/i18n/es_EC.po      |  4 ++--
 addons/web_calendar/i18n/es_MX.po      |  4 ++--
 addons/web_calendar/i18n/et.po         |  4 ++--
 addons/web_calendar/i18n/eu.po         |  4 ++--
 addons/web_calendar/i18n/fa.po         |  4 ++--
 addons/web_calendar/i18n/fi.po         |  4 ++--
 addons/web_calendar/i18n/fr.po         |  4 ++--
 addons/web_calendar/i18n/fr_CA.po      |  4 ++--
 addons/web_calendar/i18n/gl.po         |  4 ++--
 addons/web_calendar/i18n/gu.po         |  4 ++--
 addons/web_calendar/i18n/hr.po         |  4 ++--
 addons/web_calendar/i18n/hu.po         |  4 ++--
 addons/web_calendar/i18n/id.po         |  4 ++--
 addons/web_calendar/i18n/it.po         |  4 ++--
 addons/web_calendar/i18n/ja.po         |  4 ++--
 addons/web_calendar/i18n/ka.po         |  4 ++--
 addons/web_calendar/i18n/ko.po         |  4 ++--
 addons/web_calendar/i18n/lt.po         |  4 ++--
 addons/web_calendar/i18n/mk.po         |  4 ++--
 addons/web_calendar/i18n/mn.po         |  4 ++--
 addons/web_calendar/i18n/nb.po         |  4 ++--
 addons/web_calendar/i18n/nl.po         |  4 ++--
 addons/web_calendar/i18n/nl_BE.po      |  4 ++--
 addons/web_calendar/i18n/pl.po         |  4 ++--
 addons/web_calendar/i18n/pt.po         |  4 ++--
 addons/web_calendar/i18n/pt_BR.po      |  4 ++--
 addons/web_calendar/i18n/ro.po         |  4 ++--
 addons/web_calendar/i18n/ru.po         |  4 ++--
 addons/web_calendar/i18n/sk.po         |  4 ++--
 addons/web_calendar/i18n/sl.po         |  4 ++--
 addons/web_calendar/i18n/sq.po         |  4 ++--
 addons/web_calendar/i18n/sr@latin.po   |  4 ++--
 addons/web_calendar/i18n/sv.po         |  4 ++--
 addons/web_calendar/i18n/th.po         |  4 ++--
 addons/web_calendar/i18n/tr.po         |  4 ++--
 addons/web_calendar/i18n/uk.po         |  4 ++--
 addons/web_calendar/i18n/zh_CN.po      |  8 ++++----
 addons/web_diagram/i18n/ar.po          |  4 ++--
 addons/web_diagram/i18n/bg.po          |  4 ++--
 addons/web_diagram/i18n/bn.po          |  4 ++--
 addons/web_diagram/i18n/bs.po          |  4 ++--
 addons/web_diagram/i18n/ca.po          |  4 ++--
 addons/web_diagram/i18n/cs.po          |  4 ++--
 addons/web_diagram/i18n/da.po          |  4 ++--
 addons/web_diagram/i18n/de.po          |  4 ++--
 addons/web_diagram/i18n/en_AU.po       |  4 ++--
 addons/web_diagram/i18n/en_GB.po       |  4 ++--
 addons/web_diagram/i18n/es.po          |  4 ++--
 addons/web_diagram/i18n/es_CL.po       |  4 ++--
 addons/web_diagram/i18n/es_CR.po       |  4 ++--
 addons/web_diagram/i18n/es_DO.po       |  4 ++--
 addons/web_diagram/i18n/es_EC.po       |  4 ++--
 addons/web_diagram/i18n/es_MX.po       |  4 ++--
 addons/web_diagram/i18n/et.po          |  4 ++--
 addons/web_diagram/i18n/fa.po          |  4 ++--
 addons/web_diagram/i18n/fi.po          |  4 ++--
 addons/web_diagram/i18n/fr.po          |  4 ++--
 addons/web_diagram/i18n/gl.po          |  4 ++--
 addons/web_diagram/i18n/gu.po          |  4 ++--
 addons/web_diagram/i18n/hr.po          |  4 ++--
 addons/web_diagram/i18n/hu.po          |  4 ++--
 addons/web_diagram/i18n/id.po          |  4 ++--
 addons/web_diagram/i18n/it.po          |  4 ++--
 addons/web_diagram/i18n/ja.po          |  4 ++--
 addons/web_diagram/i18n/ka.po          |  4 ++--
 addons/web_diagram/i18n/ko.po          |  4 ++--
 addons/web_diagram/i18n/lt.po          |  4 ++--
 addons/web_diagram/i18n/mk.po          |  4 ++--
 addons/web_diagram/i18n/mn.po          |  4 ++--
 addons/web_diagram/i18n/nb.po          |  4 ++--
 addons/web_diagram/i18n/nl.po          |  4 ++--
 addons/web_diagram/i18n/nl_BE.po       |  4 ++--
 addons/web_diagram/i18n/pl.po          |  4 ++--
 addons/web_diagram/i18n/pt.po          |  4 ++--
 addons/web_diagram/i18n/pt_BR.po       |  4 ++--
 addons/web_diagram/i18n/ro.po          |  4 ++--
 addons/web_diagram/i18n/ru.po          |  4 ++--
 addons/web_diagram/i18n/sl.po          |  4 ++--
 addons/web_diagram/i18n/sq.po          |  4 ++--
 addons/web_diagram/i18n/sr@latin.po    |  4 ++--
 addons/web_diagram/i18n/sv.po          |  4 ++--
 addons/web_diagram/i18n/th.po          |  4 ++--
 addons/web_diagram/i18n/tr.po          |  4 ++--
 addons/web_diagram/i18n/zh_CN.po       |  4 ++--
 addons/web_diagram/i18n/zh_TW.po       |  4 ++--
 addons/web_gantt/i18n/ar.po            |  4 ++--
 addons/web_gantt/i18n/bg.po            |  4 ++--
 addons/web_gantt/i18n/bn.po            |  4 ++--
 addons/web_gantt/i18n/bs.po            |  4 ++--
 addons/web_gantt/i18n/ca.po            |  4 ++--
 addons/web_gantt/i18n/cs.po            |  4 ++--
 addons/web_gantt/i18n/da.po            |  4 ++--
 addons/web_gantt/i18n/de.po            |  4 ++--
 addons/web_gantt/i18n/en_AU.po         |  4 ++--
 addons/web_gantt/i18n/en_GB.po         |  4 ++--
 addons/web_gantt/i18n/es.po            |  4 ++--
 addons/web_gantt/i18n/es_CL.po         |  4 ++--
 addons/web_gantt/i18n/es_CR.po         |  4 ++--
 addons/web_gantt/i18n/es_DO.po         |  4 ++--
 addons/web_gantt/i18n/es_EC.po         |  4 ++--
 addons/web_gantt/i18n/es_MX.po         |  4 ++--
 addons/web_gantt/i18n/et.po            |  4 ++--
 addons/web_gantt/i18n/fa.po            |  4 ++--
 addons/web_gantt/i18n/fi.po            |  4 ++--
 addons/web_gantt/i18n/fr.po            |  4 ++--
 addons/web_gantt/i18n/gl.po            |  4 ++--
 addons/web_gantt/i18n/gu.po            |  4 ++--
 addons/web_gantt/i18n/hr.po            |  4 ++--
 addons/web_gantt/i18n/hu.po            |  4 ++--
 addons/web_gantt/i18n/it.po            |  4 ++--
 addons/web_gantt/i18n/ja.po            |  4 ++--
 addons/web_gantt/i18n/ka.po            |  4 ++--
 addons/web_gantt/i18n/ko.po            |  4 ++--
 addons/web_gantt/i18n/lo.po            |  4 ++--
 addons/web_gantt/i18n/lt.po            |  4 ++--
 addons/web_gantt/i18n/mk.po            |  4 ++--
 addons/web_gantt/i18n/mn.po            |  4 ++--
 addons/web_gantt/i18n/nb.po            |  4 ++--
 addons/web_gantt/i18n/nl.po            |  4 ++--
 addons/web_gantt/i18n/nl_BE.po         |  4 ++--
 addons/web_gantt/i18n/pl.po            |  4 ++--
 addons/web_gantt/i18n/pt.po            |  4 ++--
 addons/web_gantt/i18n/pt_BR.po         |  4 ++--
 addons/web_gantt/i18n/ro.po            |  4 ++--
 addons/web_gantt/i18n/ru.po            |  4 ++--
 addons/web_gantt/i18n/sl.po            |  4 ++--
 addons/web_gantt/i18n/sq.po            |  4 ++--
 addons/web_gantt/i18n/sr@latin.po      |  4 ++--
 addons/web_gantt/i18n/sv.po            |  4 ++--
 addons/web_gantt/i18n/th.po            |  4 ++--
 addons/web_gantt/i18n/tr.po            |  4 ++--
 addons/web_gantt/i18n/zh_CN.po         |  4 ++--
 addons/web_graph/i18n/ar.po            |  4 ++--
 addons/web_graph/i18n/bg.po            |  4 ++--
 addons/web_graph/i18n/bn.po            |  4 ++--
 addons/web_graph/i18n/bs.po            |  4 ++--
 addons/web_graph/i18n/ca.po            |  4 ++--
 addons/web_graph/i18n/cs.po            |  4 ++--
 addons/web_graph/i18n/da.po            |  4 ++--
 addons/web_graph/i18n/de.po            |  4 ++--
 addons/web_graph/i18n/en_AU.po         |  4 ++--
 addons/web_graph/i18n/en_GB.po         |  4 ++--
 addons/web_graph/i18n/es.po            |  4 ++--
 addons/web_graph/i18n/es_CL.po         |  4 ++--
 addons/web_graph/i18n/es_CR.po         |  4 ++--
 addons/web_graph/i18n/es_DO.po         |  4 ++--
 addons/web_graph/i18n/es_EC.po         |  4 ++--
 addons/web_graph/i18n/es_MX.po         |  4 ++--
 addons/web_graph/i18n/et.po            |  4 ++--
 addons/web_graph/i18n/fa.po            |  4 ++--
 addons/web_graph/i18n/fi.po            |  4 ++--
 addons/web_graph/i18n/fr.po            |  4 ++--
 addons/web_graph/i18n/fr_CA.po         |  4 ++--
 addons/web_graph/i18n/gl.po            |  4 ++--
 addons/web_graph/i18n/gu.po            |  4 ++--
 addons/web_graph/i18n/hr.po            |  4 ++--
 addons/web_graph/i18n/hu.po            |  4 ++--
 addons/web_graph/i18n/it.po            |  4 ++--
 addons/web_graph/i18n/ja.po            |  4 ++--
 addons/web_graph/i18n/ka.po            |  4 ++--
 addons/web_graph/i18n/ko.po            |  4 ++--
 addons/web_graph/i18n/lt.po            |  4 ++--
 addons/web_graph/i18n/mk.po            |  4 ++--
 addons/web_graph/i18n/mn.po            |  4 ++--
 addons/web_graph/i18n/nb.po            |  4 ++--
 addons/web_graph/i18n/nl.po            |  4 ++--
 addons/web_graph/i18n/nl_BE.po         |  4 ++--
 addons/web_graph/i18n/pl.po            |  4 ++--
 addons/web_graph/i18n/pt.po            |  4 ++--
 addons/web_graph/i18n/pt_BR.po         |  4 ++--
 addons/web_graph/i18n/ro.po            |  4 ++--
 addons/web_graph/i18n/ru.po            |  4 ++--
 addons/web_graph/i18n/sl.po            |  4 ++--
 addons/web_graph/i18n/sq.po            |  4 ++--
 addons/web_graph/i18n/sr@latin.po      |  4 ++--
 addons/web_graph/i18n/sv.po            |  4 ++--
 addons/web_graph/i18n/th.po            |  4 ++--
 addons/web_graph/i18n/tr.po            |  4 ++--
 addons/web_graph/i18n/zh_CN.po         |  4 ++--
 addons/web_kanban/i18n/ar.po           |  4 ++--
 addons/web_kanban/i18n/bg.po           |  4 ++--
 addons/web_kanban/i18n/bn.po           |  4 ++--
 addons/web_kanban/i18n/bs.po           |  4 ++--
 addons/web_kanban/i18n/ca.po           |  4 ++--
 addons/web_kanban/i18n/cs.po           |  4 ++--
 addons/web_kanban/i18n/da.po           |  4 ++--
 addons/web_kanban/i18n/de.po           |  4 ++--
 addons/web_kanban/i18n/en_AU.po        |  4 ++--
 addons/web_kanban/i18n/en_GB.po        |  4 ++--
 addons/web_kanban/i18n/es.po           |  4 ++--
 addons/web_kanban/i18n/es_CL.po        |  4 ++--
 addons/web_kanban/i18n/es_CR.po        |  4 ++--
 addons/web_kanban/i18n/es_DO.po        |  4 ++--
 addons/web_kanban/i18n/es_EC.po        |  4 ++--
 addons/web_kanban/i18n/es_MX.po        |  4 ++--
 addons/web_kanban/i18n/et.po           |  4 ++--
 addons/web_kanban/i18n/fa.po           |  4 ++--
 addons/web_kanban/i18n/fi.po           |  4 ++--
 addons/web_kanban/i18n/fr.po           |  4 ++--
 addons/web_kanban/i18n/fr_CA.po        |  4 ++--
 addons/web_kanban/i18n/gl.po           |  4 ++--
 addons/web_kanban/i18n/gu.po           |  4 ++--
 addons/web_kanban/i18n/hr.po           |  4 ++--
 addons/web_kanban/i18n/hu.po           |  4 ++--
 addons/web_kanban/i18n/it.po           |  4 ++--
 addons/web_kanban/i18n/ja.po           |  4 ++--
 addons/web_kanban/i18n/ka.po           |  4 ++--
 addons/web_kanban/i18n/ko.po           |  4 ++--
 addons/web_kanban/i18n/lt.po           |  4 ++--
 addons/web_kanban/i18n/mk.po           |  4 ++--
 addons/web_kanban/i18n/mn.po           |  4 ++--
 addons/web_kanban/i18n/nb.po           |  4 ++--
 addons/web_kanban/i18n/nl.po           |  4 ++--
 addons/web_kanban/i18n/nl_BE.po        |  4 ++--
 addons/web_kanban/i18n/pl.po           |  4 ++--
 addons/web_kanban/i18n/pt.po           |  4 ++--
 addons/web_kanban/i18n/pt_BR.po        |  4 ++--
 addons/web_kanban/i18n/ro.po           |  4 ++--
 addons/web_kanban/i18n/ru.po           |  4 ++--
 addons/web_kanban/i18n/sl.po           |  4 ++--
 addons/web_kanban/i18n/sr@latin.po     |  4 ++--
 addons/web_kanban/i18n/sv.po           |  4 ++--
 addons/web_kanban/i18n/th.po           |  4 ++--
 addons/web_kanban/i18n/tr.po           |  4 ++--
 addons/web_kanban/i18n/zh_CN.po        |  4 ++--
 addons/web_kanban/i18n/zh_TW.po        |  4 ++--
 addons/web_view_editor/i18n/ar.po      |  4 ++--
 addons/web_view_editor/i18n/cs.po      |  4 ++--
 addons/web_view_editor/i18n/de.po      |  4 ++--
 addons/web_view_editor/i18n/en_AU.po   |  4 ++--
 addons/web_view_editor/i18n/es.po      |  4 ++--
 addons/web_view_editor/i18n/es_DO.po   |  4 ++--
 addons/web_view_editor/i18n/es_EC.po   |  4 ++--
 addons/web_view_editor/i18n/es_MX.po   |  4 ++--
 addons/web_view_editor/i18n/et.po      |  4 ++--
 addons/web_view_editor/i18n/fa.po      |  4 ++--
 addons/web_view_editor/i18n/fi.po      |  4 ++--
 addons/web_view_editor/i18n/fr.po      |  4 ++--
 addons/web_view_editor/i18n/hr.po      |  4 ++--
 addons/web_view_editor/i18n/hu.po      |  4 ++--
 addons/web_view_editor/i18n/it.po      |  4 ++--
 addons/web_view_editor/i18n/ko.po      |  4 ++--
 addons/web_view_editor/i18n/lt.po      |  4 ++--
 addons/web_view_editor/i18n/lv.po      |  4 ++--
 addons/web_view_editor/i18n/mk.po      |  4 ++--
 addons/web_view_editor/i18n/mn.po      |  4 ++--
 addons/web_view_editor/i18n/nb.po      |  4 ++--
 addons/web_view_editor/i18n/nl.po      |  4 ++--
 addons/web_view_editor/i18n/nl_BE.po   |  4 ++--
 addons/web_view_editor/i18n/pl.po      |  4 ++--
 addons/web_view_editor/i18n/pt.po      |  4 ++--
 addons/web_view_editor/i18n/pt_BR.po   |  4 ++--
 addons/web_view_editor/i18n/ro.po      |  4 ++--
 addons/web_view_editor/i18n/ru.po      |  4 ++--
 addons/web_view_editor/i18n/sl.po      |  4 ++--
 addons/web_view_editor/i18n/th.po      |  4 ++--
 addons/web_view_editor/i18n/tr.po      |  4 ++--
 addons/web_view_editor/i18n/zh_CN.po   |  4 ++--
 330 files changed, 696 insertions(+), 671 deletions(-)
 create mode 100644 addons/portal_anonymous/i18n/zh_CN.po

diff --git a/addons/portal_anonymous/i18n/zh_CN.po b/addons/portal_anonymous/i18n/zh_CN.po
new file mode 100644
index 00000000000..53ca3f03a6a
--- /dev/null
+++ b/addons/portal_anonymous/i18n/zh_CN.po
@@ -0,0 +1,25 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+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: 2013-07-03 15:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2013-07-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "用户名"
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 885dbd1266c..f10c806a653 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/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: 2013-06-27 03:25+0000\n"
+"PO-Revision-Date: 2013-07-07 05:02+0000\n"
 "Last-Translator: Alan <shuchuan.wu@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: 2013-06-28 05:42+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-08 05:25+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: project
 #: view:project.project:0
@@ -38,7 +38,7 @@ msgstr "进度"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "委派任务"
+msgstr "委派的任务"
 
 #. module: project
 #: view:project.project:0
@@ -58,18 +58,18 @@ msgstr "阶段名称"
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "设为未决"
+msgstr "设置为等待状态"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "新的基于模板的项目"
+msgstr "基于该模板新建项目"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 msgid "Day"
-msgstr "天数"
+msgstr "天"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 4b5ad3f0e44..33cddc0123b 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/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:06+0000\n"
-"PO-Revision-Date: 2012-11-27 14:57+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-07 04:44+0000\n"
+"Last-Translator: Alan <shuchuan.wu@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: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-08 05:25+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr "指定的用户"
+msgstr "已分配的用户"
 
 #. module: project_long_term
 #: view:project.phase:0
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index c5fbf332a99..05d2bb027bc 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 97a5432c1f8..c3c25118fec 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index 8b83bae3378..d41d3d69210 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index d5be8fca107..27f0699751c 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index ce04d0c434b..409d3d9e36c 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 01fa4ed53e9..e991a5659d6 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 7536ea167fc..2ca56d854dc 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index b715a71ff31..380581f5345 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index ed9ae261d9e..c4ffcc0a03c 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index 7ebbda6ab11..706dd0e4370 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index e9d2a6e662e..2c10e699be8 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index dc5ee905e7c..0d1716e6e71 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index 80aeae1e6d3..abd1dd69c7b 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "Language: es\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index fbd682c281c..1ec3b9d78b0 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 3c2a7314ca3..08d06dd12eb 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index 771ef807cbd..8cda1f0d70a 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index f7c8a7fa04f..7ea6f192028 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index f39d0baecf1..ce6e48ad208 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 3b82e62f3ef..3323c4bba2c 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index f46742ae961..6f7ba9dd4d9 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index 5162de3dab4..b3b093e7689 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index bdf4ab3c9b2..77c7645bfb0 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index f1c5361fb03..da0ccf61e70 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
@@ -29,14 +29,14 @@ msgstr "Idioma por defecto:"
 #: code:addons/web/static/src/js/coresetup.js:592
 #, python-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "fai %d minutos"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:620
 #, python-format
 msgid "Still loading...<br />Please be patient."
-msgstr ""
+msgstr "Aínda cargando...<br />Por favor espera."
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 16ba4b20bdf..86f98431d83 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 33496c7012f..6b32e4c1936 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index deee97b701a..6e338af929b 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index ebb2c21eecd..d0ca371b49c 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 5a96cc7c1f6..bacacc60e90 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index 0f41ca6f3d6..4ab9db6b513 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 3d7b30ab32f..0392efd6b21 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index f53eb3695d9..b4868afb298 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/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: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index 6b22ea285a5..e5b4addf29f 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 27a7fffc745..230819e77e3 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 56032f72bbd..1fb1c122d78 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index 051e1efd666..bb3a8b870d0 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 89fcd5c09b1..621e7c3598d 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index 6696e1f8be5..88def9bb877 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index c389e494c5f..4c4bf6d26ca 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 5fe8697170d..5b442ed6720 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 6d62ba7417d..7670ecd3bd2 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index b385833f4ac..47a3459f33f 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index f71a0107e69..0959a5cb39d 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 945416f1ac6..b911678d530 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index fef0a655515..d7098b223f1 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 374db8b531e..80cbe8264f6 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 37c03411efb..9031129a89b 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index baa9316e51a..30fc5599309 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index b6a3968b95a..613413d8669 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:46+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index 9165ce40290..192c2fbf839 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index 4eaf976b589..4a6c3ec3422 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index 0f739d3480e..b12d96023e8 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/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: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index 8199060fcd1..c0f16abee71 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index 473759ac186..f8b6e90a324 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 833aea243b8..5939b463025 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
@@ -96,7 +96,7 @@ msgstr "搜索 %(field)s ： %(value)s"
 #: code:addons/web/static/src/js/chrome.js:559
 #, python-format
 msgid "Access Denied"
-msgstr "访问被拒绝"
+msgstr "访问被拒绝。（请检查是否输入了正确的　主控密码）"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index 9834e9e8013..3679317a299 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index 8128120a001..60173b3d874 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index c64affff7d2..b17721e0d0b 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 9790ae83f0b..97b30be3209 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index 198516f28ac..6a78f5bc59b 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index 8d70f534cf4..10e553c158f 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 223e55166ee..124790ee992 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index a24c490d87b..90922171099 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index b2a27c22680..065adcfc7db 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 8a7f1a07d45..963a535c663 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 1f029241798..b86f4cdcc61 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index 14b8ba68ac1..f145bf112bd 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index 1f30002c616..146b30915fe 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index c42b7a55952..89fbda61cac 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "Language: es\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index 3e02c6883c2..13411402e96 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index f654d813e66..10168b1212b 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index d89249222d6..0a536c2523d 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index 7bcc3d12851..bc66701de29 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index 75b8ff84028..74f1352be82 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index 83f591f94ec..973de2cefb7 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index d053bd37fbd..62ab2aba4e0 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index ead351b7670..79f27d7f7f5 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index fc7aca18058..5ade9441c08 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 290e8f1914d..e1fd884c5fe 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 32954c73825..73c52520556 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 8b8da293585..58720cdd3de 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index ff379d5a2c0..7662066a826 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 729331fa106..47181734825 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 39a7dfb8fa4..07f030b0535 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 74b750e0de5..077618319da 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index 7ae9c699667..bf121b9e981 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 178e4bc1603..3da44813ff9 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index 73562137a8a..fac53bfdba7 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 7224963176c..519db467797 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index 3ac086625e8..e5aafc86c8b 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index 9f095c6c746..f877379cb07 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 39ef6826fd9..8b4deef80fc 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index eb97276f560..9f34f130d73 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 0db55cbedb8..6026569cda9 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 23fc0eac5b3..522dd641b21 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 8b13964d136..005a46bf1fd 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index d42f980ba10..cc217fc428d 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index 82acb8439e1..695dcd1786d 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index f616dd57ec2..90ca8cbacf3 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index f3c4f4bfbac..d5829724994 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index d9cc1339260..c06cfa36452 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 6a3615b11f2..119fe61fc26 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index 426e366d85f..4eb952f32f8 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index a785bd94d08..67416d0c76e 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index fda069dd40c..bcc79224acc 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index f5c421d2e7c..4e8dd764a4c 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index 36bef435c57..adfcbb580f4 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -43,7 +43,7 @@ msgstr "保存"
 #: code:addons/web_calendar/static/src/js/calendar.js:109
 #, python-format
 msgid "Calendar view has a 'date_delay' type != float"
-msgstr "日历视图的'date_delay' 类型不是 float"
+msgstr "日历视图有一个'date_delay' 的类型不是 float"
 
 #. module: web_calendar
 #. openerp-web
@@ -214,7 +214,7 @@ msgstr "日历"
 #: code:addons/web_calendar/static/src/js/calendar.js:101
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
-msgstr "日历视图的为定义 'date_start'属性"
+msgstr "日历视图未定义 'date_start'属性"
 
 #~ msgid "Navigator"
 #~ msgstr "导航器"
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index b3061bd3119..0fcd1e9c77a 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index c1a690e3fb8..3c47429924d 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index 0169cec005d..cf40e831093 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 3113896cbcf..33d27abbe06 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index d2731f80a36..f6ccde6df64 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 5db3f0b22aa..1b62fb1e7db 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index ff0ae9b9574..07a48447765 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 1ec2aa151e0..502c0639394 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index a050d5b9d06..2a0f2d13be7 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index 6a5667957e1..c233ff9e5b2 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index 52924d16449..90074dacd6b 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 40a7751cbc4..a74eeb3e8fa 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index 3957c7c7c39..ce8c07dde9d 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "Language: es\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index 4aa41278eac..d8152d7e471 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 12bc1dd4424..7923854bf74 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index 4b4b117c302..0d7d5bc42a1 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 8cae96e1f34..abe808c28ef 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index 3198e796eab..f48a0d54193 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index b2125710d12..2e84bedf16f 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index ffa8b78c9af..cc577871222 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index 705d06a09c3..91101f960a3 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 3457905835d..65ad1088de4 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index 8d583d3c3bc..42cd9d747bc 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index a62e25c3f12..77ef17d63ac 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index b63cb560dec..c707d31994c 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index 8514014c0e2..1a4a37502c9 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index a99e075c1d7..a1b2713281f 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 73bbca7ee2d..569902aa2d2 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index a3bdd843b7d..573984a482e 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 55b6befa3bb..00d16a6a9f2 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index 92671df5f77..c45b30abb02 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index 4bd84f3935c..5f6b3e84235 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index b3131370eb9..1847f73d84a 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index cc5c751ba95..b5e34179d62 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index 31209329d40..79cd88be150 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 50df3631ce1..572c5a149d3 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 9f7e200d12b..d9388e64e22 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 285bdb56187..488c52b19bb 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index b78b3d66cfa..3787a76ecbd 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index 6d4df65c2ca..5e1a2043230 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index d8539749872..0c9f073637c 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index 4d2d399aec7..9b80610e3b6 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index 513ecf3ac10..af118d2b2c2 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 0c11f1908bb..541164f7c98 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 5d3f936767c..5fefa37193e 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 9da15d91dca..05598732eed 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index a9343d10889..d4f38dcb019 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index b5667d91e24..56a15341738 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 89caf5d1398..46f27cb58e6 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index 0053308ff82..b0bd609be8b 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index c8e2f452973..14cdc3f83f2 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index 3c87ac7719a..f53c2ba8fb3 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index d5170cc5bc4..ac2b7786c5a 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index a8177efe393..8db62855904 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index f93f748146f..73d2b989b68 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 6c585d2da67..908bf8048fc 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 68cd76eb846..793972a8e87 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index aa58cb3cbd3..5543efc267d 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index 940664fd77b..f8a44b10454 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index 37cc964c57d..67018631fbe 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index 3d03a1a2d58..bf44f46ef0a 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index c11a6d8a2d6..50f8b9f3949 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index 28b2c460b5d..48b7bef91a2 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index 6449b42d7a9..3afde3b4e72 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index ceea5c4bebb..d1ad9985e09 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index 45d7c92528f..a8f85780f9c 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index ebe563a4518..be403528dfd 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 9fc2467fe7e..dea185af557 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index e6f9efd6180..66b3c1486e8 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index e4c1d5b1f02..e0827e272f2 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 576b5cc3f65..5bfc31ebf2b 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index 55ea19aa9be..34653b76e77 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index af385fd00a3..bfbebcb33ab 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index a3b6edd2c75..95afca75a58 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index da15c6e4ae0..63b41ac2dc8 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index 3ae0ed8b411..5f0c2dda98b 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index 4f7a9543f98..a44e03fd4df 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index f52048c657e..b16c4839d74 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index fcec87f4d02..f98d602e38c 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index 25088f45df2..45f97b6ee70 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index 1d4aeb2ccf4..07a6b3762fa 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index 0f39308e7ec..fb01771037a 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 0d20b791038..7fb3c01455c 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index d2981176141..7ce2d3ca7d4 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index d3b91c2d172..1d153b5aea1 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index 5cbbca5958d..4f8d926ac47 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 7bcbfe27dd4..6395f9516d4 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 48cd6691264..03069d58b0c 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index c1fc1f0f80d..22b20d6bbe0 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index eea6119bbda..638546398b8 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index 4ecf28cfd92..d4244769f39 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index d261f914dd0..79052ba054b 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index 844e61d5273..7b29f62493b 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index a9989aa3a2e..c9704dd705f 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 78c1c975a14..2ab3a7ad621 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index e2ebc2b25f1..709c61aa261 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 172625f6631..932a0eb1927 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 44ea1e40a96..72c9f8bbc56 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index afa2e281cc1..f54c321f54d 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 70e1bb7b58b..5585b076b77 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 7e409bc67a0..d6db7cbcea0 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 6272c16d80c..b9193251ff9 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 2cb3d767432..b810e7a41e8 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index fd8d97e9a6d..de7e827ff83 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 8bb35e32401..364edd8cc87 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 4d391c0b50a..15d51aa7081 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index d1d6f91ef9b..9cc1ffcf837 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 1422781cbb4..71ad25170a7 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index f2a0c08a417..1160b8f4cb9 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index 2170047d0b2..8f3c8cb2902 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index df02b72ee78..fd91a32b4cc 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 0029eaea30b..4787c0a7dfb 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index 59695db9b33..73e44941471 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index e861867a935..7002ff7da54 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 9f5cf305efe..674389b44cc 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index 86ca9fff4c8..0aad9e3c6cc 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index 54612cbde5e..fad45ee268b 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index b29284ee2fc..5ebc83b54a9 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index 29dc8900542..fb40febf215 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index eabc3c12d2b..2b39f98ba75 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index a013c7968df..30d216cb236 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index 037de562ffe..b028e1240ba 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index 141577b255c..0ccd76fc3f3 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index c049eb7c3f7..e518c83e08d 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 50384a4acaa..130cbc867a2 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index d2304bacd2c..6863a754cdd 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 8fe9bcb3aec..f35589fa387 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index dec13854859..6523b68e814 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index 3158a2d4985..b574d61fd0a 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index 1874b6f286d..ebbabf0d1eb 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 6c046426789..7eac1d90096 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index b1bbdc3e7b6..c40bcc8d67e 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index 7db6eb8b6dc..2fec57846ac 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 9bf47c289af..15655db37c9 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index eb095673101..9d1a82c4dac 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index 60eed68f6ba..89b1dfaa8f0 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 1f89817fee0..3515a7a09e0 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 362aa5266c5..47c72e8bf31 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index 8bac32f2492..77b7c6c9923 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index c257745bf45..b9d46e3e4a2 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index 7182af4ff62..2c0cb216514 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index d89dc7efdfd..07d08143a86 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 86bc54118f2..744d74dd14e 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 3ed04ef2765..d9011d4f511 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 5dfb4ce886c..e15237ef3da 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index 3a6c2a2faed..1d01a069038 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index aa7ad14169e..ada88e220b6 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index 4b2636294e5..22397a2f7f6 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index 91e008f7aa4..6a18b009461 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index a6c6cba9912..4b0fb9cd76a 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index f4c70d35d50..a8d615771ce 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index 565534852ac..df6d05238f0 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index 9316271778c..6ce46d59919 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index 15647b68a14..322e3eebffa 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index 5346eaecc77..805327dd1e6 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index ee92276adf7..d7842a34061 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index f6869d7d8eb..818c1f53112 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 1c60c914af1..0b7b3cc1d4f 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index ab2b843d8ee..727c9c06b67 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index 151562024f8..fa996b75ba1 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 8903e427553..4b550c9c8f7 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index ba9154d6f32..92debaa3a4c 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index c0b5c580a83..4f01e250f35 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 3ae980caa34..7aee1697096 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index e714e0a2010..a0d7c9e41c7 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index b2e83bfaf6f..94701ac5eb7 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index a91ee0efe5c..323b8759032 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 1f38b5cf413..6cc9d403d21 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 57301b558de..64ebcc96234 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index 2ee3b11135a..28e5b2032e7 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index cd86a3729b0..699553bed5f 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index 7a5ba02c58d..37a1815c7eb 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index f4e81b7d1ff..5384c31c5e6 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index fb41fad12f3..30b87a842f6 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index a76786407ec..b501acbce6e 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 01f41b6acd1..ee6e0afd561 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index e8ceae6fb45..709db55b746 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 85cca3532ff..c93c8990601 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index 6e153a81438..24c6ddd2d2e 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index e0a9adb9dec..fea9c233242 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index 3b09ae73a01..e08e5cc7ae1 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index 17634a858c2..1e6984b82b5 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index d5038857dc8..3c57fddb007 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 98b6351d222..c9d744f9c63 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 472147eaf14..5df90990ecd 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index 48359f3e53c..01e5ba418ba 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index 759e596e3e1..692abc08672 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index a7409d50939..7baf61dc788 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index 4a06d82972f..5467e95b5d5 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index 84992a62e14..1ce114aeecd 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index d0c2f65b44d..a60f107ba64 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index 42e70e7dca7..9a0a5abfe94 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index b9bb89f1264..f748602bb7e 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index f9d48049c51..66ba2dc2784 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index 5b0f26d2ff1..e7607f21ad3 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index 986a1839753..46f29f166d0 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index e6c1dd0cac6..4e020003482 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index 57bdabb42be..f31da66f88f 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index 5e7e81da918..4bc9d0c6b76 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index 2400c1170b7..85757de7ef5 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index ba3e2f85f90..ae363e7f739 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index 20498a3ba60..2561134da83 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 990af21d92a..9450ab098ea 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index ac69b147318..90340bf5ec7 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index fd77eca6897..1cad165c8da 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index b96c478d089..1370a141c87 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index 9832968a82c..27d704bad1a 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index ff7764e5c80..eb31e5827a8 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index 6cf26ca93af..35eaa3c7d6c 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 4a74a84504f..70e54af7cfa 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index e0179e83d98..696183c2d9b 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index b8d6aae4d95..e40e22aeaed 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index b30aa1044c4..ac455fad295 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 1ee9064eeff..e5c32c8b4c6 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index 888a5db2a4c..25351fa75c3 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index e47befd1506..7c614fba0bf 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index 54d45093623..73345354650 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 4aa0d75c79b..4b728e47299 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 596787b4137..28c95af49f8 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/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: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index ebb8faa829f..478c1705eae 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index e097700973a..1288fe1a63f 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
 #. openerp-web

From ef9923feb41cffcc2a3f405d243b7027c0fde6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 10:39:21 +0200
Subject: [PATCH 113/197] [FIX] Removed get_default_email, already removed but
 that came back when merging trunk

bzr revid: tde@openerp.com-20130708083921-a6zm0peez8is9qsg
---
 addons/hr_recruitment/hr_recruitment.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index cc5bd99acee..a140e9816d6 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -220,7 +220,6 @@ class hr_applicant(osv.Model):
     _defaults = {
         'active': lambda *a: 1,
         'user_id': lambda s, cr, uid, c: uid,
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),

From 05359f0909e39404896a113de8a418e41ed9eacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 11:11:56 +0200
Subject: [PATCH 114/197] [IMP] hr_recruitment: added date_last_stage_update
 field, holding date of last stage modification; removed hired.employee wizard
 that does not seem to be used anywhere, nor to be useful.

bzr revid: tde@openerp.com-20130708091156-3l6fcl6drd4b6w2y
---
 addons/hr_recruitment/__openerp__.py          |  2 +-
 addons/hr_recruitment/hr_recruitment.py       | 21 ++++++--
 addons/hr_recruitment/hr_recruitment_view.xml | 15 +++---
 .../report/hr_recruitment_report.py           | 16 +++---
 .../report/hr_recruitment_report_view.xml     | 26 ++++-----
 .../test/recruitment_process.yml              | 14 +----
 addons/hr_recruitment/wizard/__init__.py      |  4 +-
 .../wizard/hr_recruitment_employee_hired.py   | 54 -------------------
 .../wizard/hr_recruitment_employee_hired.xml  | 30 -----------
 9 files changed, 50 insertions(+), 132 deletions(-)
 delete mode 100644 addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
 delete mode 100644 addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml

diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index e83c546af04..b2084fb66ee 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -47,7 +47,7 @@ You can define the different phases of interviews and easily rate the applicant
         'fetchmail',
     ],
     'data': [
-        'wizard/hr_recruitment_employee_hired.xml',
+        # 'wizard/hr_recruitment_employee_hired.xml',
         'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index a140e9816d6..710b796ee59 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -185,10 +185,9 @@ class hr_applicant(osv.Model):
         'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'),
-        # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True, select=True),
-        'date_open': fields.datetime('Opened', readonly=True, select=True),
-        'date': fields.datetime('Date'),
+        'date_open': fields.datetime('Assigned', readonly=True, select=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'date_action': fields.date('Next Action Date'),
         'title_action': fields.char('Next Action', size=64),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
@@ -224,6 +223,7 @@ class hr_applicant(osv.Model):
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
+        'date_last_stage_update': fields.datetime.now(),
     }
 
     _group_by_full = {
@@ -390,7 +390,20 @@ class hr_applicant(osv.Model):
             self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context)
         return obj_id
 
-    def case_close_with_emp(self, cr, uid, ids, context=None):
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # stage change: update date_last_stage_update
+        if 'stage_id' in vals:
+            vals['date_last_stage_update'] = fields.datetime.now()
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
+
+        return super(hr_applicant, self).write(cr, uid, ids, vals, context=context)
+
+    def create_employee_from_applicant(self, cr, uid, ids, context=None):
+        """ Create an hr.employee from the hr.applicants """
         if context is None:
             context = {}
         hr_employee = self.pool.get('hr.employee')
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8134e0f625d..ae7601416a2 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -86,9 +86,12 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2>
+                    <h2 style="display: inline-block;">
                         <field name="partner_name" class="oe_inline"/>
                     </h2>
+                    <button string="Create Employee" name="create_employee_from_applicant" type="object"
+                                    class="oe_link oe_inline" style="margin-left: 8px;"
+                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
                 </div>
                 <group>
                     <group>
@@ -134,13 +137,7 @@
                             <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}"> + </span>
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
-                        <label for="emp_id"/>
-                        <div>
-                            <field name="emp_id" readonly="1"/>
-                            <button string="Create Employee" name="case_close_with_emp" type="object"
-                                    class="oe_link oe_inline"
-                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
-                        </div>
+                        <field name="emp_id" readonly="1"/>
                     </group>
                 </group>
                 <group>
@@ -173,7 +170,7 @@
         <field name="name">Jobs - Recruitment Search</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <search string="Search Jobs">
+            <search string="Search Applicants">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                 <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
                 <filter string="My" domain="[('user_id', '=', uid)]"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index b733655e51e..93384c95ed4 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -25,11 +25,12 @@ from .. import hr_recruitment
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
-class hr_recruitment_report(osv.osv):
+class hr_recruitment_report(osv.Model):
     _name = "hr.recruitment.report"
     _description = "Recruitments Statistics"
     _auto = False
-    _rec_name = 'date'
+    _rec_name = 'date_create'
+    _order = 'date_create desc'
 
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
@@ -44,7 +45,8 @@ class hr_recruitment_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
-        'date': fields.date('Date', readonly=True),
+        'date_create': fields.date('Create Date', readonly=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True),
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
@@ -60,15 +62,16 @@ class hr_recruitment_report(osv.osv):
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
     }
-    _order = 'date desc'
+    
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'hr_recruitment_report')
         cr.execute("""
             create or replace view hr_recruitment_report as (
                  select
                      min(s.id) as id,
-                     date_trunc('day',s.create_date) as date,
+                     date_trunc('day',s.create_date) as date_create,
                      date_trunc('day',s.date_closed) as date_closed,
+                     date_trunc('day',s.date_last_stage_update) as date_last_stage_update,
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
@@ -85,7 +88,7 @@ class hr_recruitment_report(osv.osv):
                      (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
                      (sum(salary_expected)/count(*)) as salary_exp_avg,
-                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
+                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close,
                      count(*) as nbr
                  from hr_applicant s
                  group by
@@ -97,6 +100,7 @@ class hr_recruitment_report(osv.osv):
                      s.date_open,
                      s.create_date,
                      s.date_closed,
+                     s.date_last_stage_update,
                      s.partner_id,
                      s.company_id,
                      s.user_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 1845a97014e..d75c29c17a2 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.recruitment.report</field>
         <field name="arch" type="xml">
             <tree string="Recruitment Analysis" create="false">
-                <field name="date" invisible="1"/>
+                <field name="date_create" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="job_id"/>
                 <field name="stage_id" invisible="1" />
@@ -17,6 +17,7 @@
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
+                <field name="date_last_stage_update" invisible="1"/>
                 <field name="nbr" sum="# of Applications"/>
                 <field name="available" sum="Available"/>
                 <field name="salary_exp" sum="Expected Salary"/>
@@ -57,20 +58,21 @@
                     <field name="priority"/>
                     <field name="stage_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="date" string="Creation Date"/>
+                    <field name="date_create"/>
                     <field name="date_closed"/>
                 </group>
                 <group expand="1" string="Group By ...">
-                   <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
-                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-                   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-                   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
+                   <filter string="Responsible" name='User' context="{'group_by':'user_id'}"/>
+                   <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" context="{'group_by':'partner_id'}" />
+                   <filter string="Jobs" name="job" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" context="{'group_by':'type_id'}"/>
+                   <filter string="Stage" context="{'group_by':'stage_id'}" />
+                   <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" />
+                   <filter string="Day" name="day" context="{'group_by':'day'}" help="Creation Date"/>
+                   <filter string="Month" context="{'group_by':'month'}" help="Creation Date"/>
+                   <filter string="Year" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 0a6d5426e0d..a48b70a5683 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -43,20 +43,8 @@
   I print Applicant fill up the interview quetion
 -
   !python {model: hr.applicant}: |
-    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
--
-  I do not give employment to the hired the applicant.
--
-  !python {model: hired.employee}: |
     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
-    emp_id = self.create(cr, uid, {}, context=context)
--
-  Now I give employment to hired applicant .
--
-  !python {model: hr.applicant}: |
-     hired_emp_obj = self.pool.get('hired.employee')
-     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
-     emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
+    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
 -
   Now hired employee want to be a partner of company.
 -
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index fde7df63456..d52c7a9113a 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-
 import hr_recruitment_create_partner_job
-import hr_recruitment_employee_hired
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
deleted file mode 100644
index 60d31e74eee..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class hired_employee(osv.osv_memory):
-    _name = 'hired.employee'
-    _description = 'Create Employee'
-
-    def case_close(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        if context is None:
-            context = {}
-        self.pool.get('hr.applicant').case_close(cr, uid,context.get('active_ids',[]))
-        return {}
-
-    def case_close_with_emp(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        """
-        if context is None:
-            context = {}
-        return self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
deleted file mode 100644
index d014bd54aa8..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_hr_recruitment_hired_employee" model="ir.ui.view">
-            <field name="name">hr.recruitment.hired2employee.form</field>
-            <field name="model">hired.employee</field>
-            <field name="arch" type="xml">
-                <form string="Create New Employee" version="7.0">
-                    <header>
-                        <button name="case_close_with_emp" string="Yes" type="object" class="oe_highlight" />
-                        <button name="case_close" string="No" type="object"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Would you like to create an employee ?"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_hr_recruitment_hired_employee" model="ir.actions.act_window">
-            <field name="name">Create Employee</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hired.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>

From 0aac1c7cb0c0622a97af05e35c02bfb778f572e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 12:30:11 +0200
Subject: [PATCH 115/197] [REF] crm: removed references to base_stage in
 crm_lead / crm_claim + various pre-cleaning before removing state.

bzr revid: tde@openerp.com-20130708103011-53t1fllmrz0hdq8u
---
 addons/crm/crm_lead.py                   | 108 ++++++++++++-----------
 addons/crm/crm_lead_demo.xml             |   7 --
 addons/crm/crm_lead_view.xml             |   8 +-
 addons/crm/test/crm_lead_cancel.yml      |  31 -------
 addons/crm/test/crm_lead_onchange.yml    |   7 +-
 addons/crm/test/lead2opportunity2win.yml |  27 ++----
 addons/crm_claim/crm_claim.py            |  59 ++++++-------
 addons/crm_claim/crm_claim_view.xml      |   5 --
 addons/crm_claim/test/process/claim.yml  |  18 +---
 addons/crm_helpdesk/crm_helpdesk.py      |  12 +--
 10 files changed, 95 insertions(+), 187 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e344b0153df..af02e3be1bf 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
 from operator import itemgetter
@@ -68,7 +67,7 @@ CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_lead(base_stage, format_address, osv.osv):
+class crm_lead(format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
@@ -93,18 +92,6 @@ class crm_lead(base_stage, format_address, osv.osv):
         context['empty_list_help_document_name'] = _("leads")
         return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context)
 
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        if vals.get('type') and not context.get('default_type'):
-            context['default_type'] = vals.get('type')
-        if vals.get('section_id') and not context.get('default_section_id'):
-            context['default_section_id'] = vals.get('section_id')
-
-        # context: no_log, because subtype already handle this
-        create_context = dict(context, mail_create_nolog=True)
-        return super(crm_lead, self).create(cr, uid, vals, context=create_context)
-
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
         return self._resolve_section_id_from_context(cr, uid, context=context) or False
@@ -124,8 +111,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         if type(context.get('default_section_id')) in (int, long):
             return context.get('default_section_id')
         if isinstance(context.get('default_section_id'), basestring):
-            section_name = context['default_section_id']
-            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=section_name, context=context)
+            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=context['default_section_id'], context=context)
             if len(section_ids) == 1:
                 return int(section_ids[0][0])
         return None
@@ -324,8 +310,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     _defaults = {
         'active': 1,
         'type': 'lead',
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
@@ -339,30 +324,29 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
         if not stage_id:
-            return {'value':{}}
+            return {'value': {}}
         stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
         if not stage.on_change:
-            return {'value':{}}
-        return {'value':{'probability': stage.probability}}
+            return {'value': {}}
+        return {'value': {'probability': stage.probability}}
 
-    def on_change_partner(self, cr, uid, ids, partner_id, context=None):
-        result = {}
+    def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):
         values = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name' : partner.name,
-                'street' : partner.street,
-                'street2' : partner.street2,
-                'city' : partner.city,
-                'state_id' : partner.state_id and partner.state_id.id or False,
-                'country_id' : partner.country_id and partner.country_id.id or False,
-                'email_from' : partner.email,
-                'phone' : partner.phone,
-                'mobile' : partner.mobile,
-                'fax' : partner.fax,
+                'partner_name': partner.name,
+                'street': partner.street,
+                'street2': partner.street2,
+                'city': partner.city,
+                'state_id': partner.state_id and partner.state_id.id or False,
+                'country_id': partner.country_id and partner.country_id.id or False,
+                'email_from': partner.email,
+                'phone': partner.phone,
+                'mobile': partner.mobile,
+                'fax': partner.fax,
             }
-        return {'value' : values}
+        return {'value': values}
 
     def on_change_user(self, cr, uid, ids, user_id, context=None):
         """ When changing the user, also set a section_id or restrict section id
@@ -403,7 +387,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         # collect all section_ids
         section_ids = []
         types = ['both']
-        if not cases :
+        if not cases:
             type = context.get('default_type')
             types += [type]
         if section_id:
@@ -431,24 +415,18 @@ class crm_lead(base_stage, format_address, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Overrides case_cancel from base_stage to set probability """
-        res = super(crm_lead, self).case_cancel(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability' : 0.0}, context=context)
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """ Overrides case_reset from base_stage to set probability """
-        res = super(crm_lead, self).case_reset(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability': 0.0}, context=context)
-        return res
+    def stage_set(self, cr, uid, ids, stage_id, context=None):
+        """ Set the new stage. Now just writes the stage.
+            TDE TODO: remove me when removing state
+        """
+        return self.write(cr, uid, ids, {'stage_id': stage_id}, context=context)
 
     def case_mark_lost(self, cr, uid, ids, context=None):
         """ Mark the case as lost: state=cancel and probability=0 """
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0),('on_change','=',True)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 0.0}, new_stage_id=stage_id, context=context)
+                self.stage_set(cr, uid, [lead.id], stage_id, context=context)
         return True
 
     def case_mark_won(self, cr, uid, ids, context=None):
@@ -456,7 +434,21 @@ class crm_lead(base_stage, format_address, osv.osv):
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0),('on_change','=',True)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 100.0}, new_stage_id=stage_id, context=context)
+                self.stage_set(cr, uid, [lead.id], stage_id, context=context)
+        return True
+
+    def case_escalate(self, cr, uid, ids, context=None):
+        """ Escalates case to parent level """
+        for case in self.browse(cr, uid, ids, context=context):
+            data = {'active': True}
+            if case.section_id.parent_id:
+                data['section_id'] = case.section_id.parent_id.id
+                if case.section_id.parent_id.change_responsible:
+                    if case.section_id.parent_id.user_id:
+                        data['user_id'] = case.section_id.parent_id.user_id.id
+            else:
+                raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
+            self.write(cr, uid, [case.id], data, context=context)
         return True
 
     def set_priority(self, cr, uid, ids, priority):
@@ -930,12 +922,22 @@ class crm_lead(base_stage, format_address, osv.osv):
         }
         return res
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('type') and not context.get('default_type'):
+            context['default_type'] = vals.get('type')
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
+        # context: no_log, because subtype already handle this
+        create_context = dict(context, mail_create_nolog=True)
+        return super(crm_lead, self).create(cr, uid, vals, context=create_context)
+
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('stage_id') and not vals.get('probability'):
-            # change probability of lead(s) if required by stage
-            stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
-            if stage.on_change:
-                vals['probability'] = stage.probability
+            onchange_stage_values = self.onchange_stage_id(cr, uid, ids, vals.get('stage_id'), context=context)['value']
+            vals.update(onchange_stage_values)
         return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
 
     def new_mail_send(self, cr, uid, ids, context=None):
@@ -1022,7 +1024,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             'user_id': False,
         }
         if msg.get('author_id'):
-            defaults.update(self.on_change_partner(cr, uid, None, msg.get('author_id'), context=context)['value'])
+            defaults.update(self.on_change_partner_id(cr, uid, None, msg.get('author_id'), context=context)['value'])
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             defaults['priority'] = msg.get('priority')
         defaults.update(custom_values)
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 4c6cf47c4f7..3917fadbd32 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -263,13 +263,6 @@ Andrew</field>
             <field eval="1" name="active"/>
         </record>
 
-        <!-- Call Function to Cancel the leads (set as Dead) -->
-        <function model="crm.lead" name="case_cancel"
-            eval="[ ref('crm_case_12'), ref('crm_case_7'),
-                    ref('crm_case_3'), ref('crm_case_8')],
-                  {'install_mode': True}"
-        />
-
         <!-- Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_1'), ref('crm_case_2'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index df6a4a07a8e..cb4302166a1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -95,10 +95,6 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_reset" string="Reset" type="object"
-                            states="cancel"/>
-                    <button name="case_cancel" string="Cancel Case" type="object"
-                            states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
                             domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
                             on_change="onchange_stage_id(stage_id)"/>
@@ -118,7 +114,7 @@
                             <field name="partner_name" string="Company Name"/>
                             <!-- Preload all the partner's information -->
                             <field name="partner_id" string="Customer"
-                                on_change="on_change_partner(partner_id)"
+                                on_change="on_change_partner_id(partner_id)"
                                 options='{"create_name_field": "name"}'
                                 context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_section_id': section_id}"/>
                             <label for="street" string="Address"/>
@@ -617,7 +613,7 @@
             <field name="state">code</field>
             <field name="code">
                 if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
-                    self.case_cancel(cr, uid, context['active_ids'], context=context)
+                    self.case_mark_lost(cr, uid, context['active_ids'], context=context)
             </field>
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index 8749675bf23..0f8d9ba1df9 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -4,37 +4,6 @@
   !python {model: crm.lead}: |
     section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
     self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
-    self.case_cancel(cr, uid, [ref("crm_case_1")])
--
-  I check cancelled lead.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead7'), "Stage should be 'Dead' and is %s." % (lead.stage_id.name)
-    assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
-    assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
--
-  I reset cancelled lead into unqualified lead.
--
-  !python {model: crm.lead}: |
-    self.case_reset(cr, uid, [ref("crm_case_1")])
--
-  I check unqualified lead after reset.
--
-  !assert {model: crm.lead, id: crm.crm_case_1, string: Lead is in draft state}:
-    - state == "draft"
--
-  I re-open the lead
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_case_1")])
--
- I check stage and state of the re-opened lead
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm.crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead2'), "Opportunity stage should be 'Qualification'."
-    assert lead.state == 'open', "Opportunity should be in 'open' state."
 -
   I escalate the lead to parent team.
 -
diff --git a/addons/crm/test/crm_lead_onchange.yml b/addons/crm/test/crm_lead_onchange.yml
index 9154ffdf513..45e140e890e 100644
--- a/addons/crm/test/crm_lead_onchange.yml
+++ b/addons/crm/test/crm_lead_onchange.yml
@@ -20,9 +20,4 @@
 -
   !record {model: crm.phonecall, id: crm_phonecall_5}:
     name: 'Bad time'
-    partner_id: base.res_partner_5
--
-  I set the next stage to "New" for the lead.
--
-  !python {model: crm.lead}: |
-    self.stage_next(cr, uid, [ref("crm_case_4")], context={'stage_type': 'lead'})
+    partner_id: base.res_partner_5
\ No newline at end of file
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index 94e7149ef77..23545c61bc1 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -1,25 +1,15 @@
 -
   In order to test the conversion of a lead into a opportunity,
--
-  I open a lead.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_case_4")])
--
-  I check if the lead state is "Open".
--
-  !assert {model: crm.lead, id: crm.crm_case_4, string: Lead state is Open}:
-     - state == "open"
 -
   I convert lead into opportunity for exiting customer.
 -
   !python {model: crm.lead}: |
-    self.convert_opportunity(cr, uid ,[ref("crm_case_4")], ref("base.res_partner_2"))
+    self.convert_opportunity(cr, uid ,[ref("crm_case_1")], ref("base.res_partner_2"))
 -
   I check details of converted opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_4'))
+    lead = self.browse(cr, uid, ref('crm_case_1'))
     assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
     assert lead.partner_id.id == ref("base.res_partner_2"), 'Partner mismatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
@@ -28,7 +18,7 @@
 -
   !python {model: crm.opportunity2phonecall}: |
     import time
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_4')]})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_1')]})
     call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'name': "Bonjour M. Jean, Comment allez-vous? J'ai bien reçu votre demande, pourrions-nous en parler quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
@@ -36,28 +26,28 @@
   I check that phonecall is scheduled for that opportunity.
 -
   !python {model: crm.phonecall}: |
-    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_4'))])
+    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_1'))])
     assert len(ids), 'Phonecall is not scheduled'
 -
   Now I schedule meeting with customer.
 -
   !python {model: crm.lead}: |
-    self.action_makeMeeting(cr, uid, [ref('crm_case_4')])
+    self.action_makeMeeting(cr, uid, [ref('crm_case_1')])
 -
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_1')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
   !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_case_4")])
+    self.case_mark_won(cr, uid, [ref("crm_case_1")])
 -
   I check details of the opportunity after having won the opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_4'))
+    lead = self.browse(cr, uid, ref('crm_case_1'))
     assert lead.stage_id.id == ref('crm.stage_lead6'), "Opportunity stage should be 'Won'."
     assert lead.state == 'done', "Opportunity is not in 'done' state!"
     assert lead.probability == 100.0, "Revenue probability should be 100.0!"
@@ -104,7 +94,6 @@
 -
   !python {model: crm.meeting}: |
     context.update({'active_model': 'crm.meeting'})
-    self.case_open(cr, uid, [ref('base_calendar.crm_meeting_4')])
 -
   I invite a user for meeting.
 -
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 774571b0314..1e3ed2faad1 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -19,20 +19,12 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_stage import base_stage
-import binascii
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
-import time
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_CLAIM_PENDING_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
 class crm_claim_stage(osv.osv):
     """ Model for claim stages. This models the main stages of a claim
@@ -51,8 +43,6 @@ class crm_claim_stage(osv.osv):
         'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
         'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."),
-        'case_refused': fields.boolean('Refused stage',
-                        help='Refused stages are specific stages for done.'),
         'case_default': fields.boolean('Common to All Teams',
                         help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
         'fold': fields.boolean('Hide in Views when Empty',
@@ -63,10 +53,9 @@ class crm_claim_stage(osv.osv):
         'sequence': lambda *args: 1,
         'state': 'draft',
         'fold': False,
-        'case_refused': False,
     }
 
-class crm_claim(base_stage, osv.osv):
+class crm_claim(osv.osv):
     """ Crm claim
     """
     _name = "crm.claim"
@@ -74,6 +63,15 @@ class crm_claim(base_stage, osv.osv):
     _order = "priority,date desc"
     _inherit = ['mail.thread']
 
+    def _get_default_section_id(self, cr, uid, context=None):
+        """ Gives default section by checking if present in the context """
+        return self.pool.get('crm.lead')._resolve_section_id_from_context(cr, uid, context=context) or False
+
+    def _get_default_stage_id(self, cr, uid, context=None):
+        """ Gives default stage_id """
+        section_id = self._get_default_section_id(cr, uid, context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft')], context=context)
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
@@ -117,15 +115,13 @@ class crm_claim(base_stage, osv.osv):
     }
 
     _defaults = {
-        'user_id':  lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'partner_id':  lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
-        'date': fields.datetime.now,
+        'date': fields.datetime.now(),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
         'active': lambda *a: 1,
-        'stage_id':lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
+        'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
     }
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
@@ -158,27 +154,24 @@ class crm_claim(base_stage, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_refuse(self, cr, uid, ids, context=None):
-        """ Mark the case as refused: state=done and case_refused=True """
-        for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, ['&', ('state', '=', 'done'), ('case_refused', '=', True)], context=context)
-            if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={}, new_stage_id=stage_id, context=context)
-        return True
-
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, email=False, context=None):
         """This function returns value of partner address based on partner
-           :param part: Partner's id
            :param email: ignored
         """
-        if not part:
-            return {'value': {'email_from': False,
-                              'partner_phone': False
-                            }
-                   }
-        address = self.pool.get('res.partner').browse(cr, uid, part)
+        if not partner_id:
+            return {'value': {'email_from': False, 'partner_phone': False}}
+        address = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
+        # context: no_log, because subtype already handle this
+        return super(crm_claim, self).create(cr, uid, vals, context=context)
+
     # -------------------------------------------------------
     # Mail gateway
     # -------------------------------------------------------
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 0d2d8b391e7..28d0f7c731c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -52,7 +52,6 @@
                     <field name="case_default"/>
                     <field name="sequence"/>
                     <field name="state"/>
-                    <field name="case_refused"/>
                     <field name="fold"/>
                 </form>
             </field>
@@ -102,10 +101,6 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
-                            states="draft,open,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Reject" type="object" groups="base.group_user"
-                            states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index a843372956e..f6c6f6d315c 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -21,25 +21,9 @@
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    self.case_open(cr, uid, claim_ids)
 -
-  I check Claim Details after open. 
+  I check Claim Details after open.
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "open", "Claim is not in Open state"
-    assert claim.stage_id.id == ref("crm.stage_lead2"), "Claim is not in Qualification stage"
--
-  After complete all service from our side, I close this claim.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    self.case_close(cr, uid, claim_ids)
--
-  I check Claim details after closed.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "done", "Claim is not in close state"
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 2d0383962b1..ea58016b4c1 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -20,20 +20,14 @@
 ##############################################################################
 
 from openerp.addons.base_status.base_state import base_state
-from openerp.addons.base_status.base_stage import base_stage
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_HELPDESK_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
-class crm_helpdesk(base_state, base_stage, osv.osv):
+class crm_helpdesk(base_state, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
@@ -80,9 +74,7 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'state': lambda *a: 'draft',
         'date': lambda *a: fields.datetime.now(),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),

From e4aad29beb5002e5aae8defcfdc640be3c8c8859 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 8 Jul 2013 12:54:25 +0200
Subject: [PATCH 116/197] [FIX] web report: use get to find active_ids inside
 the context. Check if report_ids is defined

bzr revid: chm@openerp.com-20130708105425-p8279f00xa7925xh
---
 addons/web/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 5641d991397..846b9099555 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1676,13 +1676,15 @@ class Reports(http.Controller):
         context.update(action["context"])
 
         report_data = {}
-        report_ids = context["active_ids"]
+        report_ids = context.get("active_ids", None)
         if 'report_type' in action:
             report_data['report_type'] = action['report_type']
         if 'datas' in action:
             if 'ids' in action['datas']:
                 report_ids = action['datas'].pop('ids')
             report_data.update(action['datas'])
+        if not report_ids:
+            raise ValueError("action['datas']['ids'] and context['active_ids'] are undefined")
 
         report_id = report_srv.report(
             request.session._db, request.session._uid, request.session._password,

From 0bd3562be25ae8f4d44c756cac806bf84e46d598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 13:49:32 +0200
Subject: [PATCH 117/197] [DOC] crm: added basic doc (index.rst + changelog)

bzr revid: tde@openerp.com-20130708114932-zjmxlhrrdc7xo4w6
---
 addons/crm/doc/changelog.rst | 10 ++++++++++
 addons/crm/doc/index.rst     | 13 +++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 addons/crm/doc/changelog.rst
 create mode 100644 addons/crm/doc/index.rst

diff --git a/addons/crm/doc/changelog.rst b/addons/crm/doc/changelog.rst
new file mode 100644
index 00000000000..4178f0b1cab
--- /dev/null
+++ b/addons/crm/doc/changelog.rst
@@ -0,0 +1,10 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- ``crm``, ``crm_claim``: removed inheritance from ``base_stage`` class. Missing
+  methods have been added into ``crm`` and ``crm_claim``.
\ No newline at end of file
diff --git a/addons/crm/doc/index.rst b/addons/crm/doc/index.rst
new file mode 100644
index 00000000000..d70e045befe
--- /dev/null
+++ b/addons/crm/doc/index.rst
@@ -0,0 +1,13 @@
+CRM module documentation
+========================
+
+CRM documentation topics
+'''''''''''''''''''''''''
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst

From 4f4dc388f8b7b315e4be18c3007288cad5a44338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 13:54:34 +0200
Subject: [PATCH 118/197] [DOC] crm: improved changelod.

bzr revid: tde@openerp.com-20130708115434-72zfus0o2yyahdap
---
 addons/crm/doc/changelog.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/doc/changelog.rst b/addons/crm/doc/changelog.rst
index 4178f0b1cab..cb1602a8d39 100644
--- a/addons/crm/doc/changelog.rst
+++ b/addons/crm/doc/changelog.rst
@@ -7,4 +7,5 @@ Changelog
 ----------------
 
 - ``crm``, ``crm_claim``: removed inheritance from ``base_stage`` class. Missing
-  methods have been added into ``crm`` and ``crm_claim``.
\ No newline at end of file
+  methods have been added into ``crm`` and ``crm_claim``. Also removed inheritance
+  in ``crm_helpdesk`` because it uses states, not stages.
\ No newline at end of file

From 7f2795fe16a062fb19e599f343cc2c9b440701b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 14:56:58 +0200
Subject: [PATCH 119/197] [IMP] hr_recruitment: added date_last_stage_update
 and stage_id in search

bzr revid: tde@openerp.com-20130708125658-3igmpfx39ug67iwg
---
 addons/hr_recruitment/hr_recruitment_view.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ae7601416a2..f65729ad4b9 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,6 +42,7 @@
             <tree string="Applicants" fonts="bold:message_unread==True">
                 <field name="message_unread" invisible="1"/>
                 <field name="create_date"/>
+                <field name="date_last_stage_update" invisible="1"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
@@ -182,8 +183,10 @@
                 <field name="job_id"/>
                 <field name="department_id"/>
                 <field name="user_id"/>
+                <field name="stage_id" domain="[]"/>
                 <separator/>
                 <field name="categ_ids"/>
+                <separator/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
@@ -194,6 +197,7 @@
                     <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/>
                     <filter string="Creation Date" domain="[]" context="{'group_by':'create_date'}"/>
+                    <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/>
                 </group>
            </search>
         </field>

From f5c09b40024c70e59f622bdb475c2363e9141eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 15:10:40 +0200
Subject: [PATCH 120/197] [FIX] hr_recruitment: fixed onchange_department
 causing the stage to be resetted

bzr revid: tde@openerp.com-20130708131040-72tke0a25mes9wwp
---
 addons/hr_recruitment/hr_recruitment.py       | 13 ++++++-------
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 710b796ee59..ce6f60669c4 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -230,17 +230,16 @@ class hr_applicant(osv.Model):
         'stage_id': _read_group_stage_ids
     }
 
-    def onchange_job(self, cr, uid, ids, job, context=None):
-        if job:
-            job_record = self.pool.get('hr.job').browse(cr, uid, job, context=context)
+    def onchange_job(self, cr, uid, ids, job_id=False, context=None):
+        if job_id:
+            job_record = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
             if job_record and job_record.department_id:
                 return {'value': {'department_id': job_record.department_id.id}}
         return {}
 
-    def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
-        obj_recru_stage = self.pool.get('hr.recruitment.stage')
-        stage_ids = obj_recru_stage.search(cr, uid, ['|',('department_id','=',department_id),('department_id','=',False)], context=context)
-        stage_id = stage_ids and stage_ids[0] or False
+    def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
+        if not stage_id:
+            stage_id = self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
         return {'value': {'stage_id': stage_id}}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index f65729ad4b9..d743a280691 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -119,7 +119,7 @@
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id, stage_id)"/>
                         <label for="availability"/>
                         <div>
                             <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>

From 0094ef48e2337248cd546304c0d4b23693d48888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 15:29:04 +0200
Subject: [PATCH 121/197] [DOC] hr_recruitment: added doc directory + changelog
 + first draft of doc about stage / state

bzr revid: tde@openerp.com-20130708132904-igi8mikerqa93fjb
---
 addons/hr_recruitment/doc/changelog.rst | 10 ++++++++++
 addons/hr_recruitment/doc/index.rst     | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 addons/hr_recruitment/doc/changelog.rst
 create mode 100644 addons/hr_recruitment/doc/index.rst

diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
new file mode 100644
index 00000000000..9d9b57b495a
--- /dev/null
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -0,0 +1,10 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- ``hr_recruitment``: removed inheritance from ``base_stage`` class and removed
+  ``state`` field.
\ No newline at end of file
diff --git a/addons/hr_recruitment/doc/index.rst b/addons/hr_recruitment/doc/index.rst
new file mode 100644
index 00000000000..f6aac6e8a04
--- /dev/null
+++ b/addons/hr_recruitment/doc/index.rst
@@ -0,0 +1,22 @@
+=====================
+HR Recruitment DevDoc
+=====================
+
+Hr Recruitment module documentation
+===================================
+
+Hr Recruitment documentation topics
+'''''''''''''''''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst

From fdde0e5989ac73cabf878363fa4cf5ce00018253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 8 Jul 2013 15:29:30 +0200
Subject: [PATCH 122/197] [ADD] hr_recruitment: added forgottent doc file

bzr revid: tde@openerp.com-20130708132930-r0tjqyay8svvpe72
---
 addons/hr_recruitment/doc/stage_status.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 addons/hr_recruitment/doc/stage_status.rst

diff --git a/addons/hr_recruitment/doc/stage_status.rst b/addons/hr_recruitment/doc/stage_status.rst
new file mode 100644
index 00000000000..1008dbe14fb
--- /dev/null
+++ b/addons/hr_recruitment/doc/stage_status.rst
@@ -0,0 +1,20 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+Stage
++++++
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+This revision removed the concept of state on hr.applicant objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``.
+
+Convention
+++++++++++
+
+A ``hr.recruitment.stage`` is ``new`` when it has the following properties:
+
+ - ``sequence`` = 1
+

From 43b5aa8f635e8670f086246beaaf3acc61a127ae Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 9 Jul 2013 05:16:30 +0000
Subject: [PATCH 123/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130709051630-glg5si1pp65wa6fv
---
 addons/base_status/i18n/sv.po | 79 +++++++++++++++++++++++++++++++++++
 addons/project/i18n/zh_CN.po  | 22 +++++-----
 2 files changed, 90 insertions(+), 11 deletions(-)
 create mode 100644 addons/base_status/i18n/sv.po

diff --git a/addons/base_status/i18n/sv.po b/addons/base_status/i18n/sv.po
new file mode 100644
index 00000000000..eb1b42e6a53
--- /dev/null
+++ b/addons/base_status/i18n/sv.po
@@ -0,0 +1,79 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+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: 2013-07-08 15:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-07-09 05:16+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Fel !"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:166
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr "%s har <b>öppnats</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:199
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr "%s har <b>förnyats</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"Du kan inte eskalera längre, du har nått toppen för denna säljlags-kategori."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:193
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr "%s är nu <b>pågående</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr "%s har <b>avbrutits</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"Du har nått översta nivån för din säljlagskategori.\n"
+"Det går därför inte att eskalera ytterligare."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:181
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr "%s har <b>stängts</b>."
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index f10c806a653..a34ee77a749 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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: 2013-07-07 05:02+0000\n"
+"PO-Revision-Date: 2013-07-08 14:09+0000\n"
 "Last-Translator: Alan <shuchuan.wu@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: 2013-07-08 05:25+0000\n"
+"X-Launchpad-Export-Date: 2013-07-09 05:16+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: project
@@ -91,7 +91,7 @@ msgstr "警告！"
 #: help:project.project,message_unread:0
 #: help:project.task,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息，勾选此项"
+msgstr "如果选中此项，你需要注意新的消息。"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -101,12 +101,12 @@ msgstr "完成任务"
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "任务完成"
+msgstr "任务已经完成"
 
 #. module: project
 #: view:res.partner:0
 msgid "False"
-msgstr "否"
+msgstr "错误的"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -121,7 +121,7 @@ msgstr "辅助核算科目"
 #. module: project
 #: field:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Manage time estimation on tasks"
-msgstr "估计管理任务的时间"
+msgstr "管理任务的估计时间"
 
 #. module: project
 #: help:project.project,message_summary:0
@@ -129,7 +129,7 @@ msgstr "估计管理任务的时间"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
+msgstr "保存对话概要信息，这些概要信息将为直接以HTML格式插入到看板视图。"
 
 #. module: project
 #: code:addons/project/project.py:444
@@ -163,12 +163,12 @@ msgstr "重设项目"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr "进行中任务"
+msgstr "进行中的任务"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "结束任务和全部要做任务的百分比"
+msgstr "已结束任务和未结束任务的百分比。"
 
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
@@ -224,7 +224,7 @@ msgstr "分配给"
 #: model:mail.message.subtype,name:project.mt_project_task_closed
 #: model:mail.message.subtype,name:project.mt_task_closed
 msgid "Task Done"
-msgstr ""
+msgstr "已完成的任务"
 
 #. module: project
 #: view:project.project:0
@@ -265,7 +265,7 @@ msgstr "任务分派"
 #: model:mail.message.subtype,name:project.mt_project_task_started
 #: model:mail.message.subtype,name:project.mt_task_started
 msgid "Task Started"
-msgstr ""
+msgstr "已开始的任务"
 
 #. module: project
 #: view:project.task:0

From 1d6ba9a813da43e94053e2270dc4ccfcd8584d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 13:34:39 +0200
Subject: [PATCH 124/197] [DOC] hr_recruitment: added some documentation

bzr revid: tde@openerp.com-20130709113439-twm0zw2d5dwa14jx
---
 addons/hr_recruitment/doc/changelog.rst    |  8 +++-
 addons/hr_recruitment/doc/index.rst        |  4 +-
 addons/hr_recruitment/doc/stage_status.rst | 48 ++++++++++++++++++----
 3 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
index 9d9b57b495a..a651452d70d 100644
--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -6,5 +6,9 @@ Changelog
 `trunk (saas-2)`
 ----------------
 
-- ``hr_recruitment``: removed inheritance from ``base_stage`` class and removed
-  ``state`` field.
\ No newline at end of file
+- Stage/state update
+
+  - ``hr.applicant``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Updated reports.
+  - ``hr.recruitment.stage``: removed ``state`` field.
diff --git a/addons/hr_recruitment/doc/index.rst b/addons/hr_recruitment/doc/index.rst
index f6aac6e8a04..d9e83fc9c10 100644
--- a/addons/hr_recruitment/doc/index.rst
+++ b/addons/hr_recruitment/doc/index.rst
@@ -5,8 +5,8 @@ HR Recruitment DevDoc
 Hr Recruitment module documentation
 ===================================
 
-Hr Recruitment documentation topics
-'''''''''''''''''''''''''''''''''''
+Documentation topics
+''''''''''''''''''''
 
 .. toctree::
    :maxdepth: 1
diff --git a/addons/hr_recruitment/doc/stage_status.rst b/addons/hr_recruitment/doc/stage_status.rst
index 1008dbe14fb..111c43db250 100644
--- a/addons/hr_recruitment/doc/stage_status.rst
+++ b/addons/hr_recruitment/doc/stage_status.rst
@@ -3,18 +3,52 @@
 Stage and Status
 ================
 
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
 Stage
 +++++
 
-.. versionchanged:: 8.0 saas-2 state/stage cleaning
-
 This revision removed the concept of state on hr.applicant objects. The ``state``
-field has been totally removed and replaced by stages, using ``stage_id``.
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
 
-Convention
-++++++++++
+ - ``hr.applicant`` now use only stages. However a convention still exists about
+   'New' stage. An applicant is consdered as ``new`` when it has the following
+   properties:
 
-A ``hr.recruitment.stage`` is ``new`` when it has the following properties:
+   - ``stage_id and stage_id.sequence = 1``
 
- - ``sequence`` = 1
+ - ``hr.recruitment.stage`` do not have any ``state`` field anymore. 
+ - ``hr.recruitment.report`` do not have any ``state`` field anymore. 
 
+By default a newly created applicant be in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+Employee creation is still feasible directly from a link button in the form view.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``hr.recruitment.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``hr.applicant``:
+
+ - ``mt_applicant_new``: new applicants. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_applicant_stage_changed``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+
+The following subtype is trigerred on ``hr.job``:
+
+ - ``mt_job_new_applicant``: new applicant in the job.

From ab3ce53a10856b710821731a2e981d817260995c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 13:51:29 +0200
Subject: [PATCH 125/197] [DOC] Added a forgotten line.

bzr revid: tde@openerp.com-20130709115129-603b726vaim86mda
---
 addons/hr_recruitment/doc/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
index a651452d70d..9721d9bd9dd 100644
--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -10,5 +10,5 @@ Changelog
 
   - ``hr.applicant``: removed inheritance from ``base_stage`` class and removed
     ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
-    modification. Updated reports.
+    modification. Removed ``date`` field not used anywhere. Updated reports.
   - ``hr.recruitment.stage``: removed ``state`` field.

From 547ae01d6e82bc937fef9028f070c25166cc565e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 13:55:11 +0200
Subject: [PATCH 126/197] [DOC] Added forgotten change on changelog.

bzr revid: tde@openerp.com-20130709115511-q0xjtpvs9b248wvy
---
 addons/hr_recruitment/doc/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
index 9721d9bd9dd..404b94ee6d1 100644
--- a/addons/hr_recruitment/doc/changelog.rst
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -12,3 +12,5 @@ Changelog
     ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
     modification. Removed ``date`` field not used anywhere. Updated reports.
   - ``hr.recruitment.stage``: removed ``state`` field.
+
+- Removed ``hired.employee`` wizard.

From 5aad20b9a64407eb75130f02eb852cfbc9e82738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 14:37:40 +0200
Subject: [PATCH 127/197] [IMP] fields: date, datetime: added MONTHS variable
 holding list of (month_number, month_name)

bzr revid: tde@openerp.com-20130709123740-18t5yhbtoru6vpne
---
 openerp/osv/fields.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 4e8eedf718b..3f0642c9229 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -270,6 +270,21 @@ class float(_column):
 class date(_column):
     _type = 'date'
 
+    MONTHS = [
+        ('01', 'January'),
+        ('02', 'February'),
+        ('03', 'March'),
+        ('04', 'April'),
+        ('05', 'May'),
+        ('06', 'June'),
+        ('07', 'July'),
+        ('08', 'August'),
+        ('09', 'September'),
+        ('10', 'October'),
+        ('11', 'November'),
+        ('12', 'December')
+    ]
+
     @staticmethod
     def today(*args):
         """ Returns the current date in a format fit for being a
@@ -319,6 +334,22 @@ class date(_column):
 
 class datetime(_column):
     _type = 'datetime'
+
+    MONTHS = [
+        ('01', 'January'),
+        ('02', 'February'),
+        ('03', 'March'),
+        ('04', 'April'),
+        ('05', 'May'),
+        ('06', 'June'),
+        ('07', 'July'),
+        ('08', 'August'),
+        ('09', 'September'),
+        ('10', 'October'),
+        ('11', 'November'),
+        ('12', 'December')
+    ]
+
     @staticmethod
     def now(*args):
         """ Returns the current datetime in a format fit for being a

From 6eb58cffe0f38f8fdc385c47901039c4eb34c192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 14:52:20 +0200
Subject: [PATCH 128/197] [DOC] project: added doc directory + changelog +
 stage explanation

bzr revid: tde@openerp.com-20130709125220-hl7hwo2phc7t0tqr
---
 addons/project/doc/changelog.rst    | 16 +++++++++
 addons/project/doc/index.rst        | 22 ++++++++++++
 addons/project/doc/stage_status.rst | 54 +++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 addons/project/doc/changelog.rst
 create mode 100644 addons/project/doc/index.rst
 create mode 100644 addons/project/doc/stage_status.rst

diff --git a/addons/project/doc/changelog.rst b/addons/project/doc/changelog.rst
new file mode 100644
index 00000000000..ed739d1757e
--- /dev/null
+++ b/addons/project/doc/changelog.rst
@@ -0,0 +1,16 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``project.task``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Updated reports.
+  - ``project.task.type``: removed ``state`` field.
+
+- Removed ``hired.employee`` wizard.
diff --git a/addons/project/doc/index.rst b/addons/project/doc/index.rst
new file mode 100644
index 00000000000..118b8e7006b
--- /dev/null
+++ b/addons/project/doc/index.rst
@@ -0,0 +1,22 @@
+=====================
+Project DevDoc
+=====================
+
+Project module documentation
+===================================
+
+Documentation topics
+''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/project/doc/stage_status.rst b/addons/project/doc/stage_status.rst
new file mode 100644
index 00000000000..f02b3eddbaa
--- /dev/null
+++ b/addons/project/doc/stage_status.rst
@@ -0,0 +1,54 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
++++++
+
+This revision removed the concept of state on project.task objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``project.task`` now use only stages. However a convention still exists about
+   'New' stage. A task is consdered as ``new`` when it has the following
+   properties:
+
+   - ``stage_id and stage_id.sequence = 1``
+
+ - ``project.task.type`` do not have any ``state`` field anymore. 
+ - ``project.task.report`` do not have any ``state`` field anymore. 
+
+By default a newly created task is in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``project.task.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``project.task``:
+
+ - ``mt_task_new``: new tasks. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_task_stage``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+ - ``mt_task_assigned``: TODO
+ - ``mt_task_blocked``: TODO
+
+Those subtypes are also available on the ``project.project`` model and are used
+for the auto subscription.

From 6310275541f07446e937b58f86e7a7f0cbc78e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 15:38:59 +0200
Subject: [PATCH 129/197] [FIX] project, project_issue: fixed
 get_default_partner not defined anymore, because of the inheritance towards
 base_stage removal.

bzr revid: tde@openerp.com-20130709133859-jy4aqz6tsrtsqv81
---
 addons/project/project.py             | 2 +-
 addons/project_issue/project_issue.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 32841cde927..3f80a075da9 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -582,7 +582,7 @@ class task(osv.osv):
             project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
             if project and project.partner_id:
                 return project.partner_id.id
-        return super(task, self)._get_default_partner(cr, uid, context=context)
+        return False
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 501202a3791..cc71ae7cfa9 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -75,7 +75,7 @@ class project_issue(osv.Model):
             project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
             if project and project.partner_id:
                 return project.partner_id.id
-        return super(project_issue, self)._get_default_partner(cr, uid, context=context)
+        return False
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """

From 35c73992c5e69ebcd3df7563c249dcf944d9d182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 9 Jul 2013 15:43:41 +0200
Subject: [PATCH 130/197] [DOC] Added changelog for this branch

bzr revid: tde@openerp.com-20130709134341-9qf3blsiq2sd8l81
---
 doc/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index 70d959941ad..1c07f1e391c 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 `trunk`
 -------
 
+- Added MONTHS attribute on fields.date and fields.datetime, holding the list
+  (month_number, month_name)
 - Almost removed ``LocalService()``. For reports,
   ``openerp.osv.orm.Model.print_report()`` can be used. For workflows, see
   :ref:`orm-workflows`.

From 9b41f8fadcf09935e02a115316002c3303c209bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Jul 2013 12:15:08 +0200
Subject: [PATCH 131/197] [TESTS] project: refactored tests. Moved surviving
 yml tests into unittest; added mailgateway test.

bzr revid: tde@openerp.com-20130710101508-62eh89gzq22qvpq5
---
 addons/project/__openerp__.py                 |   3 -
 addons/project/security/ir.model.access.csv   |   1 +
 addons/project/test/project_demo.yml          |  12 --
 addons/project/test/project_process.yml       |  70 --------
 addons/project/test/task_process.yml          |  23 ---
 addons/project/tests/__init__.py              |  28 +++
 addons/project/tests/test_project_base.py     |  92 ++++++++++
 addons/project/tests/test_project_flow.py     | 160 ++++++++++++++++++
 .../security/ir.model.access.csv              |   3 -
 9 files changed, 281 insertions(+), 111 deletions(-)
 delete mode 100644 addons/project/test/project_demo.yml
 delete mode 100644 addons/project/test/project_process.yml
 delete mode 100644 addons/project/test/task_process.yml
 create mode 100644 addons/project/tests/__init__.py
 create mode 100644 addons/project/tests/test_project_base.py
 create mode 100644 addons/project/tests/test_project_flow.py

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 634f79d12ac..f5ba24c41cb 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -77,9 +77,6 @@ Dashboard / Reports for Project Management will include:
     ],
     'demo': ['project_demo.xml'],
     'test': [
-        'test/project_demo.yml',
-        'test/project_process.yml',
-        'test/task_process.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index a76faa0fcce..c88fb276fcb 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -19,6 +19,7 @@ access_project_task_history,project.task.history project,project.model_project_t
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
+access_resource_calendar_leaves_user,resource.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_project_category,project.project_category,model_project_category,,1,0,0,0
 access_project_category_manager,project.project_category,model_project_category,project.group_project_manager,1,1,1,1
 access_mail_alias,mail.alias,mail.model_mail_alias,project.group_project_manager,1,1,1,1
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
deleted file mode 100644
index 5f6acbb913e..00000000000
--- a/addons/project/test/project_demo.yml
+++ /dev/null
@@ -1,12 +0,0 @@
--
-  !record {model: project.project, id: project_project_1, view: False}:
-    partner_id: base.res_partner_2
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    remaining_hours: 10.00
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    planned_hours: 10.00
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    project_id: project_project_1
\ No newline at end of file
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
deleted file mode 100644
index c2a5c072e9d..00000000000
--- a/addons/project/test/project_process.yml
+++ /dev/null
@@ -1,70 +0,0 @@
--
-  In order to Test Process of Project Management,
--
-  I create duplicate template.
--
-  !python {model: project.project}: |
-     new_template = self.duplicate_template(cr, uid, [ref("project_project_1")])
-     assert new_template, "duplicate template is not created"
-     template = self.browse(cr, uid, new_template['res_id'], context=context)
-     assert template.state == 'open', "Duplicate template must be in open state."
--
-  I convert template into real Project.
--
-  !python {model: project.project}: |
-     self.reset_project(cr, uid, [ref("project_project_1")])
--
-  I check project details after convert from template.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be active}:
-    - state == "open"
--
-  I put project in pending.
--
-  !python {model: project.project}: |
-    self.set_pending(cr, uid, [ref("project_project_1")])
--
-  I check state after put in pending.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be in pending state}:
-    - state == "pending"
--
-  I re-open the project.
--
-  !python {model: project.project}: |
-      self.set_open(cr, uid, [ref("project_project_1")])
--
-  I check state after reopen.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be open.}:
-    - state == "open"
--
-  I close the project.
--
-  !python {model: project.project}: |
-    self.set_done(cr, uid, [ref("project_project_1")])
--
-  I check state after closed.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be close.}:
-    - state == "close"
--
-  I set project into template.
--
-  !python {model: project.project}: |
-    self.set_template(cr, uid, [ref("project_project_1")])
--
-  I schedule tasks of project.
--
-  !python {model: project.project}: |
-    self.schedule_tasks(cr, uid, [ref("project_project_1")], context=context)
--
-  I copy the tasks of project.
--
-  !python {model: project.project}: |
-    self.copy(cr, uid, ref("project_project_1"))
--
-  I cancel Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_project_2")])
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
deleted file mode 100644
index 20113ed8bef..00000000000
--- a/addons/project/test/task_process.yml
+++ /dev/null
@@ -1,23 +0,0 @@
--
-  I open a delegation wizard.
--
-  !python {model: project.task}: |
-    context.update({"active_id": ref("project_task_1")})
--
-  ze
--
-  !record {model: project.task.delegate, id: delegate_id}:
-    user_id: base.user_demo
-    planned_hours: 12.0
-    planned_hours_me: 2.0
--
-  Now I delegate task to team member.
--
-  !python {model: project.task.delegate}: |
-    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
--
-  I check delegated task details.
--
-  !python {model: project.task}: |
-    task = self.browse(cr, uid, ref("project_task_1"), context=context)
-    assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
diff --git a/addons/project/tests/__init__.py b/addons/project/tests/__init__.py
new file mode 100644
index 00000000000..4d3163d6dc6
--- /dev/null
+++ b/addons/project/tests/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_project_flow
+
+checks = [
+    test_project_flow,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/tests/test_project_base.py b/addons/project/tests/test_project_base.py
new file mode 100644
index 00000000000..4d1b77f46c7
--- /dev/null
+++ b/addons/project/tests/test_project_base.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests.test_mail_base import TestMailBase
+
+
+class TestProjectBase(TestMailBase):
+
+    def setUp(self):
+        super(TestProjectBase, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.project_project = self.registry('project.project')
+        self.project_task = self.registry('project.task')
+        self.project_task_delegate = self.registry('project.task.delegate')
+
+        # Find Project User group
+        group_project_user_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'project', 'group_project_user')
+        self.group_project_user_id = group_project_user_ref and group_project_user_ref[1] or False
+
+        # Find Project Manager group
+        group_project_manager_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'project', 'group_project_manager')
+        self.group_project_manager_id = group_project_manager_ref and group_project_manager_ref[1] or False
+
+        # Test partners to use through the various tests
+        self.project_partner_id = self.res_partner.create(cr, uid, {
+            'name': 'Gertrude AgrolaitPartner',
+            'email': 'gertrude.partner@agrolait.com',
+        })
+        self.email_partner_id = self.res_partner.create(cr, uid, {
+            'name': 'Patrick Ratatouille',
+            'email': 'patrick.ratatouille@agrolait.com',
+        })
+
+        # Test users to use through the various tests
+        self.user_projectuser_id = self.res_users.create(cr, uid, {
+            'name': 'Armande ProjectUser',
+            'login': 'Armande',
+            'alias_name': 'armande',
+            'email': 'armande.projectuser@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id, self.group_project_user_id])]
+        })
+        self.user_projectmanager_id = self.res_users.create(cr, uid, {
+            'name': 'Bastien ProjectManager',
+            'login': 'bastien',
+            'alias_name': 'bastien',
+            'email': 'bastien.projectmanager@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id, self.group_project_manager_id])]
+        })
+        self.user_projectuser = self.res_users.browse(cr, uid, self.user_projectuser_id)
+        self.user_projectmanager = self.res_users.browse(cr, uid, self.user_projectmanager_id)
+        self.partner_projectuser_id = self.user_projectuser.partner_id.id
+        self.partner_projectmanager_id = self.user_projectmanager.partner_id.id
+
+        # Test 'Pigs' project
+        self.project_pigs_id = self.project_project.create(cr, uid, {
+            'name': 'Pigs',
+            'privacy_visibility': 'public',
+            'alias_name': 'project+pigs',
+            'partner_id': self.partner_raoul_id,
+        }, {'mail_create_nolog': True})
+
+        # Already-existing tasks in Pigs
+        self.task_1_id = self.project_task.create(cr, uid, {
+            'name': 'Pigs UserTask',
+            'user_id': self.user_projectuser_id,
+            'project_id': self.project_pigs_id,
+        }, {'mail_create_nolog': True})
+        self.task_2_id = self.project_task.create(cr, uid, {
+            'name': 'Pigs ManagerTask',
+            'user_id': self.user_projectmanager_id,
+            'project_id': self.project_pigs_id,
+        }, {'mail_create_nolog': True})
diff --git a/addons/project/tests/test_project_flow.py b/addons/project/tests/test_project_flow.py
new file mode 100644
index 00000000000..c0d7748ef83
--- /dev/null
+++ b/addons/project/tests/test_project_flow.py
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.project.tests.test_project_base import TestProjectBase
+from openerp.osv.orm import except_orm
+from openerp.tools import mute_logger
+
+
+EMAIL_TPL = """Return-Path: <whatever-2a840@postmaster.twitter.com>
+X-Original-To: {email_to}
+Delivered-To: {email_to}
+To: {email_to}
+Received: by mail1.openerp.com (Postfix, from userid 10002)
+    id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
+Message-ID: {msg_id}
+Date: Tue, 29 Nov 2011 12:43:21 +0530
+From: {email_from}
+MIME-Version: 1.0
+Subject: {subject}
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+
+Hello,
+
+This email should create a new entry in your module. Please check that it
+effectively works.
+
+Thanks,
+
+--
+Raoul Boitempoils
+Integrator at Agrolait"""
+
+
+class TestProjectFlow(TestProjectBase):
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_00_project_process(self):
+        """ Testing project management """
+        cr, uid, user_projectuser_id, user_projectmanager_id, project_pigs_id = self.cr, self.uid, self.user_projectuser_id, self.user_projectmanager_id, self.project_pigs_id
+
+        # ProjectUser: set project as template -> raise
+        self.assertRaises(except_orm, self.project_project.set_template, cr, user_projectuser_id, [project_pigs_id])
+
+        # Other tests are done using a ProjectManager
+        project = self.project_project.browse(cr, user_projectmanager_id, project_pigs_id)
+        self.assertNotEqual(project.state, 'template', 'project: incorrect state, should not be a template')
+
+        # Set test project as template
+        self.project_project.set_template(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'template', 'project: set_template: project state should be template')
+        self.assertEqual(len(project.tasks), 0, 'project: set_template: project tasks should have been set inactive')
+
+        # Duplicate template
+        new_template_act = self.project_project.duplicate_template(cr, user_projectmanager_id, [project_pigs_id])
+        new_project = self.project_project.browse(cr, user_projectmanager_id, new_template_act['res_id'])
+        self.assertEqual(new_project.state, 'open', 'project: incorrect duplicate_template')
+        self.assertEqual(len(new_project.tasks), 2, 'project: duplicating a project template should duplicate its tasks')
+
+        # Convert into real project
+        self.project_project.reset_project(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'open', 'project: resetted project should be in open state')
+        self.assertEqual(len(project.tasks), 2, 'project: reset_project: project tasks should have been set active')
+
+        # Put as pending
+        self.project_project.set_pending(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'pending', 'project: should be in pending state')
+
+        # Re-open
+        self.project_project.set_open(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'open', 'project: reopened project should be in open state')
+
+        # Close project
+        self.project_project.set_done(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'close', 'project: closed project should be in close state')
+
+        # Re-open
+        self.project_project.set_open(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+
+        # Re-convert into a template and schedule tasks
+        self.project_project.set_template(cr, user_projectmanager_id, [project_pigs_id])
+        self.project_project.schedule_tasks(cr, user_projectmanager_id, [project_pigs_id])
+
+        # Copy the project
+        new_project_id = self.project_project.copy(cr, user_projectmanager_id, project_pigs_id)
+        new_project = self.project_project.browse(cr, user_projectmanager_id, new_project_id)
+        self.assertEqual(len(new_project.tasks), 2, 'project: copied project should have copied task')
+
+        # Cancel the project
+        self.project_project.set_cancel(cr, user_projectmanager_id, [project_pigs_id])
+        self.assertEqual(project.state, 'cancelled', 'project: cancelled project should be in cancel state')
+
+    def test_10_task_process(self):
+        """ Testing task creation and management """
+        cr, uid, user_projectuser_id, user_projectmanager_id, project_pigs_id = self.cr, self.uid, self.user_projectuser_id, self.user_projectmanager_id, self.project_pigs_id
+
+        def format_and_process(template, email_to='project+pigs@mydomain.com, other@gmail.com', subject='Frogs',
+                               email_from='Patrick Ratatouille <patrick.ratatouille@agrolait.com>',
+                               msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>'):
+            self.assertEqual(self.project_task.search(cr, uid, [('name', '=', subject)]), [])
+            mail = template.format(email_to=email_to, subject=subject, email_from=email_from, msg_id=msg_id)
+            self.mail_thread.message_process(cr, uid, None, mail)
+            return self.project_task.search(cr, uid, [('name', '=', subject)])
+
+        # Do: incoming mail from an unknown partner on an alias creates a new task 'Frogs'
+        frogs = format_and_process(EMAIL_TPL)
+
+        # Test: one task created by mailgateway administrator
+        self.assertEqual(len(frogs), 1, 'project: message_process: a new project.task should have been created')
+        task = self.project_task.browse(cr, user_projectuser_id, frogs[0])
+        res = self.project_task.perm_read(cr, uid, [task.id], details=False)
+        self.assertEqual(res[0].get('create_uid'), uid,
+                         'project: message_process: task should have been created by uid as alias_user_id is False on the alias')
+        # Test: messages
+        self.assertEqual(len(task.message_ids), 2,
+                         'project: message_process: newly created task should have 2 messages: creation and email')
+        self.assertEqual(task.message_ids[1].subtype_id.name, 'Task Created',
+                         'project: message_process: first message of new task should have Task Created subtype')
+        self.assertEqual(task.message_ids[0].author_id.id, self.email_partner_id,
+                         'project: message_process: second message should be the one from Agrolait (partner failed)')
+        self.assertEqual(task.message_ids[0].subject, 'Frogs',
+                         'project: message_process: second message should be the one from Agrolait (subject failed)')
+        # Test: task content
+        self.assertEqual(task.name, 'Frogs', 'project_task: name should be the email subject')
+        self.assertEqual(task.project_id.id, self.project_pigs_id, 'project_task: incorrect project')
+
+        # Open the delegation wizard
+        delegate_id = self.project_task_delegate.create(cr, user_projectuser_id, {
+            'user_id': user_projectuser_id,
+            'planned_hours': 12.0,
+            'planned_hours_me': 2.0,
+        }, {'active_id': task.id})
+        self.project_task_delegate.delegate(cr, user_projectuser_id, [delegate_id], {'active_id': task.id})
+
+        # Check delegation details
+        task.refresh()
+        self.assertEqual(task.planned_hours, 2, 'project_task_delegate: planned hours is not correct after delegation')
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 2a00088b8f4..82bfab460cb 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -4,9 +4,6 @@ access_project_user_allocation,project.user.allocation,model_project_user_alloca
 access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0
-access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
-
-

From 4b0baa3615aee3e528ccef0b60142ba7acb7976f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Jul 2013 14:25:26 +0200
Subject: [PATCH 132/197] [CLEAN] project, project_issue, project_mrp: misc
 cleaning of code + fixed bug in project_mrp + re-added commentred tests in
 project_mrp

bzr revid: tde@openerp.com-20130710122526-tf87avul7huqgigg
---
 .../tests/test_access_rights.py               | 146 +++++++-----------
 addons/project/doc/changelog.rst              |   2 +-
 addons/project/project.py                     |  54 ++-----
 addons/project/project_demo.xml               |  10 --
 addons/project/project_view.xml               |  10 +-
 addons/project/report/project_report_view.xml |  27 ++--
 addons/project/tests/test_project_base.py     |   7 +
 addons/project/tests/test_project_flow.py     |   1 +
 addons/project_issue/project_issue.py         |  37 +++--
 addons/project_issue/project_issue_data.xml   |   3 +-
 addons/project_issue/project_issue_view.xml   |   6 +-
 .../report/project_issue_report.py            |   7 +-
 addons/project_mrp/project_mrp.py             |   3 +-
 addons/project_mrp/project_mrp_demo.xml       |   4 +-
 addons/project_mrp/project_procurement.py     |   2 +-
 .../test/project_task_procurement.yml         |  72 ++++-----
 16 files changed, 155 insertions(+), 236 deletions(-)

diff --git a/addons/portal_project/tests/test_access_rights.py b/addons/portal_project/tests/test_access_rights.py
index a7d56cb3895..bbf029a72d7 100644
--- a/addons/portal_project/tests/test_access_rights.py
+++ b/addons/portal_project/tests/test_access_rights.py
@@ -19,35 +19,17 @@
 #
 ##############################################################################
 
+from openerp.addons.project.tests.test_project_base import TestProjectBase
 from openerp.osv.orm import except_orm
-from openerp.tests import common
 from openerp.tools import mute_logger
 
 
-class TestPortalProject(common.TransactionCase):
+class TestPortalProject(TestProjectBase):
 
     def setUp(self):
         super(TestPortalProject, self).setUp()
         cr, uid = self.cr, self.uid
 
-        # Useful models
-        self.project_project = self.registry('project.project')
-        self.project_task = self.registry('project.task')
-        self.res_users = self.registry('res.users')
-        self.res_partner = self.registry('res.partner')
-
-        # Find Employee group
-        group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
-        self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
-
-        # Find Project User group
-        group_project_user_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'project', 'group_project_user')
-        self.group_project_user_id = group_project_user_ref and group_project_user_ref[1] or False
-
-        # Find Project Manager group
-        group_project_manager_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'project', 'group_project_manager')
-        self.group_project_manager_id = group_project_manager_ref and group_project_manager_ref[1] or False
-
         # Find Portal group
         group_portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')
         self.group_portal_id = group_portal_ref and group_portal_ref[1] or False
@@ -56,37 +38,19 @@ class TestPortalProject(common.TransactionCase):
         group_anonymous_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_anonymous')
         self.group_anonymous_id = group_anonymous_ref and group_anonymous_ref[1] or False
 
-        # Test users to use through the various tests
-        self.user_alfred_id = self.res_users.create(cr, uid, {
-                        'name': 'Alfred EmployeeUser',
-                        'login': 'alfred',
-                        'alias_name': 'alfred',
-                        'groups_id': [(6, 0, [self.group_employee_id, self.group_project_user_id])]
-                    })
-        self.user_bert_id = self.res_users.create(cr, uid, {
-                        'name': 'Bert Nobody',
-                        'login': 'bert',
-                        'alias_name': 'bert',
-                        'groups_id': [(6, 0, [])]
-                    })
-        self.user_chell_id = self.res_users.create(cr, uid, {
+        # # Test users to use through the various tests
+        self.user_portal_id = self.res_users.create(cr, uid, {
                         'name': 'Chell Portal',
                         'login': 'chell',
                         'alias_name': 'chell',
                         'groups_id': [(6, 0, [self.group_portal_id])]
                     })
-        self.user_donovan_id = self.res_users.create(cr, uid, {
+        self.user_anonymous_id = self.res_users.create(cr, uid, {
                         'name': 'Donovan Anonymous',
                         'login': 'donovan',
                         'alias_name': 'donovan',
                         'groups_id': [(6, 0, [self.group_anonymous_id])]
                     })
-        self.user_ernest_id = self.res_users.create(cr, uid, {
-                        'name': 'Ernest Manager',
-                        'login': 'ernest',
-                        'alias_name': 'ernest',
-                        'groups_id': [(6, 0, [self.group_project_manager_id])]
-                    })
 
         # Test 'Pigs' project
         self.project_pigs_id = self.project_project.create(cr, uid,
@@ -103,13 +67,13 @@ class TestPortalProject(common.TransactionCase):
             {'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id},
             {'mail_create_nolog': True})
         self.task_4_id = self.project_task.create(cr, uid,
-            {'name': 'Test4', 'user_id': self.user_alfred_id, 'project_id': self.project_pigs_id},
+            {'name': 'Test4', 'user_id': self.user_projectuser_id, 'project_id': self.project_pigs_id},
             {'mail_create_nolog': True})
         self.task_5_id = self.project_task.create(cr, uid,
-            {'name': 'Test5', 'user_id': self.user_chell_id, 'project_id': self.project_pigs_id},
+            {'name': 'Test5', 'user_id': self.user_portal_id, 'project_id': self.project_pigs_id},
             {'mail_create_nolog': True})
         self.task_6_id = self.project_task.create(cr, uid,
-            {'name': 'Test6', 'user_id': self.user_donovan_id, 'project_id': self.project_pigs_id},
+            {'name': 'Test6', 'user_id': self.user_anonymous_id, 'project_id': self.project_pigs_id},
             {'mail_create_nolog': True})
 
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
@@ -122,53 +86,53 @@ class TestPortalProject(common.TransactionCase):
         # ----------------------------------------
 
         # Do: Alfred reads project -> ok (employee ok public)
-        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_2_id, self.task_3_id, self.task_4_id, self.task_5_id, self.task_6_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: project user cannot see all tasks of a public project')
         # Test: all project tasks readable
-        self.project_task.read(cr, self.user_alfred_id, task_ids, ['name'])
+        self.project_task.read(cr, self.user_projectuser_id, task_ids, ['name'])
         # Test: all project tasks writable
-        self.project_task.write(cr, self.user_alfred_id, task_ids, {'description': 'TestDescription'})
+        self.project_task.write(cr, self.user_projectuser_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Bert reads project -> crash, no group
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_bert_id, pigs_id, ['name'])
+            cr, self.user_none_id, pigs_id, ['name'])
         # Test: no project task visible
         self.assertRaises(except_orm, self.project_task.search,
-            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+            cr, self.user_none_id, [('project_id', '=', pigs_id)])
         # Test: no project task readable
         self.assertRaises(except_orm, self.project_task.read,
-            cr, self.user_bert_id, task_ids, ['name'])
+            cr, self.user_none_id, task_ids, ['name'])
         # Test: no project task writable
         self.assertRaises(except_orm, self.project_task.write,
-            cr, self.user_bert_id, task_ids, {'description': 'TestDescription'})
+            cr, self.user_none_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Chell reads project -> ok (portal ok public)
-        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: project user cannot see all tasks of a public project')
         # Test: all project tasks readable
-        self.project_task.read(cr, self.user_chell_id, task_ids, ['name'])
+        self.project_task.read(cr, self.user_portal_id, task_ids, ['name'])
         # Test: no project task writable
         self.assertRaises(except_orm, self.project_task.write,
-            cr, self.user_chell_id, task_ids, {'description': 'TestDescription'})
+            cr, self.user_portal_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Donovan reads project -> ok (anonymous ok public)
-        self.project_project.read(cr, self.user_donovan_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: anonymous user cannot see all tasks of a public project')
         # Test: all project tasks readable
-        self.project_task.read(cr, self.user_donovan_id, task_ids, ['name'])
+        self.project_task.read(cr, self.user_anonymous_id, task_ids, ['name'])
         # Test: no project task writable
         self.assertRaises(except_orm, self.project_task.write,
-            cr, self.user_donovan_id, task_ids, {'description': 'TestDescription'})
+            cr, self.user_anonymous_id, task_ids, {'description': 'TestDescription'})
 
         # ----------------------------------------
         # CASE2: portal project
@@ -176,39 +140,39 @@ class TestPortalProject(common.TransactionCase):
         self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'portal'})
 
         # Do: Alfred reads project -> ok (employee ok public)
-        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: project user cannot see all tasks of a portal project')
 
         # Do: Bert reads project -> crash, no group
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_bert_id, pigs_id, ['name'])
+            cr, self.user_none_id, pigs_id, ['name'])
         # Test: no project task searchable
         self.assertRaises(except_orm, self.project_task.search,
-            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+            cr, self.user_none_id, [('project_id', '=', pigs_id)])
 
         # Data: task follower
-        self.project_task.message_subscribe_users(cr, self.user_alfred_id, [self.task_1_id, self.task_3_id], [self.user_chell_id])
+        self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
 
         # Do: Chell reads project -> ok (portal ok public)
-        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
         # Test: only followed project tasks visible + assigned
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_3_id, self.task_5_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: portal user should see the followed tasks of a portal project')
 
         # Do: Donovan reads project -> ko (anonymous ko portal)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_donovan_id, pigs_id, ['name'])
+            cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of a portal project')
 
         # Data: task follower cleaning
-        self.project_task.message_unsubscribe_users(cr, self.user_alfred_id, [self.task_1_id, self.task_3_id], [self.user_chell_id])
+        self.project_task.message_unsubscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
 
         # ----------------------------------------
         # CASE3: employee project
@@ -216,29 +180,29 @@ class TestPortalProject(common.TransactionCase):
         self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'employees'})
 
         # Do: Alfred reads project -> ok (employee ok employee)
-        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_2_id, self.task_3_id, self.task_4_id, self.task_5_id, self.task_6_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: project user cannot see all tasks of an employees project')
 
         # Do: Bert reads project -> crash, no group
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_bert_id, pigs_id, ['name'])
+            cr, self.user_none_id, pigs_id, ['name'])
 
         # Do: Chell reads project -> ko (portal ko employee)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_chell_id, pigs_id, ['name'])
+            cr, self.user_portal_id, pigs_id, ['name'])
         # Test: no project task visible + assigned
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: portal user should not see tasks of an employees project, even if assigned')
 
         # Do: Donovan reads project -> ko (anonymous ko employee)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_donovan_id, pigs_id, ['name'])
+            cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of an employees project')
 
         # ----------------------------------------
@@ -248,53 +212,53 @@ class TestPortalProject(common.TransactionCase):
 
         # Do: Alfred reads project -> ko (employee ko followers)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_alfred_id, pigs_id, ['name'])
+            cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_4_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: employee user should not see tasks of a not-followed followers project, only assigned')
 
         # Do: Bert reads project -> crash, no group
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_bert_id, pigs_id, ['name'])
+            cr, self.user_none_id, pigs_id, ['name'])
 
         # Do: Chell reads project -> ko (portal ko employee)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_chell_id, pigs_id, ['name'])
+            cr, self.user_portal_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_5_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: portal user should not see tasks of a not-followed followers project, only assigned')
 
         # Do: Donovan reads project -> ko (anonymous ko employee)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_donovan_id, pigs_id, ['name'])
+            cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of a followers project')
 
         # Data: subscribe Alfred, Chell and Donovan as follower
-        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_alfred_id, self.user_chell_id, self.user_donovan_id])
-        self.project_task.message_subscribe_users(cr, self.user_alfred_id, [self.task_1_id, self.task_3_id], [self.user_chell_id, self.user_alfred_id])
+        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_projectuser_id, self.user_portal_id, self.user_anonymous_id])
+        self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id, self.user_projectuser_id])
 
         # Do: Alfred reads project -> ok (follower ok followers)
-        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: followed + assigned tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_3_id, self.task_4_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: employee user should not see followed + assigned tasks of a follower project')
 
         # Do: Chell reads project -> ok (follower ok follower)
-        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
         # Test: followed + assigned tasks visible
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_3_id, self.task_5_id])
         self.assertEqual(set(task_ids), test_task_ids,
                         'access rights: employee user should not see followed + assigned tasks of a follower project')
 
         # Do: Donovan reads project -> ko (anonymous ko follower even if follower)
         self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_donovan_id, pigs_id, ['name'])
+            cr, self.user_anonymous_id, pigs_id, ['name'])
diff --git a/addons/project/doc/changelog.rst b/addons/project/doc/changelog.rst
index ed739d1757e..ba5b242f1c0 100644
--- a/addons/project/doc/changelog.rst
+++ b/addons/project/doc/changelog.rst
@@ -13,4 +13,4 @@ Changelog
     modification. Updated reports.
   - ``project.task.type``: removed ``state`` field.
 
-- Removed ``hired.employee`` wizard.
+- Removed ``project.task.reevaluate`` wizard.
diff --git a/addons/project/project.py b/addons/project/project.py
index 3f80a075da9..7128b188432 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -25,11 +25,10 @@ import time
 
 from openerp import SUPERUSER_ID
 from openerp import tools
+from openerp.addons.resource.faces import task as Task
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-from openerp.addons.resource.faces import task as Task
-
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -319,8 +318,7 @@ class project(osv.osv):
     ]
 
     def set_template(self, cr, uid, ids, context=None):
-        res = self.setActive(cr, uid, ids, value=False, context=context)
-        return res
+        return self.setActive(cr, uid, ids, value=False, context=context)
 
     def set_done(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'close'}, context=context)
@@ -449,7 +447,6 @@ class project(osv.osv):
             if project.user_id and (project.user_id.id not in u_ids):
                 u_ids.append(project.user_id.id)
             for task in project.tasks:
-                # TDE: be sure about this, was if task.state in ('done','cancelled')
                 if task.stage_id and task.stage_id.fold:
                     continue
                 if task.user_id and (task.user_id.id not in u_ids):
@@ -516,7 +513,6 @@ def Project():
         for project in projects:
             project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
             for task in project.tasks:
-                # TDE CHECK: was if task.state in ('done', 'cancelled')
                 if task.stage_id and task.stage_id.fold:
                     continue
 
@@ -532,10 +528,6 @@ def Project():
                     }, context=context)
         return True
 
-    # ------------------------------------------------
-    # OpenChatter methods and notifications
-    # ------------------------------------------------
-
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -570,6 +562,9 @@ class task(osv.osv):
             'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
             'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id.sequence != 1,
         },
+        'user_id': {
+            'project.mt_task_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
+        },
         'kanban_state': {  # kanban state: tracked, but only block subtype
             'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
@@ -675,11 +670,11 @@ class task(osv.osv):
 
     def onchange_remaining(self, cr, uid, ids, remaining=0.0, planned=0.0):
         if remaining and not planned:
-            return {'value':{'planned_hours': remaining}}
+            return {'value': {'planned_hours': remaining}}
         return {}
 
     def onchange_planned(self, cr, uid, ids, planned=0.0, effective=0.0):
-        return {'value':{'remaining_hours': planned - effective}}
+        return {'value': {'remaining_hours': planned - effective}}
 
     def onchange_project(self, cr, uid, id, project_id, context=None):
         if project_id:
@@ -691,7 +686,7 @@ class task(osv.osv):
     def onchange_user_id(self, cr, uid, ids, user_id, context=None):
         vals = {}
         if user_id:
-            vals['date_start'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            vals['date_start'] = fields.datetime.now()
             vals['date_end'] = False
         return {'value': vals}
 
@@ -748,9 +743,7 @@ class task(osv.osv):
         'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True, select=True),
         'description': fields.text('Description'),
-        'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'),
-                                        ('1', 'Important'), ('0', 'Very important')],
-            string='Priority', select=True),
+        'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
                         domain="[('project_ids', '=', project_id)]"),
@@ -937,8 +930,7 @@ class task(osv.osv):
             search_domain = [('|')] * (len(section_ids) - 1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        if domain:
-            search_domain += list(domain)
+        search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
         if stage_ids:
@@ -952,7 +944,6 @@ class task(osv.osv):
         for task in tasks:
             if task.child_ids:
                 for child in task.child_ids:
-                    # TDE CHECK: was 'if child.state in ['draft', 'open', 'pending']''
                     if child.stage_id and not child.stage_id.fold:
                         raise osv.except_osv(_("Warning!"), _("Child task still open.\nPlease cancel or complete child task first."))
         return True
@@ -977,7 +968,7 @@ class task(osv.osv):
             delegated_task_id = self.copy(cr, uid, task.id, {
                 'name': delegate_data['name'],
                 'project_id': delegate_data['project_id'] and delegate_data['project_id'][0] or False,
-                'stage_id': delegate_data.get('stage_id', [False])[0],
+                'stage_id': delegate_data.get('stage_id') and delegate_data.get('stage_id')[0] or False,
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
                 'planned_hours': delegate_data['planned_hours'] or 0.0,
                 'parent_ids': [(6, 0, [task.id])],
@@ -997,7 +988,6 @@ class task(osv.osv):
 
     def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
         for task in self.browse(cr, uid, ids, context=context):
-            # TDE CHECK: was (task.state=='draft')
             if (task.stage_id and task.stage_id.sequence == 1) or (task.planned_hours == 0.0):
                 self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
         self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
@@ -1052,12 +1042,6 @@ class task(osv.osv):
         # user_id change: update date_start
         if vals.get('user_id'):
             vals['date_start'] = fields.datetime.now()
-        # generate a default stage based on context / given project value
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('project_id'):
-                ctx['default_project_id'] = vals['project_id']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
 
         # context: no_log, because subtype already handle this
         create_context = dict(context, mail_create_nolog=True)
@@ -1104,7 +1088,6 @@ class task(osv.osv):
         result = ""
         ident = ' '*ident
         for task in tasks:
-            # TDE CHECK: if task.state in ('done','cancelled'):
             if task.stage_id and task.stage_id.fold:
                 continue
             result += '''
@@ -1175,25 +1158,10 @@ class task(osv.osv):
                         update_vals[field] = float(res.group(2).lower())
                     except (ValueError, TypeError):
                         pass
-                # elif match.lower() == 'state' \
-                #         and res.group(2).lower() in ['cancel','close','draft','open','pending']:
-                #     act = 'do_%s' % res.group(2).lower()
         if act:
             getattr(self,act)(cr, uid, ids, context=context)
         return super(task,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
-    # TDE NOTE: FIXME
-    def project_task_reevaluate(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'):
-            return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'project.task.reevaluate',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-        return self.do_reopen(cr, uid, ids, context=context)
-
 class project_work(osv.osv):
     _name = "project.task.work"
     _description = "Project Task Work"
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index b53c3bb359f..12e373642fd 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -225,7 +225,6 @@
                     ref('project.project_category_04')])]"/>
             <field name="stage_id" ref="project_tt_merge"/>
         </record>
-        <!-- <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/> -->
 
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
@@ -237,7 +236,6 @@
             <field name="stage_id" ref="project_tt_merge"/>
             <field name="color">6</field>
         </record>
-        <!-- <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/> -->
 
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -248,7 +246,6 @@
             <field name="name">Design Use Cases</field>
             <field name="stage_id" ref="project_tt_analysis"/>
         </record>
-        <!-- <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/> -->
 
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -282,7 +279,6 @@
             <field name="name">Set target for all deparments</field>
              <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/> -->
 
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
@@ -293,7 +289,6 @@
             <field name="name">Integration of core components</field>
             <field name="stage_id" ref="project_tt_testing"/>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/> -->
 
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
@@ -315,7 +310,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_03')])]"/>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/> -->
 
         <record id="project_task_20" model="project.task">
             <field name="planned_hours">42.0</field>
@@ -325,7 +319,6 @@
             <field name="project_id" ref="project.project_project_4"/>
             <field name="name">Create new components</field>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/> -->
 
         <record id="project_task_21" model="project.task">
             <field name="planned_hours">14.0</field>
@@ -337,7 +330,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_04')])]"/>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/> -->
 
         <record id="project_task_22" model="project.task">
             <field name="planned_hours">12.0</field>
@@ -371,7 +363,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_01')])]"/>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/> -->
 
         <record id="project_task_25" model="project.task">
             <field name="sequence">20</field>
@@ -382,7 +373,6 @@
             <field name="name">Data importation + Doc</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <!-- <function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/> -->
 
         <record id="project_task_26" model="project.task">
             <field name="sequence">20</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e8ed9ed6ede..30943cff331 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,25 +18,23 @@
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
                     <field name="categ_ids"/>
-                    <field name="partner_id"/>
-                    <field name="project_id"/>
-                    <field name="user_id"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                     <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
-                    <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]"/>
-                    <separator/>
                     <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <separator/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
                         help="Show only tasks having a deadline"/>
+                    <field name="partner_id"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Last Action" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
+                        <filter string="Last Stage Update" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index ffaf23ccc4e..2e113dfd04f 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -11,18 +11,6 @@
             <field name="model">report.project.task.user</field>
             <field name="arch" type="xml">
                 <tree string="Tasks Analysis" create="false">
-                    <field name="nbr" sum='# of tasks'/>
-                    <field name="no_of_days" sum="# of Days"/>
-                    <field name="total_hours" sum='Total Hours'/>
-                    <field name="hours_planned" sum='Planned Hours'/>
-                    <field name="remaining_hours" sum='Remaining Hours'/>
-                    <field name="hours_effective" sum='Effective Hours'/>
-                    <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
-                    <field name="opening_days" sum='Days to Open'/>
-                    <field name="closing_days" sum='Days to Close'/>
-                    <field name="delay_endings_days" sum='OverPass delay'/>
-                    <field name="progress" sum='Progress' widget='progressbar'/>
-
                     <field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
@@ -37,6 +25,17 @@
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
+                    <field name="nbr" sum='# of tasks'/>
+                    <field name="no_of_days" sum="# of Days"/>
+                    <field name="total_hours" sum='Total Hours'/>
+                    <field name="hours_planned" sum='Planned Hours'/>
+                    <field name="remaining_hours" sum='Remaining Hours'/>
+                    <field name="hours_effective" sum='Effective Hours'/>
+                    <field name="hours_delay" sum='Avg. Plan.-Eff.'/>
+                    <field name="opening_days" sum='Days to Open'/>
+                    <field name="closing_days" sum='Days to Close'/>
+                    <field name="delay_endings_days" sum='OverPass delay'/>
+                    <field name="progress" sum='Progress' widget='progressbar'/>
                 </tree>
             </field>
         </record>
@@ -68,10 +67,6 @@
                     <field name="stage_id"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
                     <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
-                    <filter string="Done" name="done" domain="[('stage_id.fold', '=', True)]"
-                            help="Tasks beloging to a folded stage"/>
-                    <separator/>
-                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                     <separator/>
                     <filter string="My Task" domain="[('user_id','=',uid)]" />
                     <group expand="0" string="Extended Filters...">
diff --git a/addons/project/tests/test_project_base.py b/addons/project/tests/test_project_base.py
index 4d1b77f46c7..f82561766fe 100644
--- a/addons/project/tests/test_project_base.py
+++ b/addons/project/tests/test_project_base.py
@@ -66,6 +66,13 @@ class TestProjectBase(TestMailBase):
             'email': 'bastien.projectmanager@example.com',
             'groups_id': [(6, 0, [self.group_employee_id, self.group_project_manager_id])]
         })
+        self.user_none_id = self.res_users.create(cr, uid, {
+            'name': 'Charlie Avotbonkeur',
+            'login': 'charlie',
+            'alias_name': 'charlie',
+            'email': 'charlie.noone@example.com',
+            'groups_id': [(6, 0, [])]
+        })
         self.user_projectuser = self.res_users.browse(cr, uid, self.user_projectuser_id)
         self.user_projectmanager = self.res_users.browse(cr, uid, self.user_projectmanager_id)
         self.partner_projectuser_id = self.user_projectuser.partner_id.id
diff --git a/addons/project/tests/test_project_flow.py b/addons/project/tests/test_project_flow.py
index c0d7748ef83..a78bd6de156 100644
--- a/addons/project/tests/test_project_flow.py
+++ b/addons/project/tests/test_project_flow.py
@@ -146,6 +146,7 @@ class TestProjectFlow(TestProjectBase):
         # Test: task content
         self.assertEqual(task.name, 'Frogs', 'project_task: name should be the email subject')
         self.assertEqual(task.project_id.id, self.project_pigs_id, 'project_task: incorrect project')
+        self.assertEqual(task.stage_id.sequence, 1, 'project_task: should have a stage with sequence=1')
 
         # Open the delegation wizard
         delegate_id = self.project_task_delegate.create(cr, user_projectuser_id, {
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index cc71ae7cfa9..30ca08c0ae7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -19,14 +19,14 @@
 #
 ##############################################################################
 
-from openerp import SUPERUSER_ID
-from openerp.addons.crm import crm
 from datetime import datetime
-from openerp.osv import fields, osv, orm
-from openerp.tools.translate import _
-import time
+
+from openerp import SUPERUSER_ID
 from openerp import tools
+from openerp.addons.crm import crm
+from openerp.osv import fields, osv, orm
 from openerp.tools import html2plaintext
+from openerp.tools.translate import _
 
 class project_issue_version(osv.Model):
     _name = "project.issue.version"
@@ -50,24 +50,14 @@ class project_issue(osv.Model):
             'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
             'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
         },
-        # 'user_id': {
-        #     'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
-        # },
+        'user_id': {
+            'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
+        },
         'kanban_state': {
             'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
     }
 
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        if vals.get('project_id') and not context.get('default_project_id'):
-            context['default_project_id'] = vals.get('project_id')
-
-        # context: no_log, because subtype already handle this
-        create_context = dict(context, mail_create_nolog=True)
-        return super(project_issue, self).create(cr, uid, vals, context=create_context)
-
     def _get_default_partner(self, cr, uid, context=None):
         """ Override of base_stage to add project specific behavior """
         project_id = self._get_default_project_id(cr, uid, context)
@@ -389,6 +379,16 @@ class project_issue(osv.Model):
         return super(project_issue, self).copy(cr, uid, id, default=default,
                 context=context)
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('project_id') and not context.get('default_project_id'):
+            context['default_project_id'] = vals.get('project_id')
+
+        # context: no_log, because subtype already handle this
+        create_context = dict(context, mail_create_nolog=True)
+        return super(project_issue, self).create(cr, uid, vals, context=create_context)
+
     def write(self, cr, uid, ids, vals, context=None):
         # stage change: update date_last_stage_update
         if 'stage_id' in vals:
@@ -575,7 +575,6 @@ class project(osv.Model):
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
         for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
-            # TDE CHECK: if issue.state not in ('done', 'cancelled'):
             if issue.stage_id and not issue.stage_id.fold:
                 res[issue.project_id.id] += 1
         return res
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index f8c006beaff..25a336d4094 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <!-- <data noupdate="1"> -->
-    <data>
+    <data noupdate="1">
 
         <!-- Case type_id -->
         <!--    For Bugs    -->
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 8a535e3bc96..4c4d91850a3 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -141,15 +141,15 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|', '|', ('partner_id','child_of',self), ('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <field name="user_id"/>
-                    <field name="project_id"/>
-                    <field name="categ_ids"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
                     <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
+                    <field name="user_id"/>
+                    <field name="project_id"/>
+                    <field name="categ_ids"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 48c3628832a..496aa819ee2 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -31,12 +31,7 @@ class project_issue_report(osv.osv):
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'month':fields.selection(fields.date.MONTHS, 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'opening_date': fields.date('Date of Opening', readonly=True),
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 97e468ce51a..786da81dd34 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -56,11 +56,12 @@ class project_task(osv.osv):
 
     def write(self, cr, uid, ids, values, context=None):
         """ When closing tasks, validate subflows. """
+        res = super(project_task, self).write(cr, uid, ids, values, context=context)
         if values.get('stage_id'):
             stage = self.pool.get('project.task.type').browse(cr, uid, values.get('stage_id'), context=context)
             if stage.closed:
                 self._validate_subflows(cr, uid, ids, context=context)
-        return super(project_task, self).write(cr, uid, ids, values, context=context)
+        return res
 
 
 class product_product(osv.osv):
diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml
index 30d4cfba7ef..a840c0166e7 100644
--- a/addons/project_mrp/project_mrp_demo.xml
+++ b/addons/project_mrp/project_mrp_demo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
         <!--Resource: sale.order.line for services type product-->
 
         <record id="line_services" model="sale.order.line">
@@ -14,5 +13,8 @@
             <field name="type">make_to_order</field>
         </record>
 
+        <record id="project.project_tt_deployment" model="project.task.type">
+                <field name="closed" eval="True"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 3587e2167a2..8a6dc811d9a 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -39,7 +39,7 @@ class procurement_order(osv.osv):
         @return: True or False.
         """
         for p in self.browse(cr, uid, ids, context=context):
-            if (p.product_id.type == 'service') and (p.procure_method == 'make_to_order') and p.task_id and p.task_id.stage_id and p.task_id.stage_id.closed:
+            if (p.product_id.type == 'service') and (p.procure_method == 'make_to_order') and p.task_id and (p.task_id.stage_id and not p.task_id.stage_id.closed):
                 return False
         return True
 
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index 50199d40a11..b16cce7590d 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -9,39 +9,39 @@
     self.run_scheduler(cr, uid)
 -
   Now I check that task details after run procurement
-# -
-#   !python {model: procurement.order}: |
-#     from datetime import datetime
-#     procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-#     assert procurement_ids, "Procurement is not generated for Service Order Line."
-#     procurement = self.browse(cr, uid, procurement_ids[0], context=context)
-#     assert procurement.state != 'done' , "Procurement should not be closed."
-#     task = procurement.task_id
-#     assert task, "Task is not generated."
-#     # check whether task project either is the product's project, or corresponds to the analytic account of sale order
-#     project = task.project_id
-#     if procurement.product_id.project_id:
-#         assert project == procurement.product_id.project_id, "Project does not correspond."
-#     elif procurement.sale_line_id:
-#         account = procurement.sale_line_id.order_id.project_id
-#         assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
-#     planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
-#     assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
-#     assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
-#     if procurement.product_id.product_manager:
-#         assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
-# -
-#   I close that task.
-# -
-#   !python {model: project.task}: |
-#     task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-#     assert task_ids, "Task is not generated for Service Order Line."
-#     self.do_close(cr, uid, task_ids, context=context)
-# -
-#   I check procurement of Service Order Line after closed task.
-# -
-#   !python {model: procurement.order}: |
-#     procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-#     assert procurement_ids, "Procurement is not generated for Service Order Line."
-#     procurement = self.browse(cr, uid, procurement_ids[0], context=context)
-#     assert procurement.state == 'done' , "Procurement should be closed."
\ No newline at end of file
+-
+  !python {model: procurement.order}: |
+    from datetime import datetime
+    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+    assert procurement_ids, "Procurement is not generated for Service Order Line."
+    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
+    assert procurement.state != 'done' , "Procurement should not be closed."
+    task = procurement.task_id
+    assert task, "Task is not generated."
+    # check whether task project either is the product's project, or corresponds to the analytic account of sale order
+    project = task.project_id
+    if procurement.product_id.project_id:
+        assert project == procurement.product_id.project_id, "Project does not correspond."
+    elif procurement.sale_line_id:
+        account = procurement.sale_line_id.order_id.project_id
+        assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
+    planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
+    assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
+    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
+    if procurement.product_id.product_manager:
+        assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
+-
+  I close that task.
+-
+  !python {model: project.task}: |
+    task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+    assert task_ids, "Task is not generated for Service Order Line."
+    self.write(cr, uid, task_ids, {'stage_id': ref('project.project_tt_deployment')}, context=context)
+-
+  I check procurement of Service Order Line after closed task.
+-
+  !python {model: procurement.order}: |
+    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
+    assert procurement_ids, "Procurement is not generated for Service Order Line."
+    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
+    assert procurement.state == 'done' , "Procurement should be closed."
\ No newline at end of file

From 98ec74dd62cde93c91d3a05194845d4e8ea17e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Jul 2013 15:29:54 +0200
Subject: [PATCH 133/197] [IMP] project_issue: added date_last_stage_update in
 reports; removed month_last_stgae_update in project_task, only date is
 sufficient because reports already handle this correctly. Updated coding
 style of tests.

bzr revid: tde@openerp.com-20130710132954-tnr75cf33nti8r1u
---
 .../tests/test_access_rights.py               | 132 ++++++++----------
 .../tests/test_access_rights.py               | 109 +++++++--------
 addons/project/report/project_report.py       |   3 -
 addons/project/report/project_report_view.xml |   3 +-
 addons/project/tests/test_project_flow.py     |   6 +-
 .../report/project_issue_report.py            |   2 +
 .../report/project_issue_report_view.xml      |   2 +
 7 files changed, 114 insertions(+), 143 deletions(-)

diff --git a/addons/portal_project/tests/test_access_rights.py b/addons/portal_project/tests/test_access_rights.py
index bbf029a72d7..1b98a140b68 100644
--- a/addons/portal_project/tests/test_access_rights.py
+++ b/addons/portal_project/tests/test_access_rights.py
@@ -24,10 +24,10 @@ from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
 
-class TestPortalProject(TestProjectBase):
+class TestPortalProjectBase(TestProjectBase):
 
     def setUp(self):
-        super(TestPortalProject, self).setUp()
+        super(TestPortalProjectBase, self).setUp()
         cr, uid = self.cr, self.uid
 
         # Find Portal group
@@ -40,42 +40,37 @@ class TestPortalProject(TestProjectBase):
 
         # # Test users to use through the various tests
         self.user_portal_id = self.res_users.create(cr, uid, {
-                        'name': 'Chell Portal',
-                        'login': 'chell',
-                        'alias_name': 'chell',
-                        'groups_id': [(6, 0, [self.group_portal_id])]
-                    })
+            'name': 'Chell Portal',
+            'login': 'chell',
+            'alias_name': 'chell',
+            'groups_id': [(6, 0, [self.group_portal_id])]
+        })
         self.user_anonymous_id = self.res_users.create(cr, uid, {
-                        'name': 'Donovan Anonymous',
-                        'login': 'donovan',
-                        'alias_name': 'donovan',
-                        'groups_id': [(6, 0, [self.group_anonymous_id])]
-                    })
+            'name': 'Donovan Anonymous',
+            'login': 'donovan',
+            'alias_name': 'donovan',
+            'groups_id': [(6, 0, [self.group_anonymous_id])]
+        })
 
         # Test 'Pigs' project
-        self.project_pigs_id = self.project_project.create(cr, uid,
-            {'name': 'Pigs', 'privacy_visibility': 'public'},
-            {'mail_create_nolog': True})
+        self.project_pigs_id = self.project_project.create(cr, uid, {
+            'name': 'Pigs', 'privacy_visibility': 'public'}, {'mail_create_nolog': True})
         # Various test tasks
-        self.task_1_id = self.project_task.create(cr, uid,
-            {'name': 'Test1', 'user_id': False, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.task_2_id = self.project_task.create(cr, uid,
-            {'name': 'Test2', 'user_id': False, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.task_3_id = self.project_task.create(cr, uid,
-            {'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.task_4_id = self.project_task.create(cr, uid,
-            {'name': 'Test4', 'user_id': self.user_projectuser_id, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.task_5_id = self.project_task.create(cr, uid,
-            {'name': 'Test5', 'user_id': self.user_portal_id, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.task_6_id = self.project_task.create(cr, uid,
-            {'name': 'Test6', 'user_id': self.user_anonymous_id, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
+        self.task_1_id = self.project_task.create(cr, uid, {
+            'name': 'Test1', 'user_id': False, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.task_2_id = self.project_task.create(cr, uid, {
+            'name': 'Test2', 'user_id': False, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.task_3_id = self.project_task.create(cr, uid, {
+            'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.task_4_id = self.project_task.create(cr, uid, {
+            'name': 'Test4', 'user_id': self.user_projectuser_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.task_5_id = self.project_task.create(cr, uid, {
+            'name': 'Test5', 'user_id': self.user_portal_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.task_6_id = self.project_task.create(cr, uid, {
+            'name': 'Test6', 'user_id': self.user_anonymous_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
 
+
+class TestPortalProject(TestPortalProjectBase):
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_00_project_access_rights(self):
         """ Test basic project access rights, for project and portal_project """
@@ -91,48 +86,42 @@ class TestPortalProject(TestProjectBase):
         task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_2_id, self.task_3_id, self.task_4_id, self.task_5_id, self.task_6_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: project user cannot see all tasks of a public project')
+                         'access rights: project user cannot see all tasks of a public project')
         # Test: all project tasks readable
         self.project_task.read(cr, self.user_projectuser_id, task_ids, ['name'])
         # Test: all project tasks writable
         self.project_task.write(cr, self.user_projectuser_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Bert reads project -> crash, no group
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_none_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name'])
         # Test: no project task visible
-        self.assertRaises(except_orm, self.project_task.search,
-            cr, self.user_none_id, [('project_id', '=', pigs_id)])
+        self.assertRaises(except_orm, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)])
         # Test: no project task readable
-        self.assertRaises(except_orm, self.project_task.read,
-            cr, self.user_none_id, task_ids, ['name'])
+        self.assertRaises(except_orm, self.project_task.read, cr, self.user_none_id, task_ids, ['name'])
         # Test: no project task writable
-        self.assertRaises(except_orm, self.project_task.write,
-            cr, self.user_none_id, task_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_none_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Chell reads project -> ok (portal ok public)
         self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
         # Test: all project tasks visible
         task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: project user cannot see all tasks of a public project')
+                         'access rights: project user cannot see all tasks of a public project')
         # Test: all project tasks readable
         self.project_task.read(cr, self.user_portal_id, task_ids, ['name'])
         # Test: no project task writable
-        self.assertRaises(except_orm, self.project_task.write,
-            cr, self.user_portal_id, task_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_portal_id, task_ids, {'description': 'TestDescription'})
 
         # Do: Donovan reads project -> ok (anonymous ok public)
         self.project_project.read(cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: all project tasks visible
         task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: anonymous user cannot see all tasks of a public project')
+                         'access rights: anonymous user cannot see all tasks of a public project')
         # Test: all project tasks readable
         self.project_task.read(cr, self.user_anonymous_id, task_ids, ['name'])
         # Test: no project task writable
-        self.assertRaises(except_orm, self.project_task.write,
-            cr, self.user_anonymous_id, task_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_anonymous_id, task_ids, {'description': 'TestDescription'})
 
         # ----------------------------------------
         # CASE2: portal project
@@ -144,14 +133,12 @@ class TestPortalProject(TestProjectBase):
         # Test: all project tasks visible
         task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: project user cannot see all tasks of a portal project')
+                         'access rights: project user cannot see all tasks of a portal project')
 
         # Do: Bert reads project -> crash, no group
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_none_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name'])
         # Test: no project task searchable
-        self.assertRaises(except_orm, self.project_task.search,
-            cr, self.user_none_id, [('project_id', '=', pigs_id)])
+        self.assertRaises(except_orm, self.project_task.search, cr, self.user_none_id, [('project_id', '=', pigs_id)])
 
         # Data: task follower
         self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
@@ -162,11 +149,10 @@ class TestPortalProject(TestProjectBase):
         task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_3_id, self.task_5_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: portal user should see the followed tasks of a portal project')
+                         'access rights: portal user should see the followed tasks of a portal project')
 
         # Do: Donovan reads project -> ko (anonymous ko portal)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_anonymous_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
         task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of a portal project')
@@ -185,22 +171,19 @@ class TestPortalProject(TestProjectBase):
         task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_2_id, self.task_3_id, self.task_4_id, self.task_5_id, self.task_6_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: project user cannot see all tasks of an employees project')
+                         'access rights: project user cannot see all tasks of an employees project')
 
         # Do: Bert reads project -> crash, no group
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_none_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name'])
 
         # Do: Chell reads project -> ko (portal ko employee)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_portal_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_portal_id, pigs_id, ['name'])
         # Test: no project task visible + assigned
         task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: portal user should not see tasks of an employees project, even if assigned')
 
         # Do: Donovan reads project -> ko (anonymous ko employee)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_anonymous_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
         task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of an employees project')
@@ -211,30 +194,26 @@ class TestPortalProject(TestProjectBase):
         self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'followers'})
 
         # Do: Alfred reads project -> ko (employee ko followers)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_projectuser_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: no project task visible
         task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_4_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: employee user should not see tasks of a not-followed followers project, only assigned')
+                         'access rights: employee user should not see tasks of a not-followed followers project, only assigned')
 
         # Do: Bert reads project -> crash, no group
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_none_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_id, pigs_id, ['name'])
 
         # Do: Chell reads project -> ko (portal ko employee)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_portal_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_portal_id, pigs_id, ['name'])
         # Test: no project task visible
         task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_5_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: portal user should not see tasks of a not-followed followers project, only assigned')
+                         'access rights: portal user should not see tasks of a not-followed followers project, only assigned')
 
         # Do: Donovan reads project -> ko (anonymous ko employee)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_anonymous_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
         task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of a followers project')
@@ -249,7 +228,7 @@ class TestPortalProject(TestProjectBase):
         task_ids = self.project_task.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_3_id, self.task_4_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: employee user should not see followed + assigned tasks of a follower project')
+                         'access rights: employee user should not see followed + assigned tasks of a follower project')
 
         # Do: Chell reads project -> ok (follower ok follower)
         self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
@@ -257,8 +236,7 @@ class TestPortalProject(TestProjectBase):
         task_ids = self.project_task.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_task_ids = set([self.task_1_id, self.task_3_id, self.task_5_id])
         self.assertEqual(set(task_ids), test_task_ids,
-                        'access rights: employee user should not see followed + assigned tasks of a follower project')
+                         'access rights: employee user should not see followed + assigned tasks of a follower project')
 
         # Do: Donovan reads project -> ko (anonymous ko follower even if follower)
-        self.assertRaises(except_orm, self.project_project.read,
-            cr, self.user_anonymous_id, pigs_id, ['name'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
diff --git a/addons/portal_project_issue/tests/test_access_rights.py b/addons/portal_project_issue/tests/test_access_rights.py
index 28d337a4965..a7721b489a0 100644
--- a/addons/portal_project_issue/tests/test_access_rights.py
+++ b/addons/portal_project_issue/tests/test_access_rights.py
@@ -19,40 +19,36 @@
 #
 ##############################################################################
 
-from openerp.addons.portal_project.tests.test_access_rights import TestPortalProject
+from openerp.addons.portal_project.tests.test_access_rights import TestPortalProjectBase
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
 
-class TestPortalIssueProject(TestPortalProject):
+class TestPortalProjectBase(TestPortalProjectBase):
 
     def setUp(self):
-        super(TestPortalIssueProject, self).setUp()
+        super(TestPortalProjectBase, self).setUp()
         cr, uid = self.cr, self.uid
 
         # Useful models
         self.project_issue = self.registry('project.issue')
 
         # Various test issues
-        self.issue_1_id = self.project_issue.create(cr, uid,
-            {'name': 'Test1', 'user_id': False, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.issue_2_id = self.project_issue.create(cr, uid,
-            {'name': 'Test2', 'user_id': False, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.issue_3_id = self.project_issue.create(cr, uid,
-            {'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.issue_4_id = self.project_issue.create(cr, uid,
-            {'name': 'Test4', 'user_id': self.user_alfred_id, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.issue_5_id = self.project_issue.create(cr, uid,
-            {'name': 'Test5', 'user_id': self.user_chell_id, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
-        self.issue_6_id = self.project_issue.create(cr, uid,
-            {'name': 'Test6', 'user_id': self.user_donovan_id, 'project_id': self.project_pigs_id},
-            {'mail_create_nolog': True})
+        self.issue_1_id = self.project_issue.create(cr, uid, {
+            'name': 'Test1', 'user_id': False, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.issue_2_id = self.project_issue.create(cr, uid, {
+            'name': 'Test2', 'user_id': False, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.issue_3_id = self.project_issue.create(cr, uid, {
+            'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.issue_4_id = self.project_issue.create(cr, uid, {
+            'name': 'Test4', 'user_id': self.user_projectuser_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.issue_5_id = self.project_issue.create(cr, uid, {
+            'name': 'Test5', 'user_id': self.user_portal_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
+        self.issue_6_id = self.project_issue.create(cr, uid, {
+            'name': 'Test6', 'user_id': self.user_anonymous_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
 
+
+class TestPortalIssue(TestPortalProjectBase):
     @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
     def test_00_project_access_rights(self):
         """ Test basic project access rights, for project and portal_project """
@@ -64,42 +60,38 @@ class TestPortalIssueProject(TestPortalProject):
 
         # Do: Alfred reads project -> ok (employee ok public)
         # Test: all project issues visible
-        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_1_id, self.issue_2_id, self.issue_3_id, self.issue_4_id, self.issue_5_id, self.issue_6_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: project user cannot see all issues of a public project')
+                         'access rights: project user cannot see all issues of a public project')
         # Test: all project issues readable
-        self.project_issue.read(cr, self.user_alfred_id, issue_ids, ['name'])
+        self.project_issue.read(cr, self.user_projectuser_id, issue_ids, ['name'])
         # Test: all project issues writable
-        self.project_issue.write(cr, self.user_alfred_id, issue_ids, {'description': 'TestDescription'})
+        self.project_issue.write(cr, self.user_projectuser_id, issue_ids, {'description': 'TestDescription'})
 
         # Do: Bert reads project -> crash, no group
         # Test: no project issue visible
-        self.assertRaises(except_orm, self.project_issue.search,
-            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+        self.assertRaises(except_orm, self.project_issue.search, cr, self.user_none_id, [('project_id', '=', pigs_id)])
         # Test: no project issue readable
-        self.assertRaises(except_orm, self.project_issue.read,
-            cr, self.user_bert_id, issue_ids, ['name'])
+        self.assertRaises(except_orm, self.project_issue.read, cr, self.user_none_id, issue_ids, ['name'])
         # Test: no project issue writable
-        self.assertRaises(except_orm, self.project_issue.write,
-            cr, self.user_bert_id, issue_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_issue.write, cr, self.user_none_id, issue_ids, {'description': 'TestDescription'})
 
         # Do: Chell reads project -> ok (portal ok public)
         # Test: all project issues visible
-        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: project user cannot see all issues of a public project')
+                         'access rights: project user cannot see all issues of a public project')
         # Test: all project issues readable
-        self.project_issue.read(cr, self.user_chell_id, issue_ids, ['name'])
+        self.project_issue.read(cr, self.user_portal_id, issue_ids, ['name'])
         # Test: no project issue writable
-        self.assertRaises(except_orm, self.project_issue.write,
-            cr, self.user_chell_id, issue_ids, {'description': 'TestDescription'})
+        self.assertRaises(except_orm, self.project_issue.write, cr, self.user_portal_id, issue_ids, {'description': 'TestDescription'})
 
         # Do: Donovan reads project -> ok (anonymous ok public)
         # Test: all project issues visible
-        issue_ids = self.project_issue.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: project user cannot see all issues of a public project')
+                         'access rights: project user cannot see all issues of a public project')
 
         # ----------------------------------------
         # CASE2: portal project
@@ -108,27 +100,26 @@ class TestPortalIssueProject(TestPortalProject):
 
         # Do: Alfred reads project -> ok (employee ok public)
         # Test: all project issues visible
-        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: project user cannot see all issues of a portal project')
+                         'access rights: project user cannot see all issues of a portal project')
 
         # Do: Bert reads project -> crash, no group
         # Test: no project issue searchable
-        self.assertRaises(except_orm, self.project_issue.search,
-            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+        self.assertRaises(except_orm, self.project_issue.search, cr, self.user_none_id, [('project_id', '=', pigs_id)])
 
         # Data: issue follower
-        self.project_issue.message_subscribe_users(cr, self.user_alfred_id, [self.issue_1_id, self.issue_3_id], [self.user_chell_id])
+        self.project_issue.message_subscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_id])
 
         # Do: Chell reads project -> ok (portal ok public)
         # Test: only followed project issues visible + assigned
-        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_1_id, self.issue_3_id, self.issue_5_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: portal user should see the followed issues of a portal project')
+                         'access rights: portal user should see the followed issues of a portal project')
 
         # Data: issue follower cleaning
-        self.project_issue.message_unsubscribe_users(cr, self.user_alfred_id, [self.issue_1_id, self.issue_3_id], [self.user_chell_id])
+        self.project_issue.message_unsubscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_id])
 
         # ----------------------------------------
         # CASE3: employee project
@@ -137,14 +128,14 @@ class TestPortalIssueProject(TestPortalProject):
 
         # Do: Alfred reads project -> ok (employee ok employee)
         # Test: all project issues visible
-        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_1_id, self.issue_2_id, self.issue_3_id, self.issue_4_id, self.issue_5_id, self.issue_6_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: project user cannot see all issues of an employees project')
+                         'access rights: project user cannot see all issues of an employees project')
 
         # Do: Chell reads project -> ko (portal ko employee)
         # Test: no project issue visible + assigned
-        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertFalse(issue_ids, 'access rights: portal user should not see issues of an employees project, even if assigned')
 
         # ----------------------------------------
@@ -154,32 +145,32 @@ class TestPortalIssueProject(TestPortalProject):
 
         # Do: Alfred reads project -> ko (employee ko followers)
         # Test: no project issue visible
-        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_4_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: employee user should not see issues of a not-followed followers project, only assigned')
+                         'access rights: employee user should not see issues of a not-followed followers project, only assigned')
 
         # Do: Chell reads project -> ko (portal ko employee)
         # Test: no project issue visible
-        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_5_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: portal user should not see issues of a not-followed followers project, only assigned')
+                         'access rights: portal user should not see issues of a not-followed followers project, only assigned')
 
         # Data: subscribe Alfred, Chell and Donovan as follower
-        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_alfred_id, self.user_chell_id, self.user_donovan_id])
-        self.project_issue.message_subscribe_users(cr, self.user_alfred_id, [self.issue_1_id, self.issue_3_id], [self.user_chell_id, self.user_alfred_id])
+        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_projectuser_id, self.user_portal_id, self.user_anonymous_id])
+        self.project_issue.message_subscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_id, self.user_projectuser_id])
 
         # Do: Alfred reads project -> ok (follower ok followers)
         # Test: followed + assigned issues visible
-        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_1_id, self.issue_3_id, self.issue_4_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: employee user should not see followed + assigned issues of a follower project')
+                         'access rights: employee user should not see followed + assigned issues of a follower project')
 
         # Do: Chell reads project -> ok (follower ok follower)
         # Test: followed + assigned issues visible
-        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         test_issue_ids = set([self.issue_1_id, self.issue_3_id, self.issue_5_id])
         self.assertEqual(set(issue_ids), test_issue_ids,
-                        'access rights: employee user should not see followed + assigned issues of a follower project')
+                         'access rights: employee user should not see followed + assigned issues of a follower project')
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index def0e0edd97..15b26507ff3 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -37,7 +37,6 @@ class report_project_task_user(osv.osv):
         'date_end': fields.date('Ending Date', readonly=True),
         'date_deadline': fields.date('Deadline', readonly=True),
         'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
-        'month_last_stage_update': fields.selection(fields.date.MONTHS, 'Month of Last Stage Update', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
@@ -74,7 +73,6 @@ class report_project_task_user(osv.osv):
                     date_trunc('day',t.date_start) as date_start,
                     date_trunc('day',t.date_end) as date_end,
                     date_trunc('day',t.date_last_stage_update) as date_last_stage_update,
-                    to_char(date_last_stage_update, 'MM') as month_last_stage_update,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
 --                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
                     abs((extract('epoch' from (t.date_end-t.date_start)))/(3600*24))  as no_of_days,
@@ -112,7 +110,6 @@ class report_project_task_user(osv.osv):
                     date_end,
                     date_deadline,
                     date_last_stage_update,
-                    month_last_stage_update,
                     t.user_id,
                     t.project_id,
                     t.priority,
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 2e113dfd04f..d5638e332a4 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -19,7 +19,6 @@
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
                     <field name="date_last_stage_update" invisible="1"/>
-                    <field name="month_last_stage_update" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -82,7 +81,7 @@
                         <filter string="Day" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" context="{'group_by':'month'}" help="Creation Date"/>
                         <filter string="Year" context="{'group_by':'year'}" help="Creation Date"/>
-                        <filter string="Last Stage Update" context="{'group_by':'month_last_stage_update'}" help="Month of Last Stage Update"/>
+                        <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" help="Last Stage Update"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/tests/test_project_flow.py b/addons/project/tests/test_project_flow.py
index a78bd6de156..a037c92d2ae 100644
--- a/addons/project/tests/test_project_flow.py
+++ b/addons/project/tests/test_project_flow.py
@@ -135,9 +135,11 @@ class TestProjectFlow(TestProjectBase):
         self.assertEqual(res[0].get('create_uid'), uid,
                          'project: message_process: task should have been created by uid as alias_user_id is False on the alias')
         # Test: messages
-        self.assertEqual(len(task.message_ids), 2,
+        self.assertEqual(len(task.message_ids), 3,
                          'project: message_process: newly created task should have 2 messages: creation and email')
-        self.assertEqual(task.message_ids[1].subtype_id.name, 'Task Created',
+        self.assertEqual(task.message_ids[2].subtype_id.name, 'Task Created',
+                         'project: message_process: first message of new task should have Task Created subtype')
+        self.assertEqual(task.message_ids[1].subtype_id.name, 'Task Assigned',
                          'project: message_process: first message of new task should have Task Created subtype')
         self.assertEqual(task.message_ids[0].author_id.id, self.email_partner_id,
                          'project: message_process: second message should be the one from Agrolait (partner failed)')
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 496aa819ee2..5f59b51f290 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -37,6 +37,7 @@ class project_issue_report(osv.osv):
         'opening_date': fields.date('Date of Opening', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
+        'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
         'stage_id': fields.many2one('project.task.type', 'Stage'),
         'nbr': fields.integer('# of Issues', readonly=True),
         'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True, group_operator="avg"),
@@ -67,6 +68,7 @@ class project_issue_report(osv.osv):
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
+                    date_trunc('day',c.date_last_stage_update) as date_last_stage_update,
                     c.user_id,
                     c.working_hours_open,
                     c.working_hours_close,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index a2956bd0999..f9ca7168841 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -20,6 +20,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
+                    <field name="date_last_stage_update" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
                     <field name="delay_open" avg="Avg Opening Delay"/>
@@ -70,6 +71,7 @@
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
+                        <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/>
                    </group>
                </search>
             </field>

From 46bd6b5807b7f3fe2ac2c4f2c0d995240876ee4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 10 Jul 2013 15:36:41 +0200
Subject: [PATCH 134/197] [DOC] project_issue: added doc for the branch.
 Project: updated doc.

bzr revid: tde@openerp.com-20130710133641-911dt5tvwqh10wam
---
 addons/project/doc/stage_status.rst       |  5 ++-
 addons/project_issue/doc/changelog.rst    | 13 ++++++
 addons/project_issue/doc/index.rst        | 22 +++++++++
 addons/project_issue/doc/stage_status.rst | 54 +++++++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 addons/project_issue/doc/changelog.rst
 create mode 100644 addons/project_issue/doc/index.rst
 create mode 100644 addons/project_issue/doc/stage_status.rst

diff --git a/addons/project/doc/stage_status.rst b/addons/project/doc/stage_status.rst
index f02b3eddbaa..cc2a64c2fbf 100644
--- a/addons/project/doc/stage_status.rst
+++ b/addons/project/doc/stage_status.rst
@@ -47,8 +47,9 @@ The following subtypes are triggered on ``project.task``:
 
  - ``mt_task_new``: new tasks. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
  - ``mt_task_stage``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
- - ``mt_task_assigned``: TODO
- - ``mt_task_blocked``: TODO
+ - ``mt_task_assigned``: user assigned. condition: ``obj.user_id and obj.user_id.id``
+ - ``mt_task_blocked``: kanban state blocked. Condition: ``obj.kanban_state == 'blocked'``
+
 
 Those subtypes are also available on the ``project.project`` model and are used
 for the auto subscription.
diff --git a/addons/project_issue/doc/changelog.rst b/addons/project_issue/doc/changelog.rst
new file mode 100644
index 00000000000..e74516f1600
--- /dev/null
+++ b/addons/project_issue/doc/changelog.rst
@@ -0,0 +1,13 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``project.issue``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Updated reports.
diff --git a/addons/project_issue/doc/index.rst b/addons/project_issue/doc/index.rst
new file mode 100644
index 00000000000..9e12eef2124
--- /dev/null
+++ b/addons/project_issue/doc/index.rst
@@ -0,0 +1,22 @@
+=====================
+Project Issue DevDoc
+=====================
+
+Project Issue module documentation
+===================================
+
+Documentation topics
+''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/project_issue/doc/stage_status.rst b/addons/project_issue/doc/stage_status.rst
new file mode 100644
index 00000000000..6afd4508cd9
--- /dev/null
+++ b/addons/project_issue/doc/stage_status.rst
@@ -0,0 +1,54 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
++++++
+
+This revision removed the concept of state on project.issue objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``project.issue`` now use only stages. However a convention still exists about
+   'New' stage. An issue is consdered as ``new`` when it has the following
+   properties:
+
+   - ``stage_id and stage_id.sequence = 1``
+
+ - ``project.task.type`` do not have any ``state`` field anymore. 
+ - ``project.issue.report`` do not have any ``state`` field anymore. 
+
+By default a newly created issue is in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``project.issue.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``project.issue``:
+
+ - ``mt_issue_new``: new tasks. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_issue_stage``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+ - ``mt_issue_assigned``: user assigned. condition: ``obj.user_id and obj.user_id.id``
+ - ``mt_issue_blocked``: kanban state blocked. Condition: ``obj.kanban_state == 'blocked'``
+
+Those subtypes are also available on the ``project.project`` model and are used
+for the auto subscription.

From 57d18c1a346464500d8176c3ef3473e31f5fd118 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 10 Jul 2013 16:54:51 +0200
Subject: [PATCH 135/197] [IMP] In server-side web framework, change auth="db"
 to auth="admin", with some difference in semantic

bzr revid: nicolas.vanhoren@openerp.com-20130710145451-56ui50mga78eq10v
---
 addons/web/doc/web_controllers.rst | 19 +++++++++++++------
 addons/web/http.py                 |  6 +++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
index 86ac0248e7e..71ff9fb8416 100644
--- a/addons/web/doc/web_controllers.rst
+++ b/addons/web/doc/web_controllers.rst
@@ -134,18 +134,25 @@ argument of every model method in OpenERP.
 Authorization Levels
 --------------------
 
-By default, all methods can only be used by users logged into OpenERP (OpenERP uses cookies to track logged users).
-There are some cases when you need to enable not-logged in users to access some methods. To do so, add the ``'db'``
-value to the ``auth`` parameter of ``http.route()``:
+By default, all access to the models will use the rights of the currently logged in user (OpenERP uses cookies to track
+logged users). It is also impossible to reach an URL without being logged (the user's browser will receive an HTTP
+error).
+
+There are some cases when the current user is not relevant, and we just want to give access to anyone to an URL. A
+typical example is be the generation of a home page for a website. The home page should be visible by anyone, whether
+they have an account or not. To do so, add the ``'admin'`` value to the ``auth`` parameter of ``http.route()``:
 
 ::
 
-    @http.route('/hello', type="http", auth="db")
+    @http.route('/hello', type="http", auth="admin")
     def hello(self):
         return "<div>Hello unknown user!</div>"
 
-Please note the ``request.uid`` user id will be ``None`` inside this method call. This is due to the fact no user was
-authenticated.
+When using the ``admin`` authentication the access to the OpenERP models will be performed with the ``Administrator``
+user and ``request.uid`` will be equal to ``openerp.SUPERUSER_ID`` (the id of the administrator).
+
+It is important to note that when using the ``Administrator`` user all security is bypassed. So the programmers
+implementing such methods should take great care of not creating security issues in the application.
 
 Overriding Controllers
 ----------------------
diff --git a/addons/web/http.py b/addons/web/http.py
index 8b49e8f9636..2f9016cf5cc 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -156,11 +156,11 @@ class WebRequest(object):
         if self.auth_method == "none":
             self.db = None
             self.uid = None
-        elif self.auth_method == "db":
+        elif self.auth_method == "admin":
             self.db = self.session._db or db_monodb()
             if not self.db:
                 raise SessionExpiredException("No valid database for request %s" % self.httprequest)
-            self.uid = None
+            self.uid = openerp.SUPERUSER_ID
         else: # auth
             try:
                 self.session.check_security()
@@ -235,7 +235,7 @@ def route(route, type="http", auth="user"):
         authentication modules.
     """
     assert type in ["http", "json"]
-    assert auth in ["user", "db", "none"]
+    assert auth in ["user", "admin", "none"]
     def decorator(f):
         if isinstance(route, list):
             f.routes = route

From f38ef93a05f4d01c1a883565b5520af6ddb21384 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 11 Jul 2013 05:17:19 +0000
Subject: [PATCH 136/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130710052627-eedl9mcxycz4m264
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711051719-uejqvkwl3w8nli1l
---
 addons/account/i18n/is.po            | 10849 +++++++++++++++++++++++++
 addons/account_voucher/i18n/nl_BE.po |    61 +-
 addons/crm/i18n/hu.po                |    40 +-
 addons/edi/i18n/is.po                |    87 +
 addons/sale/i18n/hu.po               |   152 +-
 5 files changed, 11079 insertions(+), 110 deletions(-)
 create mode 100644 addons/account/i18n/is.po
 create mode 100644 addons/edi/i18n/is.po

diff --git a/addons/account/i18n/is.po b/addons/account/i18n/is.po
new file mode 100644
index 00000000000..850ced594cc
--- /dev/null
+++ b/addons/account/i18n/is.po
@@ -0,0 +1,10849 @@
+# Icelandic translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+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: 2013-07-10 11:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\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 ""
+
+#. 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 "Tilvísun"
+
+#. 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 "Aðvörun!"
+
+#. 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/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index a58e655aec6..04366df488e 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-04-26 16:01+0000\n"
+"PO-Revision-Date: 2013-07-10 09:54+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "Language: nl\n"
 
 #. module: account_voucher
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:369
+#: code:addons/account_voucher/account_voucher.py:417
 #, python-format
 msgid "Write-Off"
 msgstr "Afschrijving"
@@ -132,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Boekingsstatistieken"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -233,8 +233,8 @@ msgid "Journal Item"
 msgstr "Boekingslijn"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
-#: code:addons/account_voucher/account_voucher.py:981
+#: code:addons/account_voucher/account_voucher.py:558
+#: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
 msgstr "Fout"
@@ -261,7 +261,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -313,7 +313,7 @@ msgid "Tax"
 msgstr "Btw"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie"
@@ -366,10 +366,10 @@ msgid "Import Invoices"
 msgstr "Facturen importeren"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "Wrong voucher line"
-msgstr ""
+msgstr "Verkeerde betalingsregel"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -385,7 +385,7 @@ msgid "Receipt"
 msgstr "Reçu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -409,7 +409,7 @@ msgstr "Periode"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: code:addons/account_voucher/account_voucher.py:211
+#: code:addons/account_voucher/account_voucher.py:231
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@@ -430,7 +430,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Het dagboek kan niet worden gewijzigd"
@@ -469,6 +469,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier als u een nieuwe leveranciersbetaling wilt maken.\n"
+"              </p><p>\n"
+"                Met OpenERP kunt u betalingen aan leveranciers opvolgen.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -536,7 +542,7 @@ msgid "Pay Invoice"
 msgstr "Factuur betalen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Geen rekening voor basisvak en btw-vak"
@@ -590,15 +596,15 @@ msgid "To Review"
 msgstr "Te controleren"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1025
-#: code:addons/account_voucher/account_voucher.py:1039
-#: code:addons/account_voucher/account_voucher.py:1194
+#: code:addons/account_voucher/account_voucher.py:1120
+#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1286
 #, python-format
 msgid "change"
 msgstr "wijzigen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
+#: code:addons/account_voucher/account_voucher.py:1106
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -656,6 +662,7 @@ msgstr "Maand"
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:account.voucher.line,currency_id:0
+#: model:ir.model,name:account_voucher.model_res_currency
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
 msgstr "Munt"
@@ -699,7 +706,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Betalingssaldo afpunten"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:975
+#: code:addons/account_voucher/account_voucher.py:1067
 #, python-format
 msgid "Configuration Error !"
 msgstr "Configuratiefout"
@@ -764,7 +771,7 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:976
+#: code:addons/account_voucher/account_voucher.py:1068
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Gelieve de nummering van het gekozen journaal te activeren."
@@ -844,7 +851,7 @@ msgid "Previous Payments ?"
 msgstr "Vorige betalingen?"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
 msgstr "De factuur die u wilt betalen, is niet meer geldig."
@@ -876,7 +883,7 @@ msgid "Active"
 msgstr "Actief"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:982
+#: code:addons/account_voucher/account_voucher.py:1074
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Gelieve een reeks in te stellen voor het journaal."
@@ -1004,7 +1011,7 @@ msgid "Journal Items"
 msgstr "Boekingslijnen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
+#: code:addons/account_voucher/account_voucher.py:558
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "Stel een standaard debet-/creditrekening in voor journaal \"%s\"."
@@ -1221,7 +1228,7 @@ msgstr ""
 "Het bedrag van het reçu moet gelijk zijn aan het bedrag op de uittreksellijn."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Een openstaand of betaald reçu kan niet meer worden verwijderd."
@@ -1284,8 +1291,8 @@ msgid "Status <b>changed</b>"
 msgstr "Status <b>vgewijzigd</b>"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1106
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Niet volledig geconfigureerd"
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 6673d2da235..0289fac77cf 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -7,14 +7,19 @@ 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: 2013-06-21 07:11+0000\n"
+"PO-Revision-Date: 2013-07-09 07:36+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-22 05:36+0000\n"
-"X-Generator: Launchpad (build 16677)\n"
+"X-Launchpad-Export-Date: 2013-07-10 05:25+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+msgid "Qualification"
+msgstr "Besorolás"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2686,11 +2691,6 @@ msgstr "Valószínűség automatikus változtatása"
 msgid "My Phone Calls"
 msgstr "Telefonhívásaim"
 
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead3
-msgid "Qualification"
-msgstr "Besorolás"
-
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
@@ -3961,9 +3961,19 @@ msgstr ""
 #~ msgid "Can not add note!"
 #~ msgstr "Nem lehet hozzáadni megjegyzést!"
 
+#, python-format
+#~ msgid ""
+#~ "Opportunity must have Partner assigned before merging with other Opportunity."
+#~ msgstr ""
+#~ "Csak a Partnerhez rendelt Lehetőséget lehet más Lehetőséggel összefűzni."
+
 #~ msgid "_Merge"
 #~ msgstr "Össze_fésülés"
 
+#, python-format
+#~ msgid "The opportunity '%s' has been marked as lost."
+#~ msgstr "A '%s' lehetőséget elvesztettnek jelöltem."
+
 #, python-format
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "A '%s'"
@@ -3991,3 +4001,17 @@ msgstr ""
 
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Átalakítás lehetőséggé"
+
+#~ msgid "Edit all Occurrences  of recurrent Meeting."
+#~ msgstr "Az ismétlődő találkozók összes eseményének szerkesztése."
+
+#~ msgid ""
+#~ "Leads Analysis allows you to check different CRM related information. Check "
+#~ "for treatment delays, number of responses given and emails sent. You can "
+#~ "sort out your leads analysis by different groups to get accurate grained "
+#~ "analysis."
+#~ msgstr ""
+#~ "Az érdeklődések elemzése több CRM-hez kapcsolódó információt nyújt. "
+#~ "Ellenőrizhetjük az eljárás elnapolását, a kiküldött válaszok és e-mailek "
+#~ "számát. A részletes eredmény érdekében az érdeklődéseket különféle "
+#~ "csoportosítások szerint is elemezhetjük."
diff --git a/addons/edi/i18n/is.po b/addons/edi/i18n/is.po
new file mode 100644
index 00000000000..c3b37f49f46
--- /dev/null
+++ b/addons/edi/i18n/is.po
@@ -0,0 +1,87 @@
+# Icelandic translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+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: 2013-07-10 12:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr "Ástæða:"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Gjaldmiðill"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Viðskipta aðili"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 0e90d3aae1d..912ef4fe2d1 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.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: 2013-01-11 08:34+0000\n"
+"PO-Revision-Date: 2013-07-09 07:56+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:22+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-10 05:26+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -129,7 +129,7 @@ msgid "March"
 msgstr "Március"
 
 #. module: sale
-#: code:addons/sale/sale.py:567
+#: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
 msgstr "Először vonja vissza a megrendelés összes számla mellékletét."
@@ -173,7 +173,7 @@ msgstr "Árajánlat megerősítve"
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "Számlázási hiba"
+msgstr "Számlázási kivétel"
 
 #. module: sale
 #: view:sale.order:0
@@ -183,7 +183,7 @@ msgstr "Árajánlat "
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr "Árajánlat sablon"
+msgstr "Árajánlat tervezet"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -205,7 +205,7 @@ msgstr "Engedélyezi a köteg számlázást a megrendeléseken a naplók alapjá
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Részösszeg"
+msgstr "Nettó érték"
 
 #. module: sale
 #: view:sale.report:0
@@ -259,12 +259,12 @@ msgstr "Lehetővé teszi a megrendelés soraihoz árengedmény alkalmazását"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr "Megrendelés sorai melyek 'elvégezve' állapotúak"
+msgstr "'Elvégzett' állapotú megrendelési sorok"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "Megendelésre"
+msgstr "megrendelésre"
 
 #. module: sale
 #: field:sale.order,message_ids:0
@@ -285,7 +285,7 @@ msgstr "Adók"
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Nettó érték"
+msgstr "Nettó összeg"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
@@ -294,9 +294,9 @@ msgstr "Projekt"
 
 #. module: sale
 #: code:addons/sale/sale.py:185
-#: code:addons/sale/sale.py:368
-#: code:addons/sale/sale.py:509
-#: code:addons/sale/sale.py:600
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
 #: code:addons/sale/sale.py:763
 #: code:addons/sale/sale.py:780
 #, python-format
@@ -306,7 +306,7 @@ msgstr "Hiba!"
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr "Nettó ár:"
+msgstr "Nettó érték :"
 
 #. module: sale
 #: help:sale.order.line,type:0
@@ -315,9 +315,9 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
-"Raktárról: Ha kell, a terméket a raktárról vesszük vagy várunk az alkatrész "
-"feltöltésre.\n"
-"Megrendelve: Ha kell, a terméket megvásároljuk vagy legyártjuk."
+"Raktárról: Ha szükség van rá, a terméket a raktárról vesszük vagy várunk az "
+"alkatrész feltöltésre.\n"
+"Megrendelve: Ha szükség van rá, a terméket megvásároljuk vagy legyártjuk."
 
 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@@ -344,7 +344,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "Visszavonva"
+msgstr "Érvénytelenített"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -416,11 +416,11 @@ msgid ""
 msgstr ""
 "Használja mindet a végszámla elkészítéséhez.\n"
 "                Használjon százalékot a teljes mennyiség bizonyos "
-"százalékának szálázásához.\n"
+"százalékának számlázásához.\n"
 "                Használjon fix árat egy bizonyos mennyiség díjbekérőjéhez / "
 "előlegéhez.\n"
 "                Használjon egyes megrendelés sorokat a kiválasztott "
-"megrendelés sorainak számlázásáahoz."
+"megrendelés sorainak számlázásához."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -431,10 +431,10 @@ msgstr "Számlák létrehozása"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr "ÁFA"
+msgstr "Adó"
 
 #. module: sale
-#: code:addons/sale/sale.py:278
+#: code:addons/sale/sale.py:277
 #: code:addons/sale/sale.py:820
 #: code:addons/sale/sale.py:983
 #, python-format
@@ -456,7 +456,7 @@ msgstr ""
 "elvégzésekkor               egy számla érvényesítésekor (Számla kizárás) "
 "vagy a kiválogatási lista műveletekben (Szállítási kizárás).\n"
 "A 'Ütemezésre várakozás' állapot lesz beállítva, ha a számla megerősített    "
-"                        de vár egy, a megrendelés dátumára futó ütemezésre."
+"                        de vár egy, a megrendelés dátumán futó ütemezésre."
 
 #. module: sale
 #: field:sale.report,date_confirm:0
@@ -467,7 +467,7 @@ msgstr "Megerősítés dátuma"
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "Sorok száma"
+msgstr "# sorok száma"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -482,7 +482,7 @@ msgstr ""
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"A megrendelés sorrendet adja ha a megrendelési sorok listáját jelzi ki."
+"A megrendelés sorrendet adja a megrendelési sorok listájának kijelzésekor."
 
 #. module: sale
 #: view:sale.report:0
@@ -496,7 +496,7 @@ msgid "Fax :"
 msgstr "Fax:"
 
 #. module: sale
-#: code:addons/sale/sale.py:278
+#: code:addons/sale/sale.py:277
 #, python-format
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
@@ -507,7 +507,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr "(Frissítés)"
+msgstr "(frissítés)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
@@ -522,8 +522,8 @@ msgid "Contract Features"
 msgstr "Szerződés tulajdonságai"
 
 #. module: sale
-#: code:addons/sale/sale.py:288
-#: code:addons/sale/sale.py:586
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
@@ -533,7 +533,7 @@ msgstr "Szerződés tulajdonságai"
 #: selection:sale.order,state:0
 #, python-format
 msgid "Sales Order"
-msgstr "Értékesítési megbízás"
+msgstr "Vevői megrendelés"
 
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
@@ -543,7 +543,7 @@ msgstr "Megrendelés sorai számlázásának engedélyezése"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Értékesítési megbízási sor"
+msgstr "Vevői megrendelés sor"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -553,7 +553,7 @@ msgstr "Előleg összege"
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sales order has at least one invoice."
-msgstr "Ez mutatja, hogy a megrendelének legalább egy számlája van."
+msgstr "Ez mutatja, hogy a megrendelésnek legalább egy számlája van."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -568,7 +568,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr "Egy munkavállalónak különböző funkciója lehet egy szerződésen belül"
+msgstr "Egy alkalmazottnak különböző funkciója lehet egy szerződésen belül"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -583,19 +583,19 @@ msgstr "Alapértelmezett fizetési feltétel"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr "Megerősítés"
+msgstr "Jóváhagyás"
 
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Az időkimutatások alapján készítsen elő számlát"
+msgstr "Az időkimutatások alapján készítsen elő,  számlát"
 
 #. module: sale
 #: code:addons/sale/sale.py:820
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
-"Nem tud olyan megrendelési sort visszavonni amelyik már számlázva volt."
+"Nem tud olyan vevői megrendelési sort visszavonni amelyik már számlázva volt."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -644,7 +644,7 @@ msgstr "Megrendelés száma"
 #: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "Megrendelési tételek"
+msgstr "Megrendelés sorok"
 
 #. module: sale
 #: report:sale.order:0
@@ -673,7 +673,7 @@ msgstr "Összérték"
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
-"Lehetővé teszi az analitikus/elemző könyvelés meghatározását a "
+"Lehetővé teszi az analitikus/elemző könyvelés gyűjtőkód meghatározását a "
 "megrendeléseken."
 
 #. module: sale
@@ -711,7 +711,7 @@ msgstr "Óra"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr "# megrendelésből"
+msgstr "# megrendelésszámból"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -742,7 +742,7 @@ msgstr "Számlázandó"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr "Az aktuális értékesítési megbízás számlázási címe."
+msgstr "Az aktuális megrendelés számlázási címe."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -769,7 +769,7 @@ msgstr "Mennyiség"
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr "Bruttó ár:"
+msgstr "Összesen :"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -837,7 +837,7 @@ msgstr "Beállítási hiba!"
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr "Analitikus/elemző könyvelés az értékesítésekhez"
+msgstr "Analitikus/elemző könyvelési gyűjtőkód az értékesítésekhez"
 
 #. module: sale
 #: view:sale.order:0
@@ -889,7 +889,7 @@ msgid "Sales Order done"
 msgstr "Megrendelés elvégezve"
 
 #. module: sale
-#: code:addons/sale/sale.py:369
+#: code:addons/sale/sale.py:364
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -945,7 +945,7 @@ msgid "Sales Make Invoice"
 msgstr "Számla generálása értékesítésből"
 
 #. module: sale
-#: code:addons/sale/sale.py:308
+#: code:addons/sale/sale.py:307
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Árlista figyelmeztés!"
@@ -956,7 +956,7 @@ msgid "Discount (%)"
 msgstr "Árengedmény (%)"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_line_invoice.py:107
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1009,7 +1009,7 @@ msgstr "Hónap"
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "Currency"
-msgstr "Valuta"
+msgstr "Pénznem"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1023,7 +1023,7 @@ msgid "Category of Product"
 msgstr "Termékkaterógia"
 
 #. module: sale
-#: code:addons/sale/sale.py:566
+#: code:addons/sale/sale.py:564
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "Nem lehet megszakítani ezt a megrendelést!"
@@ -1080,7 +1080,7 @@ msgid "Open Sale Menu"
 msgstr "Értékesítési menü megnyitása"
 
 #. module: sale
-#: code:addons/sale/sale.py:600
+#: code:addons/sale/sale.py:598
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
 msgstr "Nem tud megerősíteni sor nélküli megrendelést"
@@ -1520,7 +1520,7 @@ msgid "TVA :"
 msgstr "ÁFA:"
 
 #. module: sale
-#: code:addons/sale/sale.py:449
+#: code:addons/sale/sale.py:444
 #, python-format
 msgid "Customer Invoices"
 msgstr "Kimenő számlák"
@@ -1546,7 +1546,7 @@ msgid "Sales"
 msgstr "Értékesítés"
 
 #. module: sale
-#: code:addons/sale/sale.py:309
+#: code:addons/sale/sale.py:308
 #, python-format
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
@@ -1591,7 +1591,8 @@ msgid "Invoice address :"
 msgstr "Számlázási cím:"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
 #: model:process.node,name:sale.process_node_invoice0
 #: view:sale.order:0
 #, python-format
@@ -1678,7 +1679,7 @@ msgid "Shipping address :"
 msgstr "Szállítási cím:"
 
 #. module: sale
-#: code:addons/sale/sale.py:510
+#: code:addons/sale/sale.py:505
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -2196,8 +2197,9 @@ msgid "Manual In Progress"
 msgstr "Manuális vezérléssel folyamatban"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:110
-#: code:addons/sale/wizard/sale_make_invoice.py:43
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
 #, python-format
 msgid "Warning!"
 msgstr "Figyelem!"
@@ -2466,9 +2468,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Compute"
 #~ msgstr "Számítás"
 
-#~ msgid "Partial Delivery"
-#~ msgstr "Részleges kiszállítás"
-
 #~ msgid "UoM"
 #~ msgstr "ME"
 
@@ -2779,9 +2778,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Előzetes számla megnyitása"
 
-#~ msgid "Sales Management"
-#~ msgstr "Értékesítési menedzsment"
-
 #~ msgid "Deliver"
 #~ msgstr "Szállítás"
 
@@ -2792,9 +2788,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Sale Order Line"
 #~ msgstr "Rendelési tétel"
 
-#~ msgid "Cancel Assignation"
-#~ msgstr "Számla sztornó"
-
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Számla a csomagolási listából"
 
@@ -2850,9 +2843,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Related invoices"
 #~ msgstr "Kapcsolódó számlák"
 
-#~ msgid "Payment Before Delivery"
-#~ msgstr "Fizetés szállítás előtt"
-
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@@ -2877,6 +2867,9 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Sale Order line"
 #~ msgstr "Rendelési sor"
 
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Szállítás előtti fizetés"
+
 #~ msgid "All at Once"
 #~ msgstr "Egyszerre"
 
@@ -2892,9 +2885,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Notes"
 #~ msgstr "Megjegyzések"
 
-#~ msgid "Lines to Invoice"
-#~ msgstr "Számla sorai"
-
 #~ msgid "All Quotations"
 #~ msgstr "Összes árajánlat"
 
@@ -2922,9 +2912,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Picking List"
 #~ msgstr "Kiszedési lista"
 
-#~ msgid "Picking List & Delivery Order"
-#~ msgstr "Kiszedési lista és Szállítás megrendelése"
-
 #~ msgid "Invoicing"
 #~ msgstr "Számlázás"
 
@@ -2950,18 +2937,21 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Shipped Qty"
 #~ msgstr "Szállított mennyiség"
 
-#~ msgid "Shipping Default Policy"
-#~ msgstr "Alapértelmezett szállítási politika"
-
 #~ msgid "Close"
 #~ msgstr "Zárás"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Hozzárendelés megszüntetése"
+
 #~ msgid "State"
 #~ msgstr "Állapot"
 
 #~ msgid "Configure"
 #~ msgstr "Beállítás"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Kiszámlázandó sorok"
+
 #~ msgid "Order State"
 #~ msgstr "Megrendelés állapota"
 
@@ -3675,3 +3665,15 @@ msgstr "A megrendelés megrendelési dátuma"
 
 #~ msgid "Invoice Policy"
 #~ msgstr "Számlázási szabály"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Rész-szállítmány"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Alapértelmezett számlázási szabály"
+
+#~ msgid "Sales Management"
+#~ msgstr "Értékesítés kezelés"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Kiválogatási lista & Kézbesítési bizonylat/szállító levél"

From a7adac1189d062ad8797b8d7ead929b27715cf3c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 12:34:22 +0200
Subject: [PATCH 137/197] Now OpenERPSession is a subclass of werkzeug's
 session

bzr revid: nicolas.vanhoren@openerp.com-20130711103422-w7y05ox7tq0hz0og
---
 addons/web/controllers/main.py        |   2 +-
 addons/web/http.py                    | 191 +++++++++-----------------
 addons/web/static/src/js/chrome.js    |   2 +-
 addons/web/static/src/js/coresetup.js |   6 +-
 4 files changed, 68 insertions(+), 133 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 846b9099555..2734692b5e9 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -916,7 +916,7 @@ class Session(http.Controller):
 
     @http.route('/web/session/destroy', type='json', auth="user")
     def destroy(self):
-        request.session._suicide = True
+        request.session.logout()
 
 class Menu(http.Controller):
 
diff --git a/addons/web/http.py b/addons/web/http.py
index 2f9016cf5cc..8c84083794a 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -101,6 +101,8 @@ class WebRequest(object):
         self.httprequest = httprequest
         self.httpresponse = None
         self.httpsession = httprequest.session
+        self.session = httprequest.session
+        self.session_id = httprequest.session.sid
         self.db = None
         self.uid = None
         self.func = None
@@ -111,18 +113,10 @@ class WebRequest(object):
 
     def init(self, params):
         self.params = dict(params)
-        # OpenERP session setup
-        self.session_id = self.params.pop("session_id", None)
-        if not self.session_id:
-            i0 = self.httprequest.cookies.get("instance0|session_id", None)
-            if i0:
-                self.session_id = simplejson.loads(urllib2.unquote(i0))
-            else:
-                self.session_id = uuid.uuid4().hex
-        self.session = self.httpsession.get(self.session_id)
-        if not self.session:
-            self.session = OpenERPSession()
-            self.httpsession[self.session_id] = self.session
+
+        #remove now useless session id
+        if "session_id" in self.params:
+            del self.params["session_id"]
 
         with set_request(self):
             self.db = self.session._db or db_monodb()
@@ -130,7 +124,7 @@ class WebRequest(object):
         # TODO: remove this
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
-        if self.session._db:
+        if self.db:
             threading.current_thread().dbname = self.session._db
         if self.session._uid:
             threading.current_thread().uid = self.session._uid
@@ -334,6 +328,7 @@ class JsonRequest(WebRequest):
             return self.jsonp_handler()
         response = {"jsonrpc": "2.0" }
         error = None
+
         try:
             #if _logger.isEnabledFor(logging.DEBUG):
             #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
@@ -626,32 +621,30 @@ class Model(object):
             return result
         return proxy
 
-class OpenERPSession(object):
-    """
-    An OpenERP RPC session, a given user can own multiple such sessions
-    in a web session.
+class OpenERPSession(werkzeug.contrib.sessions.Session):
+    def __init__(self, *args, **kwargs):
+        self.inited = False
+        self.modified = False
+        super(OpenERPSession, self).__init__(*args, **kwargs)
+        self.inited = True
+        self.setdefault("_creation_time", time.time())
+        self.setdefault("_db", False)
+        self.setdefault("_uid", False)
+        self.setdefault("_login", False)
+        self.setdefault("_password", False)
+        self.setdefault("context", {})
+        self.setdefault("jsonp_requests", {})
+        self.setdefault("modified", False)
 
-    .. attribute:: context
-
-        The session context, a ``dict``. Can be reloaded by calling
-        :meth:`openerpweb.openerpweb.OpenERPSession.get_context`
-
-    .. attribute:: domains_store
-
-        A ``dict`` matching domain keys to evaluable (but non-literal) domains.
-
-        Used to store references to non-literal domains which need to be
-        round-tripped to the client browser.
-    """
-    def __init__(self):
-        self._creation_time = time.time()
-        self._db = False
-        self._uid = False
-        self._login = False
-        self._password = False
-        self._suicide = False
-        self.context = {}
-        self.jsonp_requests = {}     # FIXME use a LRU
+    def __getattr__(self, attr):
+        return self.get(attr, None)
+    def __setattr__(self, k, v):
+        if getattr(self, "inited", False):
+            try:
+                object.__getattribute__(self, k)
+            except:
+                return self.__setitem__(k, v)
+        object.__setattr__(self, k, v)
 
     def authenticate(self, db, login=None, password=None, env=None, uid=None):
         """
@@ -660,6 +653,7 @@ class OpenERPSession(object):
 
         :param uid: If not None, that user id will be used instead the login to authenticate the user.
         """
+
         if uid is None:
             uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
         else:
@@ -684,6 +678,10 @@ class OpenERPSession(object):
             raise SessionExpiredException("Session expired")
         security.check(self._db, self._uid, self._password)
 
+    def logout(self):
+        for k in self.keys():
+            del self[k]
+
     def get_context(self):
         """
         Re-initializes the current user's session context (based on
@@ -791,69 +789,6 @@ class OpenERPSession(object):
 
         return Model(self, model)
 
-#----------------------------------------------------------
-# Session context manager
-#----------------------------------------------------------
-@contextlib.contextmanager
-def session_context(httprequest, session_store, session_lock, sid):
-    with session_lock:
-        if sid:
-            httprequest.session = session_store.get(sid)
-        else:
-            httprequest.session = session_store.new()
-    try:
-        yield httprequest.session
-    finally:
-        # Remove all OpenERPSession instances with no uid, they're generated
-        # either by login process or by HTTP requests without an OpenERP
-        # session id, and are generally noise
-        removed_sessions = set()
-        for key, value in httprequest.session.items():
-            if not isinstance(value, OpenERPSession):
-                continue
-            if getattr(value, '_suicide', False) or (
-                        not value._uid
-                    and not value.jsonp_requests
-                    # FIXME do not use a fixed value
-                    and value._creation_time + (60*5) < time.time()):
-                _logger.debug('remove session %s', key)
-                removed_sessions.add(key)
-                del httprequest.session[key]
-
-        with session_lock:
-            if sid:
-                # Re-load sessions from storage and merge non-literal
-                # contexts and domains (they're indexed by hash of the
-                # content so conflicts should auto-resolve), otherwise if
-                # two requests alter those concurrently the last to finish
-                # will overwrite the previous one, leading to loss of data
-                # (a non-literal is lost even though it was sent to the
-                # client and client errors)
-                #
-                # note that domains_store and contexts_store are append-only (we
-                # only ever add items to them), so we can just update one with the
-                # other to get the right result, if we want to merge the
-                # ``context`` dict we'll need something smarter
-                in_store = session_store.get(sid)
-                for k, v in httprequest.session.iteritems():
-                    stored = in_store.get(k)
-                    if stored and isinstance(v, OpenERPSession):
-                        if hasattr(v, 'contexts_store'):
-                            del v.contexts_store
-                        if hasattr(v, 'domains_store'):
-                            del v.domains_store
-                        if not hasattr(v, 'jsonp_requests'):
-                            v.jsonp_requests = {}
-                        v.jsonp_requests.update(getattr(
-                            stored, 'jsonp_requests', {}))
-
-                # add missing keys
-                for k, v in in_store.iteritems():
-                    if k not in httprequest.session and k not in removed_sessions:
-                        httprequest.session[k] = v
-
-            session_store.save(httprequest.session)
-
 def session_gc(session_store):
     if random.random() < 0.001:
         # we keep session one week
@@ -931,8 +866,7 @@ class Root(object):
 
         # Setup http sessions
         path = session_path()
-        self.session_store = werkzeug.contrib.sessions.FilesystemSessionStore(path)
-        self.session_lock = threading.Lock()
+        self.session_store = werkzeug.contrib.sessions.FilesystemSessionStore(path, session_class=OpenERPSession)
         _logger.debug('HTTP sessions stored in: %s', path)
 
 
@@ -953,39 +887,44 @@ class Root(object):
             httprequest.parameter_storage_class = werkzeug.datastructures.ImmutableDict
             httprequest.app = self
 
+            session_gc(self.session_store)
+
             sid = httprequest.cookies.get('sid')
             if not sid:
                 sid = httprequest.args.get('sid')
+            if sid is None:
+                httprequest.session = self.session_store.new()
+            else:
+                httprequest.session = self.session_store.get(sid)
 
-            session_gc(self.session_store)
+            request = self._build_request(httprequest)
+            db = request.db
 
-            with session_context(httprequest, self.session_store, self.session_lock, sid) as session:
-                request = self._build_request(httprequest)
-                db = request.db
+            if db:
+                updated = openerp.modules.registry.RegistryManager.check_registry_signaling(db)
+                if updated:
+                    with self.db_routers_lock:
+                        del self.db_routers[db]
 
-                if db:
-                    updated = openerp.modules.registry.RegistryManager.check_registry_signaling(db)
-                    if updated:
-                        with self.db_routers_lock:
-                            del self.db_routers[db]
+            with set_request(request):
+                self.find_handler()
+                result = request.dispatch()
 
-                with set_request(request):
-                    self.find_handler()
-                    result = request.dispatch()
+            if db:
+                openerp.modules.registry.RegistryManager.signal_caches_change(db)
 
-                if db:
-                    openerp.modules.registry.RegistryManager.signal_caches_change(db)
+            if isinstance(result, basestring):
+                headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
+                response = werkzeug.wrappers.Response(result, headers=headers)
+            else:
+                response = result
 
-                if isinstance(result, basestring):
-                    headers=[('Content-Type', 'text/html; charset=utf-8'), ('Content-Length', len(result))]
-                    response = werkzeug.wrappers.Response(result, headers=headers)
-                else:
-                    response = result
+            if httprequest.session.should_save:
+                self.session_store.save(httprequest.session)
+            if hasattr(response, 'set_cookie'):
+                response.set_cookie('sid', httprequest.session.sid)
 
-                if hasattr(response, 'set_cookie'):
-                    response.set_cookie('sid', session.sid)
-
-                return response(environ, start_response)
+            return response(environ, start_response)
         except werkzeug.exceptions.HTTPException, e:
             return e(environ, start_response)
 
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 0c73a9b8a3c..1c976cb619e 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1599,7 +1599,7 @@ instance.web.EmbeddedClient = instance.web.Client.extend({
         if (s.session_is_valid() && s.db === this.dbname && s.login === this.login) {
             return $.when();
         }
-        return instance.session.session_authenticate(this.dbname, this.login, this.key, true);
+        return instance.session.session_authenticate(this.dbname, this.login, this.key);
     },
 
     bind_credentials: function(dbname, login, key) {
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 7d37dc2261d..81de547d0c1 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -58,7 +58,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
     session_init: function () {
         var self = this;
         // TODO: session store in cookie should be optional
-        this.session_id = this.get_cookie('session_id');
+        this.session_id = this.get_cookie('sid');
         return this.session_reload().then(function(result) {
             var modules = instance._modules.join(',');
             var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self));
@@ -107,14 +107,10 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
                 return $.Deferred().reject();
             }
             _.extend(self, result);
-            if (!_volatile) {
-                self.set_cookie('session_id', self.session_id);
-            }
             return self.load_modules();
         });
     },
     session_logout: function() {
-        this.set_cookie('session_id', '');
         $.bbq.removeState();
         return this.rpc("/web/session/destroy", {});
     },

From ea0fe404a97e1720780425b26c2c5ce89dd11ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 11 Jul 2013 14:02:36 +0200
Subject: [PATCH 138/197] [IMP] project, project_issue: added search ons tage
 for task and issue.

bzr revid: tde@openerp.com-20130711120236-ryzz7wkzxyb8shds
---
 addons/project/project_view.xml             | 1 +
 addons/project_issue/project_issue_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 30943cff331..b9faa5f9984 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -30,6 +30,7 @@
                     <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <field name="stage_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 4c4d91850a3..f696ce1d044 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -150,6 +150,7 @@
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
+                    <field name="stage_id"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>

From 8c9c9de9795abfe49c5dcaf106c0fc8edfd6d17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 11 Jul 2013 14:06:51 +0200
Subject: [PATCH 139/197] [FIX] Fixed commit about adding stage_id in search
 view: overridden domain because of a crashotherwise.

bzr revid: tde@openerp.com-20130711120651-2c52hgui1jh1ogsl
---
 addons/project/project_view.xml             | 2 +-
 addons/project_issue/project_issue_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b9faa5f9984..8046774e5c0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -30,7 +30,7 @@
                     <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="stage_id"/>
+                    <field name="stage_id" domain="[]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f696ce1d044..1fbea33f3df 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -150,7 +150,7 @@
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
-                    <field name="stage_id"/>
+                    <field name="stage_id" domain="[]"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>

From 47b5a82ae85e795ae888799426f098066583ecbc Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 14:20:34 +0200
Subject: [PATCH 140/197] Completely removed all ways to specify session
 identifiers and reduced them to 2 possibilities:

* The http argument 'session_id' (higher priority)
* The cookie 'session_id' (lower priority)

bzr revid: nicolas.vanhoren@openerp.com-20130711122034-3nvmkw4q5z4io4tm
---
 addons/web/controllers/main.py        |  2 --
 addons/web/http.py                    | 14 ++++++--------
 addons/web/static/src/js/corelib.js   | 10 +++-------
 addons/web/static/src/js/coresetup.js |  3 +--
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2734692b5e9..124ca979c5c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -362,8 +362,6 @@ def login_and_redirect(db, login, key, redirect_url='/'):
 def set_cookie_and_redirect(redirect_url):
     redirect = werkzeug.utils.redirect(redirect_url, 303)
     redirect.autocorrect_location_header = False
-    cookie_val = urllib2.quote(simplejson.dumps(request.session_id))
-    redirect.set_cookie('instance0|session_id', cookie_val)
     return redirect
 
 def load_actions_from_ir_values(key, key2, models, meta):
diff --git a/addons/web/http.py b/addons/web/http.py
index 8c84083794a..1493f3b8f89 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -114,10 +114,6 @@ class WebRequest(object):
     def init(self, params):
         self.params = dict(params)
 
-        #remove now useless session id
-        if "session_id" in self.params:
-            del self.params["session_id"]
-
         with set_request(self):
             self.db = self.session._db or db_monodb()
 
@@ -360,7 +356,7 @@ class JsonRequest(WebRequest):
             # If we use jsonp, that's mean we are called from another host
             # Some browser (IE and Safari) do no allow third party cookies
             # We need then to manage http sessions manually.
-            response['httpsessionid'] = self.httpsession.sid
+            response['session_id'] = self.session_id
             mime = 'application/javascript'
             body = "%s(%s);" % (self.jsonp, simplejson.dumps(response),)
         else:
@@ -424,6 +420,8 @@ class HttpRequest(WebRequest):
     def __init__(self, *args):
         super(HttpRequest, self).__init__(*args)
         params = dict(self.httprequest.args)
+        if "session_id" in params:
+            params.pop("session_id")
         params.update(self.httprequest.form)
         params.update(self.httprequest.files)
         self.init(params)
@@ -889,9 +887,9 @@ class Root(object):
 
             session_gc(self.session_store)
 
-            sid = httprequest.cookies.get('sid')
+            sid = httprequest.args.get('session_id')
             if not sid:
-                sid = httprequest.args.get('sid')
+                sid = httprequest.cookies.get('session_id')
             if sid is None:
                 httprequest.session = self.session_store.new()
             else:
@@ -922,7 +920,7 @@ class Root(object):
             if httprequest.session.should_save:
                 self.session_store.save(httprequest.session)
             if hasattr(response, 'set_cookie'):
-                response.set_cookie('sid', httprequest.session.sid)
+                response.set_cookie('session_id', httprequest.session.sid)
 
             return response(environ, start_response)
         except werkzeug.exceptions.HTTPException, e:
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 116ddf2e8c2..01ff92c88a0 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1068,13 +1068,12 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         var data = {
             session_id: this.session_id,
             id: payload.id,
-            sid: this.httpsessionid,
         };
 
         var set_sid = function (response, textStatus, jqXHR) {
             // If response give us the http session id, we store it for next requests...
-            if (response.httpsessionid) {
-                self.httpsessionid = response.httpsessionid;
+            if (response.session_id) {
+                self.session_id = response.session_id;
             }
         };
 
@@ -1090,7 +1089,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             ajax.async = false;
         var payload_str = JSON.stringify(payload);
         var payload_url = $.param({r:payload_str});
-        if(payload_url.length < 2000) {
+        if (payload_url.length < 2000) {
             // Direct jsonp request
             ajax.data.r = payload_str;
             return $.ajax(ajax).done(set_sid);
@@ -1139,9 +1138,6 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         var qs = '';
         if (!_.isNull(params)) {
             params = _.extend(params || {}, {session_id: this.session_id});
-            if (this.httpsessionid) {
-                params.sid = this.httpsessionid;
-            }
             qs = '?' + $.param(params);
         }
         var prefix = _.any(['http://', 'https://', '//'], _.bind(_.str.startsWith, null, path)) ? '' : this.prefix; 
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 81de547d0c1..f153d3ad73a 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -23,7 +23,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         this.qweb_mutex = new $.Mutex();
     },
     rpc: function(url, params, options) {
-        params.session_id = this.session_id;
         return this._super(url, params, options);
     },
     /**
@@ -58,7 +57,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
     session_init: function () {
         var self = this;
         // TODO: session store in cookie should be optional
-        this.session_id = this.get_cookie('sid');
+        this.session_id = this.get_cookie('session_id');
         return this.session_reload().then(function(result) {
             var modules = instance._modules.join(',');
             var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self));

From 034a5d5dcf00fcd81b2e3cd4d0f734bdff125cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 11 Jul 2013 14:51:55 +0200
Subject: [PATCH 141/197] [FIX] point_of_sale: LocalService -> signal_
 validation

bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
---
 addons/point_of_sale/point_of_sale.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index d53b635ec21..efe8cd98689 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -539,8 +539,7 @@ class pos_order(osv.osv):
             if to_invoice:
                 self.action_invoice(cr, uid, [order_id], context)
                 order_obj = self.browse(cr, uid, order_id, context)
-                wf_service = netsvc.LocalService('workflow')
-                wf_service.trg_validate(uid,'account.invoice', order_obj.invoice_id.id,'invoice_open',cr)
+                self.pool['account.invoice'].signal_invoice_open(cr, uid, [order_obj.invoice_id.id])
 
         return order_ids
 

From 9aaf79ffd2f80e797481cf5bed9cba35dbea9625 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 15:23:01 +0200
Subject: [PATCH 142/197] more and more cleaning

bzr revid: nicolas.vanhoren@openerp.com-20130711132301-5fl5giqio4n9yzgk
---
 addons/web/http.py                  | 55 +++++++++++------------------
 addons/web/static/src/js/corelib.js |  5 ++-
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 1493f3b8f89..81435a6d577 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -110,37 +110,17 @@ class WebRequest(object):
         self._cr_cm = None
         self._cr = None
         self.func_request_type = None
-
-    def init(self, params):
-        self.params = dict(params)
-
+        self.debug = self.httprequest.args.get('debug', False) is not False
         with set_request(self):
             self.db = self.session._db or db_monodb()
-
-        # TODO: remove this
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.db:
             threading.current_thread().dbname = self.session._db
         if self.session._uid:
             threading.current_thread().uid = self.session._uid
-
-        self.context = self.params.pop('context', {})
-        self.debug = self.params.pop('debug', False) is not False
-        # Determine self.lang
-        lang = self.params.get('lang', None)
-        if lang is None:
-            lang = self.context.get('lang')
-        if lang is None:
-            lang = self.httprequest.cookies.get('lang')
-        if lang is None:
-            lang = self.httprequest.accept_languages.best
-        if not lang:
-            lang = 'en_US'
-        # tranform 2 letters lang like 'en' into 5 letters like 'en_US'
-        lang = babel.core.LOCALE_ALIASES.get(lang, lang)
-        # we use _ as seprator where RFC2616 uses '-'
-        self.lang = lang.replace('-', '_')
+        self.context = self.session.context
+        self.lang = self.context["lang"]
 
     def _authenticate(self):
         if self.auth_method == "none":
@@ -313,7 +293,8 @@ class JsonRequest(WebRequest):
 
         # Read POST content or POST Form Data named "request"
         self.jsonrequest = simplejson.loads(request, object_hook=reject_nonliteral)
-        self.init(self.jsonrequest.get("params", {}))
+        self.params = dict(self.jsonrequest.get("params", {}))
+        self.context = self.params.pop('context', self.session.context)
 
     def dispatch(self):
         """ Calls the method asked for by the JSON-RPC2 or JSONP request
@@ -420,11 +401,13 @@ class HttpRequest(WebRequest):
     def __init__(self, *args):
         super(HttpRequest, self).__init__(*args)
         params = dict(self.httprequest.args)
-        if "session_id" in params:
-            params.pop("session_id")
+        ex = set(["session_id", "debug", "db"])
+        for k in params.keys():
+            if k in ex:
+                del params[k]
         params.update(self.httprequest.form)
         params.update(self.httprequest.files)
-        self.init(params)
+        self.params = params
 
     def dispatch(self):
         akw = {}
@@ -630,9 +613,9 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.setdefault("_uid", False)
         self.setdefault("_login", False)
         self.setdefault("_password", False)
-        self.setdefault("context", {})
+        self.setdefault("context", {'tz': "UTC", "uid": None})
         self.setdefault("jsonp_requests", {})
-        self.setdefault("modified", False)
+        self.modified = False
 
     def __getattr__(self, attr):
         return self.get(attr, None)
@@ -895,6 +878,11 @@ class Root(object):
             else:
                 httprequest.session = self.session_store.get(sid)
 
+            if not "lang" in httprequest.session.context:
+                lang = httprequest.accept_languages.best or "en_US"
+                lang = babel.core.LOCALE_ALIASES.get(lang, lang).replace('-', '_')
+                httprequest.session.context["lang"] = lang
+
             request = self._build_request(httprequest)
             db = request.db
 
@@ -1053,19 +1041,18 @@ def db_list(force=False):
     return dbs
 
 def db_redirect(match_first_only_if_unique):
-    req = request
     db = False
     redirect = False
 
     # 1 try the db in the url
-    db_url = req.params.get('db')
+    db_url = request.httprequest.args.get('db')
     if db_url:
         return (db_url, False)
 
     dbs = db_list(True)
 
     # 2 use the database from the cookie if it's listable and still listed
-    cookie_db = req.httprequest.cookies.get('last_used_database')
+    cookie_db = request.httprequest.cookies.get('last_used_database')
     if cookie_db in dbs:
         db = cookie_db
 
@@ -1075,9 +1062,9 @@ def db_redirect(match_first_only_if_unique):
 
     # redirect to the chosen db if multiple are available
     if db and len(dbs) > 1:
-        query = dict(urlparse.parse_qsl(req.httprequest.query_string, keep_blank_values=True))
+        query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
         query.update({'db': db})
-        redirect = req.httprequest.path + '?' + urllib.urlencode(query)
+        redirect = request.httprequest.path + '?' + urllib.urlencode(query)
     return (db, redirect)
 
 def db_monodb():
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 01ff92c88a0..007a0adc803 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1000,8 +1000,6 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             context: this.user_context || {}
         });
         // Construct a JSON-RPC2 request, method is currently unused
-        if (this.debug)
-            params.debug = 1;
         var payload = {
             jsonrpc: '2.0',
             method: 'call',
@@ -1011,7 +1009,8 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         var deferred = $.Deferred();
         if (! options.shadow)
             this.trigger('request', url, payload);
-
+        payload.debug = this.debug ? true : false;
+        
         this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {
                 if (! options.shadow)

From 0d7ec71bc9d2c0fed4999d7a796166b05293ea6f Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 15:39:28 +0200
Subject: [PATCH 143/197] Renamed all _shit in session to remove the underscore

bzr revid: nicolas.vanhoren@openerp.com-20130711133928-zp40wl2t5q54wrnv
---
 addons/web/http.py | 86 ++++++++++++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 29 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 81435a6d577..aed64cc9183 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -112,13 +112,13 @@ class WebRequest(object):
         self.func_request_type = None
         self.debug = self.httprequest.args.get('debug', False) is not False
         with set_request(self):
-            self.db = self.session._db or db_monodb()
+            self.db = self.session.db or db_monodb()
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.db:
-            threading.current_thread().dbname = self.session._db
-        if self.session._uid:
-            threading.current_thread().uid = self.session._uid
+            threading.current_thread().dbname = self.session.db
+        if self.session.uid:
+            threading.current_thread().uid = self.session.uid
         self.context = self.session.context
         self.lang = self.context["lang"]
 
@@ -127,7 +127,7 @@ class WebRequest(object):
             self.db = None
             self.uid = None
         elif self.auth_method == "admin":
-            self.db = self.session._db or db_monodb()
+            self.db = self.session.db or db_monodb()
             if not self.db:
                 raise SessionExpiredException("No valid database for request %s" % self.httprequest)
             self.uid = openerp.SUPERUSER_ID
@@ -136,8 +136,8 @@ class WebRequest(object):
                 self.session.check_security()
             except SessionExpiredException, e:
                 raise SessionExpiredException("Session expired for request %s" % self.httprequest)
-            self.db = self.session._db
-            self.uid = self.session._uid
+            self.db = self.session.db
+            self.uid = self.session.uid
 
     @property
     def registry(self):
@@ -584,8 +584,8 @@ class Model(object):
         def proxy(*args, **kw):
             # Can't provide any retro-compatibility for this case, so we check it and raise an Exception
             # to tell the programmer to adapt his code
-            if not request.db or not request.uid or self.session._db != request.db \
-                or self.session._uid != request.uid:
+            if not request.db or not request.uid or self.session.db != request.db \
+                or self.session.uid != request.uid:
                 raise Exception("Trying to use Model with badly configured database or user.")
                 
             mod = request.registry.get(self.model)
@@ -608,11 +608,10 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.modified = False
         super(OpenERPSession, self).__init__(*args, **kwargs)
         self.inited = True
-        self.setdefault("_creation_time", time.time())
-        self.setdefault("_db", False)
-        self.setdefault("_uid", False)
-        self.setdefault("_login", False)
-        self.setdefault("_password", False)
+        self.setdefault("db", False)
+        self.setdefault("uid", False)
+        self.setdefault("login", False)
+        self.setdefault("password", False)
         self.setdefault("context", {'tz': "UTC", "uid": None})
         self.setdefault("jsonp_requests", {})
         self.modified = False
@@ -639,10 +638,10 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
             uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, login, password, env])
         else:
             security.check(db, uid, password)
-        self._db = db
-        self._uid = uid
-        self._login = login
-        self._password = password
+        self.db = db
+        self.uid = uid
+        self.login = login
+        self.password = password
         request.db = db
         request.uid = uid
 
@@ -655,9 +654,9 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         should be called at each request. If the authentication fails, a ``SessionExpiredException``
         is raised.
         """
-        if not self._db or not self._uid:
+        if not self.db or not self.uid:
             raise SessionExpiredException("Session expired")
-        security.check(self._db, self._uid, self._password)
+        security.check(self.db, self.uid, self.password)
 
     def logout(self):
         for k in self.keys():
@@ -671,9 +670,9 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
 
         :returns: the new context
         """
-        assert self._uid, "The user needs to be logged-in to initialize his context"
+        assert self.uid, "The user needs to be logged-in to initialize his context"
         self.context = request.registry.get('res.users').context_get(request.cr, request.uid) or {}
-        self.context['uid'] = self._uid
+        self.context['uid'] = self.uid
         self._fix_lang(self.context)
         return self.context
 
@@ -697,6 +696,35 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
 
         context['lang'] = lang or 'en_US'
 
+    """
+        Damn properties for retro-compatibility. All of that is deprecated, all
+        of that.
+    """
+    @property
+    def _db(self):
+        return self.db
+    @_db.setter
+    def _db(self, value):
+        self.db = value
+    @property
+    def _uid(self):
+        return self.uid
+    @_uid.setter
+    def _uid(self, value):
+        self.uid = value
+    @property
+    def _login(self):
+        return self.login
+    @_login.setter
+    def _login(self, value):
+        self.login = value
+    @property
+    def _password(self):
+        return self.password
+    @_password.setter
+    def _password(self, value):
+        self.password = value
+
     def send(self, service_name, method, *args):
         """
         .. deprecated:: 8.0
@@ -718,11 +746,11 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
 
         Ensures this session is valid (logged into the openerp server)
         """
-        if self._uid and not force:
+        if self.uid and not force:
             return
         # TODO use authenticate instead of login
-        self._uid = self.proxy("common").login(self._db, self._login, self._password)
-        if not self._uid:
+        self.uid = self.proxy("common").login(self.db, self.login, self.password)
+        if not self.uid:
             raise AuthenticationError("Authentication failure")
 
     def ensure_valid(self):
@@ -730,11 +758,11 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         .. deprecated:: 8.0
         Use ``check_security()`` instead.
         """
-        if self._uid:
+        if self.uid:
             try:
                 self.assert_valid(True)
             except Exception:
-                self._uid = None
+                self.uid = None
 
     def execute(self, model, func, *l, **d):
         """
@@ -751,7 +779,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         Use the resistry and cursor in ``openerp.addons.web.http.request`` instead.
         """
         self.assert_valid()
-        r = self.proxy('object').exec_workflow(self._db, self._uid, self._password, model, signal, id)
+        r = self.proxy('object').exec_workflow(self.db, self.uid, self.password, model, signal, id)
         return r
 
     def model(self, model):
@@ -765,7 +793,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         :type model: str
         :rtype: a model object
         """
-        if self._db == False:
+        if self.db == False:
             raise SessionExpiredException("Session expired")
 
         return Model(self, model)

From 89c8698cb3c1ea629d8027d7d157e33ad2f3b388 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 15:48:25 +0200
Subject: [PATCH 144/197] Make the server always check the identity of the
 logged user and switch default values of db, uid, login and password to None

bzr revid: nicolas.vanhoren@openerp.com-20130711134825-teiuidqv7z2bzsuq
---
 addons/web/http.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index aed64cc9183..612260fbdbd 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -61,8 +61,9 @@ class WebRequest(object):
 
     .. attribute:: httpsession
 
-        a :class:`~collections.Mapping` holding the HTTP session data for the
-        current http session
+        .. deprecated:: 8.0
+
+        Use ``self.session`` instead.
 
     .. attribute:: params
 
@@ -77,7 +78,8 @@ class WebRequest(object):
 
     .. attribute:: session
 
-        :class:`~session.OpenERPSession` instance for the current request
+        a :class:`OpenERPSession` holding the HTTP session data for the
+        current http session
 
     .. attribute:: context
 
@@ -95,7 +97,7 @@ class WebRequest(object):
     .. attribute:: uid
 
         ``int``, the id of the user related to the current request. Can be ``None``
-        if the current request uses the ``none`` or the ``db`` authenticatoin.
+        if the current request uses the ``none`` authenticatoin.
     """
     def __init__(self, httprequest):
         self.httprequest = httprequest
@@ -123,6 +125,12 @@ class WebRequest(object):
         self.lang = self.context["lang"]
 
     def _authenticate(self):
+        if self.session.uid:
+            try:
+                self.session.check_security()
+            except SessionExpiredException, e:
+                self.session.logout()
+                raise SessionExpiredException("Session expired for request %s" % self.httprequest)
         if self.auth_method == "none":
             self.db = None
             self.uid = None
@@ -132,10 +140,6 @@ class WebRequest(object):
                 raise SessionExpiredException("No valid database for request %s" % self.httprequest)
             self.uid = openerp.SUPERUSER_ID
         else: # auth
-            try:
-                self.session.check_security()
-            except SessionExpiredException, e:
-                raise SessionExpiredException("Session expired for request %s" % self.httprequest)
             self.db = self.session.db
             self.uid = self.session.uid
 
@@ -608,10 +612,10 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.modified = False
         super(OpenERPSession, self).__init__(*args, **kwargs)
         self.inited = True
-        self.setdefault("db", False)
-        self.setdefault("uid", False)
-        self.setdefault("login", False)
-        self.setdefault("password", False)
+        self.setdefault("db", None)
+        self.setdefault("uid", None)
+        self.setdefault("login", None)
+        self.setdefault("password", None)
         self.setdefault("context", {'tz': "UTC", "uid": None})
         self.setdefault("jsonp_requests", {})
         self.modified = False

From 3569ff8654748e9fc12a5852dce42d9254672f0c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 16:05:19 +0200
Subject: [PATCH 145/197] Some details + documentation

bzr revid: nicolas.vanhoren@openerp.com-20130711140519-hdsu75efwvfq4h4q
---
 addons/web/http.py | 72 +++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 43 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 612260fbdbd..0dbfd871667 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -192,21 +192,18 @@ def route(route, type="http", auth="user"):
     Decorator marking the decorated method as being a handler for requests. The method must be part of a subclass
     of ``Controller``.
 
-    Decorator to put on a controller method to inform it does not require a user to be logged. When this decorator
-    is used, ``request.uid`` will be ``None``. The request will still try to detect the database and an exception
-    will be launched if there is no way to guess it.
-
     :param route: string or array. The route part that will determine which http requests will match the decorated
     method. Can be a single string or an array of strings. See werkzeug's routing documentation for the format of
     route expression ( http://werkzeug.pocoo.org/docs/routing/ ).
     :param type: The type of request, can be ``'http'`` or ``'json'``.
     :param auth: The type of authentication method, can on of the following:
 
-        * ``auth``: The user must be authenticated.
-        * ``db``: There is no need for the user to be authenticated but there must be a way to find the current
-        database.
+        * ``user``: The user must be authenticated and the current request will perform using the rights of the
+        user.
+        * ``admin``: The user may not be authenticated and the current request will perform using the admin user.
         * ``none``: The method is always active, even if there is no database. Mainly used by the framework and
-        authentication modules.
+        authentication modules. There request code will not have any facilities to access the database nor have any
+        configuration indicating the current database nor the current user.
     """
     assert type in ["http", "json"]
     assert auth in ["user", "admin", "none"]
@@ -234,8 +231,7 @@ class JsonRequest(WebRequest):
 
       --> {"jsonrpc": "2.0",
            "method": "call",
-           "params": {"session_id": "SID",
-                      "context": {},
+           "params": {"context": {},
                       "arg1": "val1" },
            "id": null}
 
@@ -247,8 +243,7 @@ class JsonRequest(WebRequest):
 
       --> {"jsonrpc": "2.0",
            "method": "call",
-           "params": {"session_id": "SID",
-                      "context": {},
+           "params": {"context": {},
                       "arg1": "val1" },
            "id": null}
 
@@ -302,8 +297,6 @@ class JsonRequest(WebRequest):
 
     def dispatch(self):
         """ Calls the method asked for by the JSON-RPC2 or JSONP request
-
-        :returns: an utf8 encoded JSON-RPC2 or JSONP reply
         """
         if self.jsonp_handler:
             return self.jsonp_handler()
@@ -382,14 +375,10 @@ def to_jsonable(o):
     return u"%s" % o
 
 def jsonrequest(f):
-    """ Decorator marking the decorated method as being a handler for a
-    JSON-RPC request (the exact request path is specified via the
-    ``$(Controller._cp_path)/$methodname`` combination.
+    """ 
+        .. deprecated:: 8.0
 
-    If the method is called, it will be provided with a :class:`JsonRequest`
-    instance and all ``params`` sent during the JSON-RPC request, apart from
-    the ``session_id``, ``context`` and ``debug`` keys (which are stripped out
-    beforehand)
+        Use the ``route()`` decorator instead.
     """
     f.combine = True
     base = f.__name__
@@ -469,14 +458,10 @@ class HttpRequest(WebRequest):
         return werkzeug.exceptions.NotFound(description)
 
 def httprequest(f):
-    """ Decorator marking the decorated method as being a handler for a
-    normal HTTP request (the exact request path is specified via the
-    ``$(Controller._cp_path)/$methodname`` combination.
+    """ 
+        .. deprecated:: 8.0
 
-    If the method is called, it will be provided with a :class:`HttpRequest`
-    instance and all ``params`` sent during the request (``GET`` and ``POST``
-    merged in the same dictionary), apart from the ``session_id``, ``context``
-    and ``debug`` keys (which are stripped out beforehand)
+        Use the ``route()`` decorator instead.
     """
     f.combine = True
     base = f.__name__
@@ -797,7 +782,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         :type model: str
         :rtype: a model object
         """
-        if self.db == False:
+        if not self.db:
             raise SessionExpiredException("Session expired")
 
         return Model(self, model)
@@ -890,10 +875,7 @@ class Root(object):
 
     def dispatch(self, environ, start_response):
         """
-        Performs the actual WSGI dispatching for the application, may be
-        wrapped during the initialization of the object.
-
-        Call the object directly.
+        Performs the actual WSGI dispatching for the application.
         """
         try:
             httprequest = werkzeug.wrappers.Request(environ)
@@ -1042,12 +1024,7 @@ class Root(object):
 
     def find_handler(self):
         """
-        Tries to discover the controller handling the request for the path
-        specified by the provided parameters
-
-        :param path: path to match
-        :returns: a callable matching the path sections
-        :rtype: ``Controller | None``
+        Tries to discover the controller handling the request for the path specified in the request.
         """
         path = request.httprequest.path
         urls = self.get_db_router(request.db).bind("")
@@ -1073,13 +1050,13 @@ def db_list(force=False):
     return dbs
 
 def db_redirect(match_first_only_if_unique):
-    db = False
-    redirect = False
+    db = None
+    redirect = None
 
     # 1 try the db in the url
     db_url = request.httprequest.args.get('db')
     if db_url:
-        return (db_url, False)
+        return (db_url, None)
 
     dbs = db_list(True)
 
@@ -1100,7 +1077,16 @@ def db_redirect(match_first_only_if_unique):
     return (db, redirect)
 
 def db_monodb():
-    # if only one db exists, return it else return False
+    """
+        Magic function to find the current database.
+
+        Implementation details:
+
+        * Magic
+        * More magic
+
+        Return ``None`` if the magic is not magic enough.
+    """
     return db_redirect(True)[0]
 
 

From e6fc23d9802d467c8229dba060c655b2b56cf24c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 16:18:32 +0200
Subject: [PATCH 146/197] Forgot some refactoring

bzr revid: nicolas.vanhoren@openerp.com-20130711141832-8y5yj3lj7h4gb94q
---
 addons/web/controllers/main.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 124ca979c5c..d485d58443d 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -810,16 +810,16 @@ class Session(http.Controller):
         request.session.ensure_valid()
         return {
             "session_id": request.session_id,
-            "uid": request.session._uid,
-            "user_context": request.session.get_context() if request.session._uid else {},
-            "db": request.session._db,
-            "username": request.session._login,
+            "uid": request.session.uid,
+            "user_context": request.session.get_context() if request.session.uid else {},
+            "db": request.session.db,
+            "username": request.session.login,
         }
 
     @http.route('/web/session/get_session_info', type='json', auth="none")
     def get_session_info(self):
-        request.uid = request.session._uid
-        request.db = request.session._db
+        request.uid = request.session.uid
+        request.db = request.session.db
         return self.session_info()
 
     @http.route('/web/session/authenticate', type='json', auth="none")
@@ -853,7 +853,7 @@ class Session(http.Controller):
     @http.route('/web/session/sc_list', type='json', auth="user")
     def sc_list(self):
         return request.session.model('ir.ui.view_sc').get_sc(
-            request.session._uid, "ir.ui.menu", request.context)
+            request.session.uid, "ir.ui.menu", request.context)
 
     @http.route('/web/session/get_lang_list', type='json', auth="none")
     def get_lang_list(self):
@@ -928,7 +928,7 @@ class Menu(http.Controller):
         s = request.session
         Menus = s.model('ir.ui.menu')
         # If a menu action is defined use its domain to get the root menu items
-        user_menu_id = s.model('res.users').read([s._uid], ['menu_id'],
+        user_menu_id = s.model('res.users').read([s.uid], ['menu_id'],
                                                  request.context)[0]['menu_id']
 
         menu_domain = [('parent_id', '=', False)]
@@ -1125,7 +1125,7 @@ class View(http.Controller):
     def add_custom(self, view_id, arch):
         CustomView = request.session.model('ir.ui.view.custom')
         CustomView.create({
-            'user_id': request.session._uid,
+            'user_id': request.session.uid,
             'ref_id': view_id,
             'arch': arch
         }, request.context)
@@ -1134,7 +1134,7 @@ class View(http.Controller):
     @http.route('/web/view/undo_custom', type='json', auth="user")
     def undo_custom(self, view_id, reset=False):
         CustomView = request.session.model('ir.ui.view.custom')
-        vcustom = CustomView.search([('user_id', '=', request.session._uid), ('ref_id' ,'=', view_id)],
+        vcustom = CustomView.search([('user_id', '=', request.session.uid), ('ref_id' ,'=', view_id)],
                                     0, False, False, request.context)
         if vcustom:
             if reset:
@@ -1317,9 +1317,9 @@ class Binary(http.Controller):
     def company_logo(self, dbname=None):
         # TODO add etag, refactor to use /image code for etag
         uid = None
-        if request.session._db:
-            dbname = request.session._db
-            uid = request.session._uid
+        if request.session.db:
+            dbname = request.session.db
+            uid = request.session.uid
         elif dbname is None:
             dbname = db_monodb()
 
@@ -1685,14 +1685,14 @@ class Reports(http.Controller):
             raise ValueError("action['datas']['ids'] and context['active_ids'] are undefined")
 
         report_id = report_srv.report(
-            request.session._db, request.session._uid, request.session._password,
+            request.session.db, request.session.uid, request.session.password,
             action["report_name"], report_ids,
             report_data, context)
 
         report_struct = None
         while True:
             report_struct = report_srv.report_get(
-                request.session._db, request.session._uid, request.session._password, report_id)
+                request.session.db, request.session.uid, request.session.password, report_id)
             if report_struct["state"]:
                 break
 

From a0a05454aa2e04c7b66425c40c3812890fc35458 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 17:41:37 +0200
Subject: [PATCH 147/197] Solved a problem appearing in share module

bzr revid: nicolas.vanhoren@openerp.com-20130711154137-vwgb5cd4wj26jed8
---
 addons/web/http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 0dbfd871667..5e48749df45 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -394,7 +394,7 @@ class HttpRequest(WebRequest):
     def __init__(self, *args):
         super(HttpRequest, self).__init__(*args)
         params = dict(self.httprequest.args)
-        ex = set(["session_id", "debug", "db"])
+        ex = set(["session_id", "debug"])
         for k in params.keys():
             if k in ex:
                 del params[k]

From 12f58092f2df0d7236dbadf346765bcb37ae5929 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 11 Jul 2013 18:07:02 +0200
Subject: [PATCH 148/197] [IMP] some refactoring due to changes in the web
 client

bzr revid: nicolas.vanhoren@openerp.com-20130711160702-qs6pfyqsxmzd7cgy
---
 addons/im/im.py                          | 16 +++++----
 addons/im_livechat/im_livechat.py        | 45 ++++++++++++++----------
 addons/point_of_sale/controllers/main.py |  4 +--
 3 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/addons/im/im.py b/addons/im/im.py
index 4a867789cbc..505ca3627b6 100644
--- a/addons/im/im.py
+++ b/addons/im/im.py
@@ -101,17 +101,19 @@ class LongPollingController(http.Controller):
             raise Exception("Not usable in a server not running gevent")
         from openerp.addons.im.watcher import ImWatcher
         if db is not None:
-            request.session.authenticate(db=db, uid=uid, password=password)
+            openerp.service.security.check(db, uid, password)
         else:
-            request.session.authenticate(db=request.session._db, uid=request.session._uid, password=request.session._password)
+            uid = request.session.uid
+            db = request.session.db
 
-        with request.registry.cursor() as cr:
-            request.registry.get('im.user').im_connect(cr, request.uid, uuid=uuid, context=request.context)
-            my_id = request.registry.get('im.user').get_by_user_id(cr, request.uid, uuid or request.session._uid, request.context)["id"]
+        registry = openerp.modules.registry.RegistryManager.get(db)
+        with registry.cursor() as cr:
+            registry.get('im.user').im_connect(cr, uid, uuid=uuid, context=request.context)
+            my_id = registry.get('im.user').get_by_user_id(cr, uid, uuid or uid, request.context)["id"]
         num = 0
         while True:
-            with request.registry.cursor() as cr:
-                res = request.registry.get('im.message').get_messages(cr, request.uid, last, users_watch, uuid=uuid, context=request.context)
+            with registry.cursor() as cr:
+                res = registry.get('im.message').get_messages(cr, uid, last, users_watch, uuid=uuid, context=request.context)
             if num >= 1 or len(res["res"]) > 0:
                 return res
             last = res["last"]
diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
index adceebc7cba..b68a0079c3a 100644
--- a/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@ -37,36 +37,45 @@ env.filters["json"] = json.dumps
 
 class LiveChatController(http.Controller):
 
-    @http.route('/im_livechat/loader')
+    def _auth(self, db):
+        reg = openerp.modules.registry.RegistryManager.get(db)
+        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, "anonymous", "anonymous", None])
+        return reg, uid
+
+    @http.route('/im_livechat/loader', auth="none")
     def loader(self, **kwargs):
         p = json.loads(kwargs["p"])
         db = p["db"]
         channel = p["channel"]
         user_name = p.get("user_name", None)
-        request.session.authenticate(db=db, login="anonymous", password="anonymous")
-        info = request.session.model('im_livechat.channel').get_info_for_chat_src(channel)
-        info["db"] = db
-        info["channel"] = channel
-        info["userName"] = user_name
-        return request.make_response(env.get_template("loader.js").render(info),
-             headers=[('Content-Type', "text/javascript")])
 
-    @http.route('/im_livechat/web_page')
+        reg, uid = self._auth(db)
+        with reg.cursor() as cr:
+            info = reg.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel)
+            info["db"] = db
+            info["channel"] = channel
+            info["userName"] = user_name
+            return request.make_response(env.get_template("loader.js").render(info),
+                 headers=[('Content-Type', "text/javascript")])
+
+    @http.route('/im_livechat/web_page', auth="none")
     def web_page(self, **kwargs):
         p = json.loads(kwargs["p"])
         db = p["db"]
         channel = p["channel"]
-        request.session.authenticate(db=db, login="anonymous", password="anonymous")
-        script = request.session.model('im_livechat.channel').read(channel, ["script"])["script"]
-        info = request.session.model('im_livechat.channel').get_info_for_chat_src(channel)
-        info["script"] = script
-        return request.make_response(env.get_template("web_page.html").render(info),
-             headers=[('Content-Type', "text/html")])
+        reg, uid = self._auth(db)
+        with reg.cursor() as cr:
+            script = reg.get('im_livechat.channel').read(cr, uid, channel, ["script"])["script"]
+            info = reg.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel)
+            info["script"] = script
+            return request.make_response(env.get_template("web_page.html").render(info),
+                 headers=[('Content-Type', "text/html")])
 
-    @http.route('/im_livechat/available', type='json')
+    @http.route('/im_livechat/available', type='json', auth="none")
     def available(self, db, channel):
-        request.session.authenticate(db=db, login="anonymous", password="anonymous")
-        return request.session.model('im_livechat.channel').get_available_user(channel) > 0
+        reg, uid = self._auth(db)
+        with reg.cursor() as cr:
+            return reg.get('im_livechat.channel').get_available_user(cr, uid, channel) > 0
 
 class im_livechat_channel(osv.osv):
     _name = 'im_livechat.channel'
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index b189c8f204a..a4a06e94eaa 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -14,9 +14,7 @@ class PointOfSaleController(openerp.addons.web.http.Controller):
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
         css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
 
-        cookie = req.httprequest.cookies.get("instance0|session_id")
-        session_id = cookie.replace("%22","")
-        template = html_template.replace('<html','<html manifest="/pos/manifest?session_id=%s"'%session_id)
+        template = html_template.replace('<html','<html manifest="/pos/manifest?session_id=%s"' % req.session_id)
         r = template % {
             'js': js,
             'css': css,

From b47a121f4485b57350c7168f115fcabecf8437d7 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Fri, 12 Jul 2013 13:06:54 +0530
Subject: [PATCH 149/197] [Imp] Improve code for pricelists.

bzr revid: amb@tinyerp.com-20130712073654-1fowt1xojgx0pjdc
---
 addons/product/pricelist.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 2396c56df34..649b721eb46 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -376,20 +376,26 @@ class product_pricelist_item(osv.osv):
         result.append((-2, _('Supplier Prices on the product form')))
         return result
 
-    def _default_get(self, cr, uid, fields, context=None):
-        result = self._price_field_get(cr,uid,context)
+# Added default function to fetch the Price type Based on Pricelist type.
+    def _get_default_base(self, cr, uid, fields, context=None):
+        product_price_type_obj = self.pool.get('product.price.type')
         if fields.get('type') == 'purchase':
-            base_value = [item for item in result if 'Cost Price' in item]
-            return base_value[0]
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field', '=', 'standard_price')], context=context)
+        elif fields.get('type') == 'sale':
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context=context)
         else:
-            base_value = [item for item in result if 'Public Price' in item]
-            return base_value[0]
+            return -1
+        if not product_price_type_ids:
+            return False
+        else:
+            pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+            return pricetype.id
 
     _name = "product.pricelist.item"
     _description = "Pricelist item"
     _order = "sequence, min_quantity desc"
     _defaults = {
-        'base': _default_get,
+        'base': _get_default_base,
         'min_quantity': lambda *a: 0,
         'sequence': lambda *a: 5,
         'price_discount': lambda *a: 0,

From edc65569e4114b0eb4f12e063e32a077ea07c5dd Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 12 Jul 2013 14:20:19 +0530
Subject: [PATCH 150/197] [IMP] revert change of rename tax code to 'Your
 Company' from 'Tax'.

bzr revid: tpa@tinyerp.com-20130712085019-oq5ar8jtm2n5s7ae
---
 addons/l10n_in/l10n_in_tax_code_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 1b6f0732ba1..983d2fa4910 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -4,7 +4,7 @@
     <data noupdate="True">
 
         <record model="account.tax.code.template" id="vat_code_tax">
-            <field name="name">Your Company</field>
+            <field name="name">Tax</field>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_balance_net">

From a7ab235c3a88dc817d61c526b9474c5537d5ed61 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 12 Jul 2013 11:53:09 +0200
Subject: [PATCH 151/197] changed session handling

bzr revid: nicolas.vanhoren@openerp.com-20130712095309-41u7fi7ecs0y1lm1
---
 addons/web/http.py                    | 19 ++++++++++++++++---
 addons/web/static/src/js/corelib.js   | 17 ++++++++++-------
 addons/web/static/src/js/coresetup.js | 25 +++++++++++++++++--------
 addons/web/static/src/xml/base.xml    |  8 ++++----
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index 5e48749df45..f3ae2f34d6a 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -885,8 +885,12 @@ class Root(object):
             session_gc(self.session_store)
 
             sid = httprequest.args.get('session_id')
+            explicit_session = True
+            if not sid:
+                sid =  httprequest.headers.get("X-Openerp-Session-Id")
             if not sid:
                 sid = httprequest.cookies.get('session_id')
+                explicit_session = False
             if sid is None:
                 httprequest.session = self.session_store.new()
             else:
@@ -921,7 +925,7 @@ class Root(object):
 
             if httprequest.session.should_save:
                 self.session_store.save(httprequest.session)
-            if hasattr(response, 'set_cookie'):
+            if not explicit_session and hasattr(response, 'set_cookie'):
                 response.set_cookie('session_id', httprequest.session.sid)
 
             return response(environ, start_response)
@@ -1040,6 +1044,8 @@ class Root(object):
         request.auth_method = getattr(original, "auth", "user")
         request.func_request_type = original.exposed
 
+root = None
+
 def db_list(force=False):
     proxy = request.session.proxy("db")
     dbs = proxy.list(force)
@@ -1090,14 +1096,21 @@ def db_monodb():
     return db_redirect(True)[0]
 
 
-class JsonRpcController(Controller):
+class CommonController(Controller):
 
     @route('/jsonrpc', type='json', auth="none")
     def jsonrpc(self, service, method, args):
         """ Method used by client APIs to contact OpenERP. """
         return openerp.netsvc.dispatch_rpc(service, method, args)
 
+    @route('/gen_session_id', type='json', auth="none")
+    def gen_session_id(self):
+        nsession = root.session_store.new()
+        return nsession.sid
+
 def wsgi_postload():
-    openerp.wsgi.register_wsgi_handler(Root())
+    global root
+    root = Root()
+    openerp.wsgi.register_wsgi_handler(root)
 
 # vim:et:ts=4:sw=4:
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 007a0adc803..3b328fb8765 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -967,6 +967,8 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         instance.web.PropertiesMixin.init.call(this);
         this.server = null;
         this.debug = ($.deparam($.param.querystring()).debug != undefined);
+        this.override_session = false;
+        this.session_id = undefined;
     },
     setup: function(origin) {
         var window_origin = location.protocol+"//"+location.host, self=this;
@@ -1009,7 +1011,6 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
         var deferred = $.Deferred();
         if (! options.shadow)
             this.trigger('request', url, payload);
-        payload.debug = this.debug ? true : false;
         
         this.rpc_function(url, payload).then(
             function (response, textStatus, jqXHR) {
@@ -1055,7 +1056,10 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
             dataType: 'json',
             contentType: 'application/json',
             data: JSON.stringify(payload),
-            processData: false
+            processData: false,
+            headers: {
+                "X-Openerp-Session-Id": this.override_session ? this.session_id : undefined,
+            },
         }, url);
         if (this.synch)
             ajax.async = false;
@@ -1134,11 +1138,10 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
     },
 
     url: function(path, params) {
-        var qs = '';
-        if (!_.isNull(params)) {
-            params = _.extend(params || {}, {session_id: this.session_id});
-            qs = '?' + $.param(params);
-        }
+        params = _.extend(params || {});
+        if (this.override_session)
+            params.session_id = this.session_id;
+        var qs = '?' + $.param(params);
         var prefix = _.any(['http://', 'https://', '//'], _.bind(_.str.startsWith, null, path)) ? '' : this.prefix; 
         return prefix + path + qs;
     },
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index f153d3ad73a..3ba5855533f 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -38,11 +38,10 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         var self = this;
         this.setup(origin);
         instance.web.qweb.default_dict['_s'] = this.origin;
-        this.session_id = false;
-        this.uid = false;
-        this.username = false;
+        this.uid = null;
+        this.username = null;
         this.user_context= {};
-        this.db = false;
+        this.db = null;
         this.module_list = instance._modules.slice();
         this.module_loaded = {};
         _(this.module_list).each(function (mod) {
@@ -56,8 +55,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
      */
     session_init: function () {
         var self = this;
-        // TODO: session store in cookie should be optional
-        this.session_id = this.get_cookie('session_id');
         return this.session_reload().then(function(result) {
             var modules = instance._modules.join(',');
             var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self));
@@ -80,7 +77,19 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
      */
     session_reload: function () {
         var self = this;
-        return this.rpc("/web/session/get_session_info", {}).done(function(result) {
+        var def = $.when();
+        if (this.override_session) {
+            if (! this.session_id) {
+                def = this.rpc("/gen_session_id", {}).then(function(result) {
+                    self.session_id = result;
+                });
+            }
+        } else {
+            this.session_id = this.get_cookie('session_id');
+        }
+        return def.then(function() {
+            return self.rpc("/web/session/get_session_info", {})
+        }).then(function(result) {
             // If immediately follows a login (triggered by trying to restore
             // an invalid session or no session at all), refresh session data
             // (should not change, but just in case...)
@@ -326,7 +335,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
         }
 
         _(_.extend({}, options.data || {},
-                   {session_id: this.session_id, token: token}))
+                   {session_id: this.override_session ? this.session_id : undefined, token: token}))
             .each(function (value, key) {
                 var $input = $form.find('[name=' + key +']');
                 if (!$input.length) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a459486bf05..643bca0e798 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -654,7 +654,7 @@
                             <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>
                             <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
                             <input type="hidden" name="id" t-att-value="widget.model_id"/>
-                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/>
                             <span>Add...</span>
                         </t>
                     </li>
@@ -1320,7 +1320,7 @@
     <div t-attf-class="oe_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style">
         <form class="oe_form_binary_form" t-att-target="fileupload_id"
             method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'">
-            <input type="hidden" name="session_id" value=""/>
+            <input type="hidden" name="session_id" value="" t-if="widget.session.override_session"/>
             <input type="hidden" name="callback" t-att-value="fileupload_id"/>
             <t t-raw="__content__"/>
             <input type="file" class="oe_form_binary_file" name="ufile" t-if="widget.widget!='image'"/>
@@ -1372,7 +1372,7 @@
                 <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>
                 <input type="hidden" name="model" t-att-value="widget.view.model"/>
                 <input type="hidden" name="id" value="0"/>
-                <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/>
             </t>
         </div>
     </div>
@@ -1835,7 +1835,7 @@
 <t t-name="ImportDataView">
 <form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
         class="oe_import oe_import_no_result">
-    <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+    <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/>
     <h2 class="separator horizontal">1. Import a .CSV file</h2>
     <p>Select a .CSV file to import. If you need a sample of file to import,
        you should use the export tool with the "Import Compatible" option.

From d697f759c23b94d2bb49e618cb2f87081531b414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 12 Jul 2013 11:54:55 +0200
Subject: [PATCH 152/197] [IMP] point_of_sale: ported the proxy to the new
 routing api

bzr revid: fva@openerp.com-20130712095455-e4hndk977nigtnx7
---
 addons/point_of_sale/controllers/main.py | 107 +++++++++++------------
 1 file changed, 52 insertions(+), 55 deletions(-)

diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index b189c8f204a..5561375717c 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -4,29 +4,31 @@ import simplejson
 import os
 import openerp
 
+from openerp.addons.web import http
+from openerp.addons.web.http import request
 from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 
-class PointOfSaleController(openerp.addons.web.http.Controller):
-    _cp_path = '/pos'
+class PointOfSaleController(http.Controller):
+    #_cp_path = '/pos'
 
-    @openerp.addons.web.http.httprequest
-    def app(self, req, s_action=None, **kw):
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
+    @http.route('/pos/app', type='http', auth='admin')
+    def app(self):
+        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js',db=request.db))
+        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css',db=request.db))
 
-        cookie = req.httprequest.cookies.get("instance0|session_id")
+        cookie = request.httprequest.cookies.get("instance0|session_id")
         session_id = cookie.replace("%22","")
         template = html_template.replace('<html','<html manifest="/pos/manifest?session_id=%s"'%session_id)
         r = template % {
             'js': js,
             'css': css,
-            'modules': simplejson.dumps(module_boot(req)),
+            'modules': simplejson.dumps(module_boot(request)),
             'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
         }
         return r
 
-    @openerp.addons.web.http.httprequest
-    def manifest(self, req, **kwargs):
+    @http.route('/pos/manifest',type='http', auth='admin')
+    def manifest(self):
         """ This generates a HTML5 cache manifest files that preloads the categories and products thumbnails 
             and other ressources necessary for the point of sale to work offline """
 
@@ -45,16 +47,16 @@ class PointOfSaleController(openerp.addons.web.http.Controller):
         imgdir = openerp.modules.get_module_resource('point_of_sale','static/src/img');
         load_css_img(imgdir,'/point_of_sale/static/src/img')
         
-        products = req.session.model('product.product')
-        for p in products.search_read([('pos_categ_id','!=',False)], ['name']):
+        products = request.registry.get('product.product')
+        for p in products.search_read(request.cr, request.uid, [('pos_categ_id','!=',False)], ['name']):
             product_id = p['id']
-            url = "/web/binary/image?session_id=%s&model=product.product&field=image&id=%s" % (req.session_id, product_id)
+            url = "/web/binary/image?session_id=%s&model=product.product&field=image&id=%s" % (request.session_id, product_id)
             ml.append(url)
         
-        categories = req.session.model('pos.category')
-        for c in categories.search_read([],['name']):
+        categories = request.registry.get('pos.category')
+        for c in categories.search_read(request.cr, request.uid, [], ['name']):
             category_id = c['id']
-            url = "/web/binary/image?session_id=%s&model=pos.category&field=image&id=%s" % (req.session_id, category_id)
+            url = "/web/binary/image?session_id=%s&model=pos.category&field=image&id=%s" % (request.session_id, category_id)
             ml.append(url)
 
         ml += ["NETWORK:","*"]
@@ -62,108 +64,103 @@ class PointOfSaleController(openerp.addons.web.http.Controller):
 
         return m
 
-    @openerp.addons.web.http.jsonrequest
-    def dispatch(self, request, iface, **kwargs):
-        method = 'iface_%s' % iface
-        return getattr(self, method)(request, **kwargs)
-
-    @openerp.addons.web.http.jsonrequest
-    def scan_item_success(self, request, ean):
+    @http.route('/pos/scan_item_success', type='json', auth='admin')
+    def scan_item_success(self, ean):
         """
         A product has been scanned with success
         """
         print 'scan_item_success: ' + str(ean)
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def scan_item_error_unrecognized(self, request, ean):
+    @http.route('/pos/scan_item_error_unrecognized')
+    def scan_item_error_unrecognized(self, ean):
         """
         A product has been scanned without success
         """
         print 'scan_item_error_unrecognized: ' + str(ean)
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def help_needed(self, request):
+    @http.route('/pos/help_needed', type='json', auth='admin')
+    def help_needed(self):
         """
         The user wants an help (ex: light is on)
         """
         print "help_needed"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def help_canceled(self, request):
+    @http.route('/pos/help_canceled', type='json', auth='admin')
+    def help_canceled(self):
         """
         The user stops the help request
         """
         print "help_canceled"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def weighting_start(self, request):
+    @http.route('/pos/weighting_start', type='json', auth='admin')
+    def weighting_start(self):
         print "weighting_start"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def weighting_read_kg(self, request):
+    @http.route('/pos/weighting_read_kg', type='json', auth='admin')
+    def weighting_read_kg(self):
         print "weighting_read_kg"
         return 0.0
 
-    @openerp.addons.web.http.jsonrequest
-    def weighting_end(self, request):
+    @http.route('/pos/weighting_end', type='json', auth='admin')
+    def weighting_end(self):
         print "weighting_end"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def payment_request(self, request, price):
+    @http.route('/pos/payment_request', type='json', auth='admin')
+    def payment_request(self, price):
         """
         The PoS will activate the method payment 
         """
         print "payment_request: price:"+str(price)
         return 'ok'
 
-    @openerp.addons.web.http.jsonrequest
-    def payment_status(self, request):
+    @http.route('/pos/payment_status', type='json', auth='admin')
+    def payment_status(self):
         print "payment_status"
         return { 'status':'waiting' } 
 
-    @openerp.addons.web.http.jsonrequest
-    def payment_cancel(self, request):
+    @http.route('/pos/payment_cancel', type='json', auth='admin')
+    def payment_cancel(self):
         print "payment_cancel"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def transaction_start(self, request):
+    @http.route('/pos/transaction_start', type='json', auth='admin')
+    def transaction_start(self):
         print 'transaction_start'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def transaction_end(self, request):
+    @http.route('/pos/transaction_end', type='json', auth='admin')
+    def transaction_end(self):
         print 'transaction_end'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def cashier_mode_activated(self, request):
+    @http.route('/pos/cashier_mode_activated', type='json', auth='admin')
+    def cashier_mode_activated(self):
         print 'cashier_mode_activated'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def cashier_mode_deactivated(self, request):
+    @http.route('/pos/cashier_mode_deactivated', type='json', auth='admin')
+    def cashier_mode_deactivated(self):
         print 'cashier_mode_deactivated'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def open_cashbox(self, request):
+    @http.route('/pos/open_cashbox', type='json', auth='admin')
+    def open_cashbox(self):
         print 'open_cashbox'
         return
 
-    @openerp.addons.web.http.jsonrequest
-    def print_receipt(self, request, receipt):
+    @http.route('/pos/print_receipt', type='json', auth='admin')
+    def print_receipt(self, receipt):
         print 'print_receipt' + str(receipt)
         return
 
-    @openerp.addons.web.http.jsonrequest
-    def print_pdf_invoice(self, request, pdfinvoice):
+    @http.route('/pos/print_receipt', type='json', auth='admin')
+    def print_pdf_invoice(self, pdfinvoice):
         print 'print_pdf_invoice' + str(pdfinvoice)
         return
 

From 3c4455981105e4af72cedd8bca9a6abb76bb2ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 12 Jul 2013 14:34:55 +0200
Subject: [PATCH 153/197] [IMP] point_of_sale: reduced the weighting probe
 interval, and put a non zero default value for easier testing

bzr revid: fva@openerp.com-20130712123455-whp86jp9qbmo6p0o
---
 addons/point_of_sale/controllers/main.py      | 4 ++--
 addons/point_of_sale/static/src/js/screens.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 9b8793bca21..db5d5a25018 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -104,7 +104,7 @@ class PointOfSaleController(http.Controller):
     @http.route('/pos/weighting_read_kg', type='json', auth='admin')
     def weighting_read_kg(self):
         print "weighting_read_kg"
-        return 0.0
+        return 3.14
 
     @http.route('/pos/weighting_end', type='json', auth='admin')
     def weighting_end(self):
@@ -159,7 +159,7 @@ class PointOfSaleController(http.Controller):
         print 'print_receipt' + str(receipt)
         return
 
-    @http.route('/pos/print_receipt', type='json', auth='admin')
+    @http.route('/pos/print_pdf_invoice', type='json', auth='admin')
     def print_pdf_invoice(self, pdfinvoice):
         print 'print_pdf_invoice' + str(pdfinvoice)
         return
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 0ca814d82fb..e0a8ba4b71c 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -460,7 +460,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     clearInterval(this.intervalID);
                     self.pos_widget.screen_selector.set_current_screen(self.next_screen);
                 }
-            },500);
+            },100);
 
             this.add_action_button({
                     label: _t('Back'),
@@ -515,7 +515,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     self.weight = weight;
                     self.renderElement();
                 }
-            },200);
+            },100);
         },
         renderElement: function(){
             var self = this;

From 6694183dcb7b95947eea4931bc76cc3e2e1dcee8 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 12 Jul 2013 19:09:20 +0530
Subject: [PATCH 154/197] [IMP] Improved code and added {'is_editable':
 True/False, 'is_uid': True/False} -- where is_editable will be True if uid is
 in technical group -- where is_uid will be True if uid is in
 partner.user_ids.

bzr revid: psa@tinyerp.com-20130712133920-96l6axns7yynyz9e
---
 addons/mail/mail_thread.py                  | 21 ++++++++++-----
 addons/mail/static/src/js/mail_followers.js | 30 ++++++++++-----------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 59f2817d016..ebd143e1be8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -156,12 +156,21 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def check_technical_rights(self, cr, uid, ids, context=None):
-        grp_id =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
-        user_pid = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
-        if uid in user_pid:
-            return True
-        return False
+    def read_followers_data(self, cr, uid, ids, context=None):
+        data = self.pool.get('res.partner').read(cr, uid, ids, ['name', 'user_ids'], context=context)
+
+        grp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
+        tech_user = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+
+        if uid in tech_user:
+            for dict in data:
+                if dict['id'] in [user_pid]:
+                    dict.update({'is_editable': True})
+                if uid in dict['user_ids']:
+                    dict.update({'is_uid': True})
+
+        return data
 
     def _get_subscription_data(self, cr, uid, ids, name, args, user_pid=None, context=None):
         """ Computes:
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 260ff6092ea..99c2a629f5d 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -29,7 +29,6 @@ openerp_mail_followers = function(session, mail) {
             this.displayed_limit = this.node.attrs.displayed_nb || 10;
             this.displayed_nb = this.displayed_limit;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
-            this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
 
             this.value = [];
@@ -37,6 +36,7 @@ openerp_mail_followers = function(session, mail) {
             
             this.view_is_editable = this.__parentedParent.is_action_enabled('edit');
             this.check_access = false;
+            this.is_follower = false;
         },
 
         start: function() {
@@ -46,7 +46,6 @@ openerp_mail_followers = function(session, mail) {
             this.reinit();
             this.bind_events();
             this._super();
-            this.check_group_tech_feature();
         },
 
         on_check_visibility_mode: function () {
@@ -154,11 +153,14 @@ openerp_mail_followers = function(session, mail) {
         },
 
         fetch_followers: function (value_) {
+            var self = this;
             this.value = value_ || {};
-            return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
-                .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
-                .then(this.proxy('display_buttons'))
-                .then(this.proxy('fetch_subtypes'));
+            return this.ds_model.call('read_followers_data', [this.value]).then(function(result) {
+                self.result = result;
+                self.display_followers(result), self.proxy('fetch_generic');
+                self.display_buttons();
+                self.fetch_subtypes();
+            });
         },
 
         /** Read on res.partner failed: fall back on a generic case
@@ -190,18 +192,16 @@ openerp_mail_followers = function(session, mail) {
             this.$('.oe_follower_title').html(this._format_followers(this.value.length));
         },
 
-        check_group_tech_feature: function(){
-            var self = this;
-            self.ds_model.call('check_technical_rights', [self.session.uid]).then(function(result){
-                self.check_access = result;
-            });
-        },
-
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
             this.followers = records || this.followers;
-            this.message_is_follower = this.set_is_follower(this.followers);
+            _.each(this.result, function (record) {
+                if (self.session.uid == record.user_ids[0]) {
+                    if (record.is_editable == true) { self.check_access = true; }
+                }
+            });
+            this.message_is_follower = this.set_is_follower(this.followers); // self.is_follower
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
@@ -210,7 +210,7 @@ openerp_mail_followers = function(session, mail) {
             _(truncated).each(function (record) {
                 record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
-                // On mouseenter it will show the edit_subtype penil
+                // On mouse-enter it will show the edit_subtype pencil.
                 if (self.check_access == true) {
                     self.$el.on('mouseenter', 'div.oe_follower_list', function() {
                         $("img.oe_edit_subtype").removeClass("hidden");

From a81df9ca2b9cd8536d51b1d8b0a4be104b997244 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 15 Jul 2013 04:51:54 +0000
Subject: [PATCH 155/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130714054309-ugij4upsn8mogaqu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715045154-1z08ygq4kywcfjio
---
 addons/project/i18n/zh_CN.po           | 27 +++++++++++++++++---------
 addons/project_long_term/i18n/zh_CN.po |  6 +++---
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index a34ee77a749..8d5f0a04018 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -7,13 +7,13 @@ 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: 2013-07-08 14:09+0000\n"
+"PO-Revision-Date: 2013-07-14 04:15+0000\n"
 "Last-Translator: Alan <shuchuan.wu@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: 2013-07-09 05:16+0000\n"
+"X-Launchpad-Export-Date: 2013-07-15 04:51+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: project
@@ -458,7 +458,7 @@ msgstr "延期的任务"
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
-msgstr "代表"
+msgstr "任务委派"
 
 #. module: project
 #: field:project.task,create_date:0
@@ -636,6 +636,15 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  创建一个新项目\n"
+"                </p><p>\n"
+"                  "
+"项目是组织活动，计划任务，跟踪问题，记录人力资源成本的组织形式。项目可以分为内部项目（研发活动，加快销售进度），私有项目或者客户参与的项目。\n"
+"                </p><p>\n"
+"                内部用户以项目成员的方式参与到项目中，也可以邀请客户加入到项目中分享项目活动。\n"
+"                </p>\n"
+"            "
 
 #. module: project
 #: view:project.config.settings:0
@@ -647,7 +656,7 @@ msgstr "计划"
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "最后期限"
+msgstr "计划完成日期"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1137,7 +1146,7 @@ msgstr "您的文档的状态将自动更改选定的阶段。例如，如果某
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr "其它信息"
 
 #. module: project
 #: view:project.task:0
@@ -1479,7 +1488,7 @@ msgstr "总小时数"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "项目配置"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1717,7 +1726,7 @@ msgstr "文档"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "任务已创建"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1981,7 +1990,7 @@ msgstr "请删除与此科目关联的项目"
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Created"
-msgstr ""
+msgstr "任务已创建"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2046,7 +2055,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_closed
 msgid "Task closed"
-msgstr ""
+msgstr "已关闭的任务"
 
 #. module: project
 #: selection:report.project.task.user,month:0
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 33cddc0123b..4f553f15cfe 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -8,13 +8,13 @@ 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: 2013-07-07 04:44+0000\n"
+"PO-Revision-Date: 2013-07-14 03:57+0000\n"
 "Last-Translator: Alan <shuchuan.wu@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: 2013-07-08 05:25+0000\n"
+"X-Launchpad-Export-Date: 2013-07-15 04:51+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: project_long_term
@@ -41,7 +41,7 @@ msgstr "阶段"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Team Planning"
-msgstr ""
+msgstr "项目团队计划"
 
 #. module: project_long_term
 #: field:project.phase,user_ids:0

From 670710b88eb596ab9f6e8587de3d43ac133c0e18 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 13:31:06 +0530
Subject: [PATCH 156/197] [IMP] Improved code and passed the data according to
 the format as suggest (partner_id, partner_name, {'is_editable': True/False,
 'is_uid': True/False}) and done changes according this changes.

bzr revid: psa@tinyerp.com-20130715080106-63dbeh3mhgiqppzv
---
 addons/mail/mail_thread.py                    | 29 +++++++++----------
 addons/mail/static/src/js/mail_followers.js   | 19 ++----------
 addons/mail/static/src/xml/mail_followers.xml |  8 ++---
 3 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ebd143e1be8..949ed60ba82 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -156,21 +156,20 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def read_followers_data(self, cr, uid, ids, context=None):
-        data = self.pool.get('res.partner').read(cr, uid, ids, ['name', 'user_ids'], context=context)
-
-        grp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_no_one')
-        tech_user = self.pool.get('res.groups').read(cr, uid, grp_id[1], ['users'], context=context)['users']
-        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
-
-        if uid in tech_user:
-            for dict in data:
-                if dict['id'] in [user_pid]:
-                    dict.update({'is_editable': True})
-                if uid in dict['user_ids']:
-                    dict.update({'is_uid': True})
-
-        return data
+    def read_followers_data(self, cr, uid, follower_ids, context=None):
+        datas = []
+        partner_pool = self.pool.get('res.partner')
+        technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one')
+        for follower in partner_pool.browse(cr, uid, follower_ids, context=context):
+            is_editable = uid in map(lambda x:x.id, technical_group.users)
+            is_uid = uid in map(lambda x:x.id, follower.user_ids)
+            data = (
+                     follower.id,
+                     follower.name,
+                     {'is_editable': is_editable, 'is_uid': is_uid},
+            )
+            datas.append(data)
+        return datas
 
     def _get_subscription_data(self, cr, uid, ids, name, args, user_pid=None, context=None):
         """ Computes:
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 99c2a629f5d..4fec4ff3fd3 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -35,8 +35,6 @@ openerp_mail_followers = function(session, mail) {
             this.followers = [];
             
             this.view_is_editable = this.__parentedParent.is_action_enabled('edit');
-            this.check_access = false;
-            this.is_follower = false;
         },
 
         start: function() {
@@ -196,22 +194,17 @@ openerp_mail_followers = function(session, mail) {
         display_followers: function (records) {
             var self = this;
             this.followers = records || this.followers;
-            _.each(this.result, function (record) {
-                if (self.session.uid == record.user_ids[0]) {
-                    if (record.is_editable == true) { self.check_access = true; }
-                }
-            });
-            this.message_is_follower = this.set_is_follower(this.followers); // self.is_follower
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                self.message_is_follower = record[2].is_uid;
+                record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
-                if (self.check_access == true) {
+                if (record[2].is_editable == true) {
                     self.$el.on('mouseenter', 'div.oe_follower_list', function() {
                         $("img.oe_edit_subtype").removeClass("hidden");
                         $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
@@ -227,12 +220,6 @@ openerp_mail_followers = function(session, mail) {
             }
         },
 
-        /** Computes whether the current user is in the followers */
-        set_is_follower: function (records) {
-            var user_ids = _.pluck(_.pluck(records, 'user_ids'), 0);
-            return _.indexOf(user_ids, this.session.uid) != -1;
-        },
-
         display_buttons: function () {
             if (this.message_is_follower) {
                 this.$('button.oe_follower').removeClass('oe_notfollow').addClass('oe_following');
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index db58abb1441..d23154096a6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
-        <img t-if="widget.check_access and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record.id"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
+        <img t-if="record[2].is_editable" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
     </div>
     
     <!--

From 21e3d7cdc49fb2bf700ae8a0baa2d54cb39ac4c4 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 14:19:07 +0530
Subject: [PATCH 157/197] [IMP] 2 little improvements when their is no subtype
 than no edit_subtype pencil will be visible and bydefault set the
 message_is_follower to false because when no followers are there than
 subtypes muzt not be visible.

bzr revid: psa@tinyerp.com-20130715084907-nrd2oileuyr30nep
---
 addons/mail/static/src/js/mail_followers.js   | 1 +
 addons/mail/static/src/xml/mail_followers.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 4fec4ff3fd3..19b001f45a8 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -193,6 +193,7 @@ openerp_mail_followers = function(session, mail) {
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
+            this.message_is_follower = false;
             this.followers = records || this.followers;
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index d23154096a6..7628cdae7da 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,7 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
+        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
     </div>
     

From 54837802acf9520e4971192f2a5eb3574bf89174 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 15 Jul 2013 17:07:36 +0530
Subject: [PATCH 158/197] Improved code.

bzr revid: psa@tinyerp.com-20130715113736-ww4wffkajnwkk961
---
 addons/mail/mail_thread.py                  | 3 +--
 addons/mail/static/src/js/mail_followers.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 949ed60ba82..b4e8ddee439 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -158,9 +158,8 @@ class mail_thread(osv.AbstractModel):
 
     def read_followers_data(self, cr, uid, follower_ids, context=None):
         datas = []
-        partner_pool = self.pool.get('res.partner')
         technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one')
-        for follower in partner_pool.browse(cr, uid, follower_ids, context=context):
+        for follower in self.pool.get('res.partner').browse(cr, uid, follower_ids, context=context):
             is_editable = uid in map(lambda x:x.id, technical_group.users)
             is_uid = uid in map(lambda x:x.id, follower.user_ids)
             data = (
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 19b001f45a8..528459fc058 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -201,7 +201,7 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                self.message_is_follower = record[2].is_uid;
+                if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
                 record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.

From 7743f13c0409195a3270ff516ccfc27db20dd2a9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Jul 2013 14:16:11 +0200
Subject: [PATCH 159/197] [FIX] small bug that made the reports crash when we
 try to print them

bzr revid: nicolas.vanhoren@openerp.com-20130715121611-q68m7w62h8ngnb2i
---
 addons/web/static/src/js/coresetup.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 3ba5855533f..c9c6f82a98d 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -334,9 +334,10 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
             }).appendTo(document.body);
         }
 
-        _(_.extend({}, options.data || {},
-                   {session_id: this.override_session ? this.session_id : undefined, token: token}))
-            .each(function (value, key) {
+        var hparams = _.extend({}, options.data || {}, {token: token});
+        if (this.override_session)
+            hparams.session_id = this.session_id;
+        _.each(hparams, function (value, key) {
                 var $input = $form.find('[name=' + key +']');
                 if (!$input.length) {
                     $input = $('<input type="hidden" name="' + key + '">')

From d42d50df57d2ab376816bf77bcd9370d4b740887 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Jul 2013 14:26:48 +0200
Subject: [PATCH 160/197] [FIX] problem with werkzeug 0.9.1 that crashes when
 we generate a report

bzr revid: nicolas.vanhoren@openerp.com-20130715122648-a926d3tov4efbyrk
---
 addons/web/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d485d58443d..1b2490b9ae8 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1719,6 +1719,6 @@ class Reports(http.Controller):
                  ('Content-Disposition', content_disposition(file_name)),
                  ('Content-Type', report_mimetype),
                  ('Content-Length', len(report))],
-             cookies={'fileToken': int(token)})
+             cookies={'fileToken': token})
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:

From 2fb48c695cb6ae1b152111369873e6154cd93289 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Jul 2013 15:29:00 +0200
Subject: [PATCH 161/197] [IMP] modified mono_db to refuse db= in the url if
 the db does not appear in the db_filter

bzr revid: nicolas.vanhoren@openerp.com-20130715132900-xwbve100mn8nyzo9
---
 addons/web/http.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index f3ae2f34d6a..d99f2982ec3 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -118,7 +118,7 @@ class WebRequest(object):
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.db:
-            threading.current_thread().dbname = self.session.db
+            threading.current_thread().dbname = self.db
         if self.session.uid:
             threading.current_thread().uid = self.session.uid
         self.context = self.session.context
@@ -597,12 +597,7 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.modified = False
         super(OpenERPSession, self).__init__(*args, **kwargs)
         self.inited = True
-        self.setdefault("db", None)
-        self.setdefault("uid", None)
-        self.setdefault("login", None)
-        self.setdefault("password", None)
-        self.setdefault("context", {'tz': "UTC", "uid": None})
-        self.setdefault("jsonp_requests", {})
+        self._default_values()
         self.modified = False
 
     def __getattr__(self, attr):
@@ -650,6 +645,15 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
     def logout(self):
         for k in self.keys():
             del self[k]
+        self._default_values()
+
+    def _default_values(self):
+        self.setdefault("db", None)
+        self.setdefault("uid", None)
+        self.setdefault("login", None)
+        self.setdefault("password", None)
+        self.setdefault("context", {'tz': "UTC", "uid": None})
+        self.setdefault("jsonp_requests", {})
 
     def get_context(self):
         """
@@ -1059,13 +1063,13 @@ def db_redirect(match_first_only_if_unique):
     db = None
     redirect = None
 
+    dbs = db_list(True)
+
     # 1 try the db in the url
     db_url = request.httprequest.args.get('db')
-    if db_url:
+    if db_url in dbs:
         return (db_url, None)
 
-    dbs = db_list(True)
-
     # 2 use the database from the cookie if it's listable and still listed
     cookie_db = request.httprequest.cookies.get('last_used_database')
     if cookie_db in dbs:

From df8d972057079794e5a62e0f7dd7f0164c226a0a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 15 Jul 2013 18:25:04 +0200
Subject: [PATCH 162/197] [IMP] */static/description/index.html: link to /start
 include app name

bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
---
 addons/account/static/description/index.html         | 2 +-
 addons/account_voucher/static/description/index.html | 2 +-
 addons/crm/static/description/index.html             | 2 +-
 addons/hr/static/description/index.html              | 2 +-
 addons/mail/static/description/index.html            | 2 +-
 addons/mrp/static/description/index.html             | 2 +-
 addons/note/static/description/index.html            | 2 +-
 addons/point_of_sale/static/description/index.html   | 2 +-
 addons/project/static/description/index.html         | 2 +-
 addons/purchase/static/description/index.html        | 2 +-
 addons/sale/static/description/index.html            | 2 +-
 addons/stock/static/description/index.html           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/static/description/index.html b/addons/account/static/description/index.html
index 09a58fb3246..d9b26f11d16 100644
--- a/addons/account/static/description/index.html
+++ b/addons/account/static/description/index.html
@@ -17,7 +17,7 @@ By far the most beautiful and full featured accounting software. OpenERP Account
 Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=account" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/account_voucher/static/description/index.html b/addons/account_voucher/static/description/index.html
index d59c110dde5..a363291f12e 100644
--- a/addons/account_voucher/static/description/index.html
+++ b/addons/account_voucher/static/description/index.html
@@ -17,7 +17,7 @@
                 automatically based on your activities.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=account_voucher" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/crm/static/description/index.html b/addons/crm/static/description/index.html
index 5ae542f5c91..70f52d0ca87 100644
--- a/addons/crm/static/description/index.html
+++ b/addons/crm/static/description/index.html
@@ -17,7 +17,7 @@
 Manage your sales funnel with no effort. Attract leads, follow-up on phone calls and meetings. Analyse the quality of your leads to make informed decisions and save time by integrating emails directly into the application.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=crm" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/hr/static/description/index.html b/addons/hr/static/description/index.html
index 0bc3db084a4..f97cb462fe3 100644
--- a/addons/hr/static/description/index.html
+++ b/addons/hr/static/description/index.html
@@ -17,7 +17,7 @@ Get all your HR operations managed easily: knowledge sharing, recruitments, appr
 		   Each need is provided by a specific app that you activate on demand.
            </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=hr" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/mail/static/description/index.html b/addons/mail/static/description/index.html
index b564cf3ab1e..aa55e63008d 100644
--- a/addons/mail/static/description/index.html
+++ b/addons/mail/static/description/index.html
@@ -21,7 +21,7 @@ email overload.
 
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=mail" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/mrp/static/description/index.html b/addons/mrp/static/description/index.html
index 5777eb5f147..d44da3f37b1 100644
--- a/addons/mrp/static/description/index.html
+++ b/addons/mrp/static/description/index.html
@@ -20,7 +20,7 @@ planning with the smart kanban and gantt views. Use the advanced analytics
 features to detect bottleneck in resources capacities and inventory locations.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=mrp" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/note/static/description/index.html b/addons/note/static/description/index.html
index 7ef37c646e9..dc688859334 100644
--- a/addons/note/static/description/index.html
+++ b/addons/note/static/description/index.html
@@ -15,7 +15,7 @@
 Organize yourself with efficient todo lists and notes. From personnal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=note" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/point_of_sale/static/description/index.html b/addons/point_of_sale/static/description/index.html
index 130806ddb11..7f1b7a5c097 100644
--- a/addons/point_of_sale/static/description/index.html
+++ b/addons/point_of_sale/static/description/index.html
@@ -22,7 +22,7 @@
                 consolidations amongst all shops without the hassle of integrating several applications.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=point_of_sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/project/static/description/index.html b/addons/project/static/description/index.html
index 93f1be8a41d..2a1574c5d68 100644
--- a/addons/project/static/description/index.html
+++ b/addons/project/static/description/index.html
@@ -17,7 +17,7 @@ work done. Keep track of everything, from the big picture to the minute
 details, from the customer contract to the billing.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=project" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/purchase/static/description/index.html b/addons/purchase/static/description/index.html
index 67b122ac557..ecf9028ce33 100644
--- a/addons/purchase/static/description/index.html
+++ b/addons/purchase/static/description/index.html
@@ -17,7 +17,7 @@
 Automate procurement propositions, launch request for quotations, track purchase orders, manage suppliers' information, control products reception and check suppliers' invoices. 
            </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=purchase" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/sale/static/description/index.html b/addons/sale/static/description/index.html
index 1eb6215db2f..52c84b82f12 100644
--- a/addons/sale/static/description/index.html
+++ b/addons/sale/static/description/index.html
@@ -17,7 +17,7 @@ you need, easily accessible. Keep track of long term contracts, automate invoici
 and notify sales when they have things to do.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/stock/static/description/index.html b/addons/stock/static/description/index.html
index aac71e529ae..dd7fbe568f7 100644
--- a/addons/stock/static/description/index.html
+++ b/addons/stock/static/description/index.html
@@ -17,7 +17,7 @@
 Decrease your process times, automate transactions, reduce your stock levels and get complete traceability on all operations with the OpenERP double entry inventory system.
             </p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+                <a href="http://www.openerp.com/start?app=stock" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>

From 788071f34f5e17aa3161827649c6b8f2649135ee Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 16 Jul 2013 15:14:01 +0200
Subject: [PATCH 163/197] [FIX] some more problems with werkzeug 0.9.1

bzr revid: nicolas.vanhoren@openerp.com-20130716131401-abj3i020a8831l98
---
 addons/web/controllers/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 1b2490b9ae8..2536f4d9f2f 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -778,7 +778,7 @@ class Database(http.Controller):
             return request.make_response(db_dump,
                [('Content-Type', 'application/octet-stream; charset=binary'),
                ('Content-Disposition', content_disposition(filename))],
-               {'fileToken': int(token)}
+               {'fileToken': token}
             )
         except Exception, e:
             return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
@@ -1273,7 +1273,7 @@ class Binary(http.Controller):
             return request.make_response(filecontent,
                 headers=[('Content-Type', 'application/octet-stream'),
                         ('Content-Disposition', content_disposition(filename))],
-                cookies={'fileToken': int(token)})
+                cookies={'fileToken': token})
 
     @http.route('/web/binary/upload', type='http', auth="user")
     def upload(self, callback, ufile):
@@ -1572,7 +1572,7 @@ class ExportFormat(object):
             headers=[('Content-Disposition',
                             content_disposition(self.filename(model))),
                      ('Content-Type', self.content_type)],
-            cookies={'fileToken': int(token)})
+            cookies={'fileToken': token})
 
 class CSVExport(ExportFormat, http.Controller):
     fmt = {'tag': 'csv', 'label': 'CSV'}

From 455fa4e5970db6764d62632ba0be8767cadcc1b9 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 17 Jul 2013 06:43:13 +0000
Subject: [PATCH 164/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130717064313-thb64cq8368siq7s
---
 addons/web/i18n/ar.po                | 2 +-
 addons/web/i18n/bg.po                | 2 +-
 addons/web/i18n/bn.po                | 2 +-
 addons/web/i18n/bs.po                | 2 +-
 addons/web/i18n/ca.po                | 2 +-
 addons/web/i18n/cs.po                | 2 +-
 addons/web/i18n/da.po                | 2 +-
 addons/web/i18n/de.po                | 2 +-
 addons/web/i18n/en_AU.po             | 2 +-
 addons/web/i18n/en_GB.po             | 2 +-
 addons/web/i18n/es.po                | 2 +-
 addons/web/i18n/es_CL.po             | 2 +-
 addons/web/i18n/es_CR.po             | 2 +-
 addons/web/i18n/es_DO.po             | 2 +-
 addons/web/i18n/es_EC.po             | 2 +-
 addons/web/i18n/es_MX.po             | 2 +-
 addons/web/i18n/et.po                | 2 +-
 addons/web/i18n/eu.po                | 2 +-
 addons/web/i18n/fa.po                | 2 +-
 addons/web/i18n/fi.po                | 2 +-
 addons/web/i18n/fr.po                | 2 +-
 addons/web/i18n/fr_CA.po             | 2 +-
 addons/web/i18n/gl.po                | 2 +-
 addons/web/i18n/gu.po                | 2 +-
 addons/web/i18n/hi.po                | 2 +-
 addons/web/i18n/hr.po                | 2 +-
 addons/web/i18n/hu.po                | 2 +-
 addons/web/i18n/id.po                | 2 +-
 addons/web/i18n/it.po                | 2 +-
 addons/web/i18n/ja.po                | 2 +-
 addons/web/i18n/ka.po                | 2 +-
 addons/web/i18n/ko.po                | 2 +-
 addons/web/i18n/lo.po                | 2 +-
 addons/web/i18n/lt.po                | 2 +-
 addons/web/i18n/lv.po                | 2 +-
 addons/web/i18n/mk.po                | 2 +-
 addons/web/i18n/mn.po                | 2 +-
 addons/web/i18n/nb.po                | 2 +-
 addons/web/i18n/nl.po                | 4 ++--
 addons/web/i18n/nl_BE.po             | 2 +-
 addons/web/i18n/pl.po                | 2 +-
 addons/web/i18n/pt.po                | 2 +-
 addons/web/i18n/pt_BR.po             | 4 ++--
 addons/web/i18n/ro.po                | 2 +-
 addons/web/i18n/ru.po                | 2 +-
 addons/web/i18n/sk.po                | 2 +-
 addons/web/i18n/sl.po                | 2 +-
 addons/web/i18n/sq.po                | 2 +-
 addons/web/i18n/sr@latin.po          | 2 +-
 addons/web/i18n/sv.po                | 2 +-
 addons/web/i18n/th.po                | 2 +-
 addons/web/i18n/tr.po                | 2 +-
 addons/web/i18n/uk.po                | 2 +-
 addons/web/i18n/zh_CN.po             | 2 +-
 addons/web/i18n/zh_TW.po             | 2 +-
 addons/web_calendar/i18n/ar.po       | 2 +-
 addons/web_calendar/i18n/bg.po       | 2 +-
 addons/web_calendar/i18n/bn.po       | 2 +-
 addons/web_calendar/i18n/bs.po       | 2 +-
 addons/web_calendar/i18n/ca.po       | 2 +-
 addons/web_calendar/i18n/cs.po       | 2 +-
 addons/web_calendar/i18n/da.po       | 2 +-
 addons/web_calendar/i18n/de.po       | 2 +-
 addons/web_calendar/i18n/en_AU.po    | 2 +-
 addons/web_calendar/i18n/en_GB.po    | 2 +-
 addons/web_calendar/i18n/es.po       | 2 +-
 addons/web_calendar/i18n/es_CL.po    | 2 +-
 addons/web_calendar/i18n/es_CR.po    | 2 +-
 addons/web_calendar/i18n/es_DO.po    | 2 +-
 addons/web_calendar/i18n/es_EC.po    | 2 +-
 addons/web_calendar/i18n/es_MX.po    | 2 +-
 addons/web_calendar/i18n/et.po       | 2 +-
 addons/web_calendar/i18n/eu.po       | 2 +-
 addons/web_calendar/i18n/fa.po       | 2 +-
 addons/web_calendar/i18n/fi.po       | 2 +-
 addons/web_calendar/i18n/fr.po       | 2 +-
 addons/web_calendar/i18n/fr_CA.po    | 2 +-
 addons/web_calendar/i18n/gl.po       | 2 +-
 addons/web_calendar/i18n/gu.po       | 2 +-
 addons/web_calendar/i18n/hr.po       | 2 +-
 addons/web_calendar/i18n/hu.po       | 2 +-
 addons/web_calendar/i18n/id.po       | 2 +-
 addons/web_calendar/i18n/it.po       | 2 +-
 addons/web_calendar/i18n/ja.po       | 2 +-
 addons/web_calendar/i18n/ka.po       | 2 +-
 addons/web_calendar/i18n/ko.po       | 2 +-
 addons/web_calendar/i18n/lt.po       | 2 +-
 addons/web_calendar/i18n/mk.po       | 2 +-
 addons/web_calendar/i18n/mn.po       | 2 +-
 addons/web_calendar/i18n/nb.po       | 2 +-
 addons/web_calendar/i18n/nl.po       | 2 +-
 addons/web_calendar/i18n/nl_BE.po    | 2 +-
 addons/web_calendar/i18n/pl.po       | 2 +-
 addons/web_calendar/i18n/pt.po       | 2 +-
 addons/web_calendar/i18n/pt_BR.po    | 2 +-
 addons/web_calendar/i18n/ro.po       | 2 +-
 addons/web_calendar/i18n/ru.po       | 2 +-
 addons/web_calendar/i18n/sk.po       | 2 +-
 addons/web_calendar/i18n/sl.po       | 2 +-
 addons/web_calendar/i18n/sq.po       | 2 +-
 addons/web_calendar/i18n/sr@latin.po | 2 +-
 addons/web_calendar/i18n/sv.po       | 2 +-
 addons/web_calendar/i18n/th.po       | 2 +-
 addons/web_calendar/i18n/tr.po       | 2 +-
 addons/web_calendar/i18n/uk.po       | 2 +-
 addons/web_calendar/i18n/zh_CN.po    | 2 +-
 addons/web_diagram/i18n/ar.po        | 2 +-
 addons/web_diagram/i18n/bg.po        | 2 +-
 addons/web_diagram/i18n/bn.po        | 2 +-
 addons/web_diagram/i18n/bs.po        | 2 +-
 addons/web_diagram/i18n/ca.po        | 2 +-
 addons/web_diagram/i18n/cs.po        | 2 +-
 addons/web_diagram/i18n/da.po        | 2 +-
 addons/web_diagram/i18n/de.po        | 2 +-
 addons/web_diagram/i18n/en_AU.po     | 2 +-
 addons/web_diagram/i18n/en_GB.po     | 2 +-
 addons/web_diagram/i18n/es.po        | 2 +-
 addons/web_diagram/i18n/es_CL.po     | 2 +-
 addons/web_diagram/i18n/es_CR.po     | 2 +-
 addons/web_diagram/i18n/es_DO.po     | 2 +-
 addons/web_diagram/i18n/es_EC.po     | 2 +-
 addons/web_diagram/i18n/es_MX.po     | 2 +-
 addons/web_diagram/i18n/et.po        | 2 +-
 addons/web_diagram/i18n/fa.po        | 2 +-
 addons/web_diagram/i18n/fi.po        | 2 +-
 addons/web_diagram/i18n/fr.po        | 2 +-
 addons/web_diagram/i18n/gl.po        | 2 +-
 addons/web_diagram/i18n/gu.po        | 2 +-
 addons/web_diagram/i18n/hr.po        | 2 +-
 addons/web_diagram/i18n/hu.po        | 2 +-
 addons/web_diagram/i18n/id.po        | 2 +-
 addons/web_diagram/i18n/it.po        | 2 +-
 addons/web_diagram/i18n/ja.po        | 2 +-
 addons/web_diagram/i18n/ka.po        | 2 +-
 addons/web_diagram/i18n/ko.po        | 2 +-
 addons/web_diagram/i18n/lt.po        | 2 +-
 addons/web_diagram/i18n/mk.po        | 2 +-
 addons/web_diagram/i18n/mn.po        | 2 +-
 addons/web_diagram/i18n/nb.po        | 2 +-
 addons/web_diagram/i18n/nl.po        | 2 +-
 addons/web_diagram/i18n/nl_BE.po     | 2 +-
 addons/web_diagram/i18n/pl.po        | 2 +-
 addons/web_diagram/i18n/pt.po        | 2 +-
 addons/web_diagram/i18n/pt_BR.po     | 2 +-
 addons/web_diagram/i18n/ro.po        | 2 +-
 addons/web_diagram/i18n/ru.po        | 2 +-
 addons/web_diagram/i18n/sl.po        | 2 +-
 addons/web_diagram/i18n/sq.po        | 2 +-
 addons/web_diagram/i18n/sr@latin.po  | 2 +-
 addons/web_diagram/i18n/sv.po        | 2 +-
 addons/web_diagram/i18n/th.po        | 2 +-
 addons/web_diagram/i18n/tr.po        | 2 +-
 addons/web_diagram/i18n/zh_CN.po     | 2 +-
 addons/web_diagram/i18n/zh_TW.po     | 2 +-
 addons/web_gantt/i18n/ar.po          | 2 +-
 addons/web_gantt/i18n/bg.po          | 2 +-
 addons/web_gantt/i18n/bn.po          | 2 +-
 addons/web_gantt/i18n/bs.po          | 2 +-
 addons/web_gantt/i18n/ca.po          | 2 +-
 addons/web_gantt/i18n/cs.po          | 2 +-
 addons/web_gantt/i18n/da.po          | 2 +-
 addons/web_gantt/i18n/de.po          | 2 +-
 addons/web_gantt/i18n/en_AU.po       | 2 +-
 addons/web_gantt/i18n/en_GB.po       | 2 +-
 addons/web_gantt/i18n/es.po          | 2 +-
 addons/web_gantt/i18n/es_CL.po       | 2 +-
 addons/web_gantt/i18n/es_CR.po       | 2 +-
 addons/web_gantt/i18n/es_DO.po       | 2 +-
 addons/web_gantt/i18n/es_EC.po       | 2 +-
 addons/web_gantt/i18n/es_MX.po       | 2 +-
 addons/web_gantt/i18n/et.po          | 2 +-
 addons/web_gantt/i18n/fa.po          | 2 +-
 addons/web_gantt/i18n/fi.po          | 2 +-
 addons/web_gantt/i18n/fr.po          | 2 +-
 addons/web_gantt/i18n/gl.po          | 2 +-
 addons/web_gantt/i18n/gu.po          | 2 +-
 addons/web_gantt/i18n/hr.po          | 2 +-
 addons/web_gantt/i18n/hu.po          | 2 +-
 addons/web_gantt/i18n/it.po          | 2 +-
 addons/web_gantt/i18n/ja.po          | 2 +-
 addons/web_gantt/i18n/ka.po          | 2 +-
 addons/web_gantt/i18n/ko.po          | 2 +-
 addons/web_gantt/i18n/lo.po          | 2 +-
 addons/web_gantt/i18n/lt.po          | 2 +-
 addons/web_gantt/i18n/mk.po          | 2 +-
 addons/web_gantt/i18n/mn.po          | 2 +-
 addons/web_gantt/i18n/nb.po          | 2 +-
 addons/web_gantt/i18n/nl.po          | 2 +-
 addons/web_gantt/i18n/nl_BE.po       | 2 +-
 addons/web_gantt/i18n/pl.po          | 2 +-
 addons/web_gantt/i18n/pt.po          | 2 +-
 addons/web_gantt/i18n/pt_BR.po       | 2 +-
 addons/web_gantt/i18n/ro.po          | 2 +-
 addons/web_gantt/i18n/ru.po          | 2 +-
 addons/web_gantt/i18n/sl.po          | 2 +-
 addons/web_gantt/i18n/sq.po          | 2 +-
 addons/web_gantt/i18n/sr@latin.po    | 2 +-
 addons/web_gantt/i18n/sv.po          | 2 +-
 addons/web_gantt/i18n/th.po          | 2 +-
 addons/web_gantt/i18n/tr.po          | 2 +-
 addons/web_gantt/i18n/zh_CN.po       | 2 +-
 addons/web_graph/i18n/ar.po          | 2 +-
 addons/web_graph/i18n/bg.po          | 2 +-
 addons/web_graph/i18n/bn.po          | 2 +-
 addons/web_graph/i18n/bs.po          | 2 +-
 addons/web_graph/i18n/ca.po          | 2 +-
 addons/web_graph/i18n/cs.po          | 2 +-
 addons/web_graph/i18n/da.po          | 2 +-
 addons/web_graph/i18n/de.po          | 2 +-
 addons/web_graph/i18n/en_AU.po       | 2 +-
 addons/web_graph/i18n/en_GB.po       | 2 +-
 addons/web_graph/i18n/es.po          | 2 +-
 addons/web_graph/i18n/es_CL.po       | 2 +-
 addons/web_graph/i18n/es_CR.po       | 2 +-
 addons/web_graph/i18n/es_DO.po       | 2 +-
 addons/web_graph/i18n/es_EC.po       | 2 +-
 addons/web_graph/i18n/es_MX.po       | 2 +-
 addons/web_graph/i18n/et.po          | 2 +-
 addons/web_graph/i18n/fa.po          | 2 +-
 addons/web_graph/i18n/fi.po          | 2 +-
 addons/web_graph/i18n/fr.po          | 2 +-
 addons/web_graph/i18n/fr_CA.po       | 2 +-
 addons/web_graph/i18n/gl.po          | 2 +-
 addons/web_graph/i18n/gu.po          | 2 +-
 addons/web_graph/i18n/hr.po          | 2 +-
 addons/web_graph/i18n/hu.po          | 2 +-
 addons/web_graph/i18n/it.po          | 2 +-
 addons/web_graph/i18n/ja.po          | 2 +-
 addons/web_graph/i18n/ka.po          | 2 +-
 addons/web_graph/i18n/ko.po          | 2 +-
 addons/web_graph/i18n/lt.po          | 2 +-
 addons/web_graph/i18n/mk.po          | 2 +-
 addons/web_graph/i18n/mn.po          | 2 +-
 addons/web_graph/i18n/nb.po          | 2 +-
 addons/web_graph/i18n/nl.po          | 2 +-
 addons/web_graph/i18n/nl_BE.po       | 2 +-
 addons/web_graph/i18n/pl.po          | 2 +-
 addons/web_graph/i18n/pt.po          | 2 +-
 addons/web_graph/i18n/pt_BR.po       | 2 +-
 addons/web_graph/i18n/ro.po          | 2 +-
 addons/web_graph/i18n/ru.po          | 2 +-
 addons/web_graph/i18n/sl.po          | 2 +-
 addons/web_graph/i18n/sq.po          | 2 +-
 addons/web_graph/i18n/sr@latin.po    | 2 +-
 addons/web_graph/i18n/sv.po          | 2 +-
 addons/web_graph/i18n/th.po          | 2 +-
 addons/web_graph/i18n/tr.po          | 2 +-
 addons/web_graph/i18n/zh_CN.po       | 2 +-
 addons/web_kanban/i18n/ar.po         | 2 +-
 addons/web_kanban/i18n/bg.po         | 2 +-
 addons/web_kanban/i18n/bn.po         | 2 +-
 addons/web_kanban/i18n/bs.po         | 2 +-
 addons/web_kanban/i18n/ca.po         | 2 +-
 addons/web_kanban/i18n/cs.po         | 2 +-
 addons/web_kanban/i18n/da.po         | 2 +-
 addons/web_kanban/i18n/de.po         | 2 +-
 addons/web_kanban/i18n/en_AU.po      | 2 +-
 addons/web_kanban/i18n/en_GB.po      | 2 +-
 addons/web_kanban/i18n/es.po         | 2 +-
 addons/web_kanban/i18n/es_CL.po      | 2 +-
 addons/web_kanban/i18n/es_CR.po      | 2 +-
 addons/web_kanban/i18n/es_DO.po      | 2 +-
 addons/web_kanban/i18n/es_EC.po      | 2 +-
 addons/web_kanban/i18n/es_MX.po      | 2 +-
 addons/web_kanban/i18n/et.po         | 2 +-
 addons/web_kanban/i18n/fa.po         | 2 +-
 addons/web_kanban/i18n/fi.po         | 2 +-
 addons/web_kanban/i18n/fr.po         | 2 +-
 addons/web_kanban/i18n/fr_CA.po      | 2 +-
 addons/web_kanban/i18n/gl.po         | 2 +-
 addons/web_kanban/i18n/gu.po         | 2 +-
 addons/web_kanban/i18n/hr.po         | 2 +-
 addons/web_kanban/i18n/hu.po         | 2 +-
 addons/web_kanban/i18n/it.po         | 2 +-
 addons/web_kanban/i18n/ja.po         | 2 +-
 addons/web_kanban/i18n/ka.po         | 2 +-
 addons/web_kanban/i18n/ko.po         | 2 +-
 addons/web_kanban/i18n/lt.po         | 2 +-
 addons/web_kanban/i18n/mk.po         | 2 +-
 addons/web_kanban/i18n/mn.po         | 2 +-
 addons/web_kanban/i18n/nb.po         | 2 +-
 addons/web_kanban/i18n/nl.po         | 2 +-
 addons/web_kanban/i18n/nl_BE.po      | 2 +-
 addons/web_kanban/i18n/pl.po         | 2 +-
 addons/web_kanban/i18n/pt.po         | 2 +-
 addons/web_kanban/i18n/pt_BR.po      | 2 +-
 addons/web_kanban/i18n/ro.po         | 2 +-
 addons/web_kanban/i18n/ru.po         | 2 +-
 addons/web_kanban/i18n/sl.po         | 2 +-
 addons/web_kanban/i18n/sr@latin.po   | 2 +-
 addons/web_kanban/i18n/sv.po         | 2 +-
 addons/web_kanban/i18n/th.po         | 2 +-
 addons/web_kanban/i18n/tr.po         | 6 +++---
 addons/web_kanban/i18n/zh_CN.po      | 2 +-
 addons/web_kanban/i18n/zh_TW.po      | 2 +-
 addons/web_view_editor/i18n/ar.po    | 2 +-
 addons/web_view_editor/i18n/cs.po    | 4 ++--
 addons/web_view_editor/i18n/de.po    | 2 +-
 addons/web_view_editor/i18n/en_AU.po | 2 +-
 addons/web_view_editor/i18n/es.po    | 2 +-
 addons/web_view_editor/i18n/es_DO.po | 2 +-
 addons/web_view_editor/i18n/es_EC.po | 2 +-
 addons/web_view_editor/i18n/es_MX.po | 2 +-
 addons/web_view_editor/i18n/et.po    | 2 +-
 addons/web_view_editor/i18n/fa.po    | 2 +-
 addons/web_view_editor/i18n/fi.po    | 2 +-
 addons/web_view_editor/i18n/fr.po    | 2 +-
 addons/web_view_editor/i18n/hr.po    | 2 +-
 addons/web_view_editor/i18n/hu.po    | 2 +-
 addons/web_view_editor/i18n/it.po    | 2 +-
 addons/web_view_editor/i18n/ko.po    | 2 +-
 addons/web_view_editor/i18n/lt.po    | 2 +-
 addons/web_view_editor/i18n/lv.po    | 2 +-
 addons/web_view_editor/i18n/mk.po    | 2 +-
 addons/web_view_editor/i18n/mn.po    | 2 +-
 addons/web_view_editor/i18n/nb.po    | 2 +-
 addons/web_view_editor/i18n/nl.po    | 2 +-
 addons/web_view_editor/i18n/nl_BE.po | 2 +-
 addons/web_view_editor/i18n/pl.po    | 2 +-
 addons/web_view_editor/i18n/pt.po    | 2 +-
 addons/web_view_editor/i18n/pt_BR.po | 2 +-
 addons/web_view_editor/i18n/ro.po    | 2 +-
 addons/web_view_editor/i18n/ru.po    | 2 +-
 addons/web_view_editor/i18n/sl.po    | 2 +-
 addons/web_view_editor/i18n/th.po    | 2 +-
 addons/web_view_editor/i18n/tr.po    | 4 ++--
 addons/web_view_editor/i18n/zh_CN.po | 2 +-
 327 files changed, 333 insertions(+), 333 deletions(-)

diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 05d2bb027bc..4ad07a8c85c 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:39+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index c3c25118fec..8691ed15ef9 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index d41d3d69210..2af5315b6c1 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:39+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index 27f0699751c..5d0fdeca369 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index 409d3d9e36c..9ff472b1cf4 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index e991a5659d6..b3bbb492ad1 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 2ca56d854dc..a3a0e0c07ca 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index 380581f5345..e8d7b2d1ec5 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index c4ffcc0a03c..117567d248f 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index 706dd0e4370..edd202f5cd7 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 2c10e699be8..c4fabbbcc53 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index 0d1716e6e71..dfe647bcbc7 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index abd1dd69c7b..9f0b04e682d 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "Language: es\n"
 
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index 1ec3b9d78b0..d954fa60fce 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index 08d06dd12eb..422229be257 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index 8cda1f0d70a..14e744bf119 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index 7ea6f192028..c04270f0ca3 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index ce6e48ad208..ac2126a8b89 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:39+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 3323c4bba2c..dee493a6957 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 6f7ba9dd4d9..1429fa54f14 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index b3b093e7689..7c0dbb89dc7 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 77c7645bfb0..2f70861b20d 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index da0ccf61e70..6dc68783f83 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 86f98431d83..9d6ec958302 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 6b32e4c1936..c6fdb00dadb 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index 6e338af929b..e7af3680f50 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index d0ca371b49c..6488bfd219b 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index bacacc60e90..6da13254561 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index 4ab9db6b513..50c030add9f 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 0392efd6b21..a5735ff4a63 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index b4868afb298..8d09f5d87d1 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index e5b4addf29f..ef26f697993 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 230819e77e3..8fecad9c653 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 1fb1c122d78..79596b9ec35 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index bb3a8b870d0..236c07a9ad9 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 621e7c3598d..3a4cbb59f5d 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index 88def9bb877..2b54185983a 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index 4c4bf6d26ca..bda76ea709e 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 5b442ed6720..67ea0cc2e0a 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:40+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
@@ -1440,7 +1440,7 @@ msgstr "Wijzig standaard"
 #: code:addons/web/static/src/xml/base.xml:189
 #, python-format
 msgid "Original database name:"
-msgstr "Originele database naam:"
+msgstr "Naam originele database:"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 7670ecd3bd2..2daad6fb8cc 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index 47a3459f33f..c44f832c66e 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index 0959a5cb39d..33260569d21 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index b911678d530..777c62025d1 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
@@ -378,7 +378,7 @@ msgstr "'%s' não é uma data correta"
 #: code:addons/web/static/src/js/view_list.js:432
 #, python-format
 msgid "Group"
-msgstr "Agrupar"
+msgstr "Grupo"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index d7098b223f1..7c051b6ad6c 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 80cbe8264f6..5bd16a7c2dc 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 9031129a89b..c516f28c3e1 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 30fc5599309..a624e50b156 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index 613413d8669..d5636a9b296 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:03+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:39+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index 192c2fbf839..ce541a78c46 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index 4a6c3ec3422..7b4b498ee3b 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index b12d96023e8..62644fc8400 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index c0f16abee71..237c96c5d45 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index f8b6e90a324..e906802407f 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:04+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:41+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 5939b463025..0da6b7542d6 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index 3679317a299..a7a996e6b49 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index 60173b3d874..3708ffeadb8 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index b17721e0d0b..1f223b89019 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index 97b30be3209..9187104751b 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index 6a78f5bc59b..9205eda5081 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index 10e553c158f..0b75c24fc98 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 124790ee992..36a19c21506 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index 90922171099..83d1c16153d 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 065adcfc7db..a2d4d65cbba 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 963a535c663..ad859e87676 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index b86f4cdcc61..5451d49082c 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index f145bf112bd..a412140e939 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index 146b30915fe..37632c70400 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index 89fbda61cac..e602b1aed39 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "Language: es\n"
 
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index 13411402e96..173479bc407 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index 10168b1212b..4ab35ccea81 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index 0a536c2523d..f17fb04c93b 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index bc66701de29..d327cd31e8e 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index 74f1352be82..54411191fde 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index 973de2cefb7..8851b799d3b 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index 62ab2aba4e0..ca8df0da1f8 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index 79f27d7f7f5..65a85ac2796 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 5ade9441c08..a0acc2fe0dc 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index e1fd884c5fe..4f68928dcc7 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 73c52520556..94764b380bb 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 58720cdd3de..07a755b37f4 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 7662066a826..8bbc7e4f0c1 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 47181734825..320c0f0297c 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 07f030b0535..47e0ad21e96 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 077618319da..e69686c4ed7 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index bf121b9e981..23a81c7a810 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 3da44813ff9..b67f98e5055 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index fac53bfdba7..4d65ae241ba 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 519db467797..f32dd46f91a 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index e5aafc86c8b..87914133ead 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index f877379cb07..58c8480e536 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 8b4deef80fc..3722495cc21 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index 9f34f130d73..930da35a59e 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 6026569cda9..a80a30108dd 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 522dd641b21..7e17d1ba69a 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 005a46bf1fd..45e98329075 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index cc217fc428d..30741e26cdd 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index 695dcd1786d..024dbeab2d3 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index 90ca8cbacf3..8cef9c5ed82 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index d5829724994..d1828217f79 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index c06cfa36452..e6f46e23ea3 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 119fe61fc26..acfb34a91b2 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index 4eb952f32f8..0066437c458 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index 67416d0c76e..6ad4d9df824 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index bcc79224acc..b518da9f548 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index 4e8dd764a4c..b8a6d728eb7 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index adfcbb580f4..130e9a01846 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_calendar
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index 0fcd1e9c77a..755ac969f7f 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 3c47429924d..c46ad3f5447 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index cf40e831093..4f5fb33dc9c 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 33d27abbe06..be21b5409ac 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index f6ccde6df64..f180cce3f12 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 1b62fb1e7db..3d57fbe00d4 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index 07a48447765..7ccadff5528 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index 502c0639394..45bb621c68f 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index 2a0f2d13be7..15fcc73434d 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index c233ff9e5b2..760ee1df14c 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index 90074dacd6b..101a9fbab34 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index a74eeb3e8fa..b1568069712 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index ce8c07dde9d..22d56aa24bd 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "Language: es\n"
 
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index d8152d7e471..e36236947d3 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index 7923854bf74..9aaf352ec02 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index 0d7d5bc42a1..eab5d2ccffd 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index abe808c28ef..9ad89a04fab 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index f48a0d54193..9acefaec8bc 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 2e84bedf16f..66e4fb101db 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index cc577871222..0c269bd494e 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index 91101f960a3..fd81b6f2b0a 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 65ad1088de4..0ef783c9ff9 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index 42cd9d747bc..f36fe9ea4f0 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index 77ef17d63ac..7b97b3bf363 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index c707d31994c..98db868ebb0 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index 1a4a37502c9..a3e5ace0a81 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index a1b2713281f..03a3f2e9c32 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 569902aa2d2..3b9ce5de41e 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index 573984a482e..2b038dd9613 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 00d16a6a9f2..bf4f519acad 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index c45b30abb02..ec1e8f00276 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index 5f6b3e84235..1e0e1c44e65 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index 1847f73d84a..f1368bbd48c 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index b5e34179d62..6a9b8a293cf 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index 79cd88be150..815a1ecfdc7 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index 572c5a149d3..b9fb840ead1 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index d9388e64e22..3ae0d07f48d 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 488c52b19bb..4955f37924b 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 3787a76ecbd..0bf56e38c60 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index 5e1a2043230..4e894322a52 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index 0c9f073637c..351e6ec834a 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index 9b80610e3b6..b1d86252b94 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index af118d2b2c2..8d6592796fa 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 541164f7c98..0169a0e50cb 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 5fefa37193e..09cfcf75987 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 05598732eed..da747f0df4c 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index d4f38dcb019..b015ffe9f08 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index 56a15341738..69654e9626f 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_diagram
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 46f27cb58e6..47f534e2290 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index b0bd609be8b..2ece5cd719f 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index 14cdc3f83f2..ad97add1220 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index f53c2ba8fb3..8f1ce9c2c4c 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index ac2b7786c5a..09e4f4c3bb3 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 8db62855904..a9338becd94 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 73d2b989b68..a7ceb564d57 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 908bf8048fc..814519e231d 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 793972a8e87..5f0f02f4892 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 5543efc267d..d35b0ac2f3d 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index f8a44b10454..78452628a66 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index 67018631fbe..0eeb1efd9a2 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index bf44f46ef0a..abf56971670 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 50f8b9f3949..35bd342db31 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index 48b7bef91a2..7e3eb51ab3e 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index 3afde3b4e72..a54e81eddfe 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index d1ad9985e09..b8df187679a 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index a8f85780f9c..c59646d23ea 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index be403528dfd..690e1f8761a 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index dea185af557..105b1cd99a1 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index 66b3c1486e8..bfdeb11b9aa 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index e0827e272f2..344b6ac1926 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 5bfc31ebf2b..649746bd91b 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index 34653b76e77..accfa22c950 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index bfbebcb33ab..3a15f882f48 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 95afca75a58..1c0eceae712 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 63b41ac2dc8..2e4761321f2 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index 5f0c2dda98b..b1c19ecc8e2 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index a44e03fd4df..40d778423ff 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index b16c4839d74..86ba2dc10cb 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index f98d602e38c..8212f3615a2 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index 45f97b6ee70..9b2dd27e27b 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index 07a6b3762fa..1b39ebfbe15 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index fb01771037a..29bd235583b 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 7fb3c01455c..5bc98e4235d 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index 7ce2d3ca7d4..8df58772b6a 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 1d153b5aea1..eeac0a30df6 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index 4f8d926ac47..c90d1c90576 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 6395f9516d4..92fb5ccd78b 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index 03069d58b0c..c34789c8411 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 22b20d6bbe0..6addb352092 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index 638546398b8..1994ad03438 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index d4244769f39..edc702bdeb1 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index 79052ba054b..45201f745ea 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index 7b29f62493b..fb4ba83b294 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index c9704dd705f..7eddeaac6cd 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 2ab3a7ad621..48e5aacc627 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_gantt
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index 709c61aa261..6288293145c 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 932a0eb1927..cf3eae08697 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 72c9f8bbc56..bcbe8a128fc 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index f54c321f54d..dabf4706c08 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index 5585b076b77..79be0748525 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index d6db7cbcea0..3e2f5c285c2 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index b9193251ff9..a04cabe2cb8 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index b810e7a41e8..89a21457667 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index de7e827ff83..4d68ce77aa7 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 364edd8cc87..316d56d8e10 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 15d51aa7081..58fc3911f38 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index 9cc1ffcf837..b6dae64b8ec 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 71ad25170a7..be1011d1b95 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index 1160b8f4cb9..ab9e68cb2bd 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index 8f3c8cb2902..98d6ca4c1e2 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index fd91a32b4cc..4fa2459b734 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 4787c0a7dfb..31438e94766 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index 73e44941471..1dd41285df2 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index 7002ff7da54..dd2f1e3a419 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 674389b44cc..42afdcc23a5 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index 0aad9e3c6cc..5cf63b38aeb 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index fad45ee268b..2d14f8fef30 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index 5ebc83b54a9..d238cae28e9 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index fb40febf215..13670f6de6d 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 2b39f98ba75..7855fdf2b94 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 30d216cb236..234d0022d69 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index b028e1240ba..f67e147f044 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index 0ccd76fc3f3..810f726ba36 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index e518c83e08d..64607dbe204 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 130cbc867a2..c3e4543886c 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index 6863a754cdd..e0cc4696830 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index f35589fa387..9b7c9fd2cea 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index 6523b68e814..0121c44666d 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index b574d61fd0a..11cebefc756 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index ebbabf0d1eb..b2d08460c9b 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 7eac1d90096..7cce17bda58 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index c40bcc8d67e..b16565e68c2 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index 2fec57846ac..f911909301d 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 15655db37c9..a8c294e5a88 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index 9d1a82c4dac..f30f980fb5e 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index 89b1dfaa8f0..f555be60c44 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 3515a7a09e0..0b965a7cc12 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 47c72e8bf31..aedf3f9a8a8 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index 77b7c6c9923..65e66e3782a 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index b9d46e3e4a2..0cf32536b67 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index 2c0cb216514..c6ede706898 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index 07d08143a86..47344b1fa1b 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_graph
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 744d74dd14e..0a1043fe0ad 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index d9011d4f511..7ad5069c490 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index e15237ef3da..d2f4518a199 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index 1d01a069038..26223b9cc36 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index ada88e220b6..370ff3d6134 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index 22397a2f7f6..d17fe219d55 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 "X-Poedit-Language: Czech\n"
 
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index 6a18b009461..0d372fd12ea 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 4b0fb9cd76a..d3554e9b244 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index a8d615771ce..5d5b6ad4d2a 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index df6d05238f0..468b55bc880 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index 6ce46d59919..84257a80258 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index 322e3eebffa..65aeac23ea0 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index 805327dd1e6..6d7c38e92db 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index d7842a34061..152391d3c80 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 818c1f53112..816894737ca 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 0b7b3cc1d4f..9d15ce9a3f8 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index 727c9c06b67..c39987ce88a 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index fa996b75ba1..5234e952894 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index 4b550c9c8f7..cd0e01ca0a5 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index 92debaa3a4c..f8aba2a6904 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index 4f01e250f35..2f15ea252c0 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 7aee1697096..ae3456093cb 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index a0d7c9e41c7..65cd5d1461a 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index 94701ac5eb7..6719e24f71c 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index 323b8759032..82f996f927c 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 6cc9d403d21..23b8f326669 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index 64ebcc96234..3eecf66e3f1 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index 28e5b2032e7..6f91eae9341 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index 699553bed5f..63e6e623a06 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index 37a1815c7eb..07564e50b15 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 5384c31c5e6..888a2a84e37 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 30b87a842f6..e84b719041d 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index b501acbce6e..cc13bc80fd9 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index ee6e0afd561..e99aa74f27c 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:42+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index 709db55b746..20e33cb45cf 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index c93c8990601..84108faaed4 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index 24c6ddd2d2e..bafc9b2e35c 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index fea9c233242..80158712751 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index e08e5cc7ae1..df237f1d82e 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index 1e6984b82b5..7edbc1a7e3d 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index 3c57fddb007..48c0713cf09 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index c9d744f9c63..1db9bf66940 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 5df90990ecd..c8ef6d32dc3 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index 01e5ba418ba..21e9886fe8d 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index 692abc08672..cad498f0d58 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
@@ -43,7 +43,7 @@ msgstr "Kanban"
 #: code:addons/web_kanban/static/src/js/kanban.js:542
 #, python-format
 msgid "Undefined"
-msgstr "Tanımsız"
+msgstr "Tanımlanmamış"
 
 #. module: web_kanban
 #. openerp-web
@@ -121,7 +121,7 @@ msgstr "Katları Aç"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
 #, python-format
 msgid "Show more... ("
-msgstr "Daha göster...("
+msgstr "Devamını göster... ("
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 7baf61dc788..316c907a7c6 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index 5467e95b5d5..efc7249abb8 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_kanban
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index 1ce114aeecd..56513c319fb 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index a60f107ba64..f57c5d6a4fe 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
@@ -157,7 +157,7 @@ msgstr "Nepodařilo se aktualizovat pohled"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:380
 #, python-format
 msgid "View Editor %d - %s"
-msgstr "Editor pohledů %d - %s"
+msgstr "Editor pohledu %d - %s"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index 9a0a5abfe94..7fa7125b036 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index f748602bb7e..60ecb50169a 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index 66ba2dc2784..04447ad04d7 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index e7607f21ad3..2aa5567f65b 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index 46f29f166d0..ead034e2d42 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index 4e020003482..1f38fe34585 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index f31da66f88f..ef912ca06fa 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index 4bc9d0c6b76..ea7e5980cbc 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index 85757de7ef5..2d33d0e0c1f 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index ae363e7f739..5d028e2dcb3 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index 2561134da83..eaa0e9857b3 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 9450ab098ea..b5c773bc248 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index 90340bf5ec7..a53f19757f3 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index 1cad165c8da..0c8c4fc1b29 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index 1370a141c87..d0135e34442 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index 27d704bad1a..add734292cc 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index eb31e5827a8..dbae3bb93f7 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index 35eaa3c7d6c..70df762972a 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 70e54af7cfa..9aa8154f963 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index 696183c2d9b..663563d9ab3 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index e40e22aeaed..abba11fd271 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index ac455fad295..8dbbdcee490 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index e5c32c8b4c6..c3845399efc 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index 25351fa75c3..4bea58a31c2 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index 7c614fba0bf..349e317034d 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index 73345354650..c46b79217ea 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 4b728e47299..005b1853a41 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 28c95af49f8..c445353ae38 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index 478c1705eae..ca3fb2baea9 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor
@@ -157,7 +157,7 @@ msgstr "Görünüm Güncellenemiyor"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:380
 #, python-format
 msgid "View Editor %d - %s"
-msgstr "Ekran Düzenleyici %d - %s"
+msgstr "Görünüm Düzenleyici %d - %s"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index 1288fe1a63f..3bb66e1dc2a 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 06:06+0000\n"
+"X-Launchpad-Export-Date: 2013-07-17 06:43+0000\n"
 "X-Generator: Launchpad (build 16696)\n"
 
 #. module: web_view_editor

From b7160bc1cf78636320f993e867ca7cf267600a72 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Wed, 17 Jul 2013 18:18:42 +0530
Subject: [PATCH 165/197] [IMP] Improved code for fetch_followers and done as
 was previously && added condition for the record in display_followers so that
 it never breaks && improve the mouse-enter and mouse-leave.

bzr revid: psa@tinyerp.com-20130717124842-vuqct26jy6a7palb
---
 addons/mail/static/src/js/mail_followers.js | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 528459fc058..d40c000f53e 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -151,14 +151,11 @@ openerp_mail_followers = function(session, mail) {
         },
 
         fetch_followers: function (value_) {
-            var self = this;
             this.value = value_ || {};
-            return this.ds_model.call('read_followers_data', [this.value]).then(function(result) {
-                self.result = result;
-                self.display_followers(result), self.proxy('fetch_generic');
-                self.display_buttons();
-                self.fetch_subtypes();
-            });
+            return this.ds_model.call('read_followers_data', [this.value])
+                .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
+                .then(this.proxy('display_buttons'))
+                .then(this.proxy('fetch_subtypes'));
         },
 
         /** Read on res.partner failed: fall back on a generic case
@@ -201,19 +198,17 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
+                if (record.length < 3) { return; }
                 if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
                 record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
                 if (record[2].is_editable == true) {
-                    self.$el.on('mouseenter', 'div.oe_follower_list', function() {
-                        $("img.oe_edit_subtype").removeClass("hidden");
-                        $('div.oe_follower_list').find('.oe_partner').addClass('oe_partner_name');
-                        }).on('mouseleave', 'div.oe_follower_list', function(){
-                            $("img.oe_edit_subtype").addClass("hidden");
-                            $('div.oe_follower_list').find('.oe_partner').removeClass('oe_partner_name');
-                        });
-                    }
+                    self.$el.find('div.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$el.find('img.oe_edit_subtype').toggleClass('hidden', e.type == 'mouseleave');
+                        self.$el.find('div.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                    });
+                }
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {

From 0d68a800e370840484cac9f4d2e50ab6f73690e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 18 Jul 2013 10:44:51 +0200
Subject: [PATCH 166/197] [FIX] project_mrp: fixed issue with the state field
 used in an sql query.

bzr revid: tde@openerp.com-20130718084451-z6us9ajaoli2a28c
---
 addons/project_mrp/project_mrp.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 786da81dd34..d5ed55a8d31 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -31,8 +31,7 @@ class ProjectTaskStageMrp(osv.Model):
     _inherit = 'project.task.type'
 
     _columns = {
-        'closed': fields.boolean('Close',
-            help="Tasks in this stage are considered as closed."),
+        'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
     }
 
     _defaults = {
@@ -72,7 +71,7 @@ class product_product(osv.osv):
 
 
 class sale_order(osv.osv):
-    _inherit ='sale.order'
+    _inherit = 'sale.order'
 
     def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
         proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
@@ -85,11 +84,12 @@ class sale_order(osv.osv):
             return {}
         res_sale = {}
         res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
-        cr.execute('''select sol.order_id as sale_id, t.state as task_state ,
+        cr.execute('''select sol.order_id as sale_id, stage.closed as task_closed ,
                     t.id as task_id, sum(sol.product_uom_qty) as total
                     from project_task as t
                     left join sale_order_line as sol on sol.id = t.sale_line_id
-                    where sol.order_id in %s group by sol.order_id,t.state,t.id ''',(tuple(ids),))
+                    left join project_task_type as stage on stage.id = t.stage_id
+                    where sol.order_id in %s group by sol.order_id,stage.closed,t.id ''',(tuple(ids),))
         sale_task_data = cr.dictfetchall()
 
         if not sale_task_data:
@@ -109,7 +109,7 @@ class sale_order(osv.osv):
 
         for item in sale_task_data:
             res_sale[item['sale_id']]['total_no_task'] += item['total']
-            if item['task_state'] == 'done':
+            if item['task_closed']:
                 res_sale[item['sale_id']]['number_of_done'] += item['total']
 
         for sale in self.browse(cr, uid, ids, context=context):

From c89bd961436a98262e0973903f9bd85527172dcc Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 18 Jul 2013 16:43:44 +0200
Subject: [PATCH 167/197] [ADD]crm_partner_assign: lead demo data, with portal
 user assigned

bzr revid: dle@openerp.com-20130718144344-zwy1eg9zxvjjeu0g
---
 addons/crm_partner_assign/__openerp__.py    |  2 +-
 addons/crm_partner_assign/crm_lead_demo.xml | 32 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 addons/crm_partner_assign/crm_lead_demo.xml

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 37a8c5a3d6b..e0f1d78558a 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -38,7 +38,7 @@ You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm', 'account', 'portal'],
-    'demo': ['res_partner_demo.xml'],
+    'demo': ['res_partner_demo.xml', 'crm_lead_demo.xml'],
     'data': [
         'security/ir.model.access.csv',
         'res_partner_view.xml',
diff --git a/addons/crm_partner_assign/crm_lead_demo.xml b/addons/crm_partner_assign/crm_lead_demo.xml
new file mode 100644
index 00000000000..6631131d054
--- /dev/null
+++ b/addons/crm_partner_assign/crm_lead_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+      <data noupdate="1">
+
+            <!--  Demo Leads -->
+            <record id="crm_case_partner_assign_1" model="crm.lead">
+                  <field name="type">lead</field>
+                  <field name="name">Specifications and price of your phones</field>
+                  <field name="contact_name">Steve Martinez</field>
+                  <field name="partner_name"></field>
+                  <field name="partner_id" ref=""/>
+                  <field name="function">Reseller</field>
+                  <field name="country_id" ref="base.uk"/>
+                  <field name="city">Edinburgh</field>
+                  <field name="type_id" ref="crm.type_lead8"/>
+                  <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
+                  <field name="channel_id" ref="crm.crm_case_channel_email"/>
+                  <field name="priority">2</field>
+                  <field name="section_id" ref="crm.crm_case_section_2"/>
+                  <field name="user_id" ref=""/>
+                  <field name="stage_id" ref="crm.stage_lead1"/>
+                  <field name="description">Hi,
+
+            Please, can you give me more details about your phones, including their specifications and their prices.
+
+            Regards,
+            Steve</field>
+                  <field eval="1" name="active"/>
+                  <field name="partner_assigned_id" ref="portal.partner_demo_portal"/>
+            </record>
+      </data>
+</openerp>
\ No newline at end of file

From 85b1d336e38d926789e4569ceafb991bb494bb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 19 Jul 2013 11:00:58 +0200
Subject: [PATCH 168/197] [CLEAN] project: misc cleaning before merging

bzr revid: tde@openerp.com-20130719090058-wngpyzf7oz3rnftp
---
 addons/project/project.py       | 27 +++++++--------------------
 addons/project/project_view.xml |  1 -
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 7128b188432..59f4a806cbd 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -44,26 +44,15 @@ class project_task_type(osv.osv):
         'fold': fields.boolean('Folded by Default',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
-    def _get_default_project_id(self, cr, uid, ctx={}):
-        proj = ctx.get('default_project_id', False)
-        if type(proj) is int:
-            return [proj]
-        return proj
+
     _defaults = {
         'sequence': 1,
         'fold': False,
         'case_default': False,
-        'project_ids': _get_default_project_id
+        'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.project']._get_default_project_id(cr, uid, context=ctx),
     }
     _order = 'sequence'
 
-def short_name(name):
-        """Keep first word(s) of name to make it small enough
-           but distinctive"""
-        if not name: return name
-        # keep 7 chars + end of the last word
-        keep_words = name[:7].strip().split()
-        return ' '.join(name.split()[:len(keep_words)])
 
 class project(osv.osv):
     _name = "project.project"
@@ -92,9 +81,9 @@ class project(osv.osv):
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
-        if not part:
-            return {'value':{}}
         val = {}
+        if not part:
+            return {'value': val}
         if 'pricelist_id' in self.fields_get(cr, uid, context=context):
             pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
             pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
@@ -447,8 +436,6 @@ class project(osv.osv):
             if project.user_id and (project.user_id.id not in u_ids):
                 u_ids.append(project.user_id.id)
             for task in project.tasks:
-                if task.stage_id and task.stage_id.fold:
-                    continue
                 if task.user_id and (task.user_id.id not in u_ids):
                     u_ids.append(task.user_id.id)
             calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
@@ -533,7 +520,8 @@ def Project():
             context = {}
         # Prevent double project creation when 'use_tasks' is checked + alias management
         create_context = dict(context, project_creation_in_progress=True,
-                                alias_model_name=vals.get('alias_model', 'project.task'), alias_parent_model_name=self._name)
+                              alias_model_name=vals.get('alias_model', 'project.task'),
+                              alias_parent_model_name=self._name)
 
         if vals.get('type', False) not in ('template', 'contract'):
             vals['type'] = 'contract'
@@ -565,7 +553,7 @@ class task(osv.osv):
         'user_id': {
             'project.mt_task_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
         },
-        'kanban_state': {  # kanban state: tracked, but only block subtype
+        'kanban_state': {
             'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
     }
@@ -687,7 +675,6 @@ class task(osv.osv):
         vals = {}
         if user_id:
             vals['date_start'] = fields.datetime.now()
-            vals['date_end'] = False
         return {'value': vals}
 
     def duplicate_task(self, cr, uid, map_ids, context=None):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8046774e5c0..fd44353b177 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -747,7 +747,6 @@
 
         <!-- User Form -->
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
-                    domain="[('stage_id.fold', '!=', True)]"
                     id="act_res_users_2_project_task_opened" name="Assigned Tasks"
                     res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 

From 573220c2864d718ce07ee1adef1698c7108fcb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 19 Jul 2013 11:17:33 +0200
Subject: [PATCH 169/197] [FIX] project: fixed last commit

bzr revid: tde@openerp.com-20130719091733-awl83dlr56fih8wh
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 59f4a806cbd..c8b900c9e84 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -49,7 +49,7 @@ class project_task_type(osv.osv):
         'sequence': 1,
         'fold': False,
         'case_default': False,
-        'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.project']._get_default_project_id(cr, uid, context=ctx),
+        'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.task']._get_default_project_id(cr, uid, context=ctx),
     }
     _order = 'sequence'
 

From 6021f031e58ddca3bf8386defa74c1a3b39c199c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 19 Jul 2013 17:46:04 +0200
Subject: [PATCH 170/197] [IMP] Added possibility to customize the tipsy of
 kanban groups in kanban views

bzr revid: nicolas.vanhoren@openerp.com-20130719154604-vgr3wtn6xm1ezywg
---
 addons/web_kanban/static/src/js/kanban.js | 38 +++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 0600f68b94b..6f47f9c128d 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -574,8 +574,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
     },
     start: function() {
-        var self = this,
-            def = this._super();
+        var self = this;
         if (! self.view.group_by) {
             self.$el.addClass("oe_kanban_no_group");
             self.quick = new (get_class(self.view.quick_create_class))(this, self.dataset, {}, false)
@@ -632,7 +631,40 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
             }
         });
         this.is_started = true;
-        return def;
+        var def_tooltip = this.fetch_tooltip();
+        return $.when(def_tooltip);
+    },
+    fetch_tooltip: function() {
+        if (! this.group)
+            return;
+        var field_name = this.view.group_by;
+        var field = this.view.group_by_field;
+        var field_desc = null;
+        var recurse = function(node) {
+            if (node.tag === "field" && node.attrs.name === field_name) {
+                field_desc = node;
+                return;
+            }
+            _.each(node.children, function(child) {
+                if (field_desc === null)
+                    recurse(child);
+            });
+        };
+        recurse(this.view.fields_view.arch);
+        if (! field_desc)
+            return;
+        var options = instance.web.py_eval(field_desc.attrs.options || '{}')
+        if (! options.tooltip_on_group_by)
+            return;
+
+        var self = this;
+        if (this.value) {
+            return (new instance.web.Model(field.relation)).query([options.tooltip_on_group_by])
+                    .filter([["id", "=", this.value]]).first().then(function(res) {
+                self.tooltip = res[options.tooltip_on_group_by];
+                self.$(".oe_kanban_group_title_text").attr("title", self.tooltip || self.title || "").tipsy({html: true});
+            });
+        }
     },
     compute_cards_auto_height: function() {
         // oe_kanban_no_auto_height is an empty class used to disable this feature

From 5a1b08bfbd9cc10e1a066dc39b1eeeaa47c3edec Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 22 Jul 2013 16:30:34 +0200
Subject: [PATCH 171/197] [FIX]google_spreadsheet: write formula once
 spreadsheet opened

bzr revid: dle@openerp.com-20130722143034-4tf8mr71ocf049ma
---
 .../google_base_account.py                    |  6 +-
 addons/google_drive/google_drive.py           | 76 ++++++++++---------
 addons/google_drive/google_drive_data.xml     |  4 +-
 .../google_spreadsheet/google_spreadsheet.py  | 62 ++++++++++++++-
 .../static/src/js/search.js                   |  4 +-
 5 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index a6cf67bbe62..50fbf233ce6 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -28,7 +28,7 @@ import urllib2
 import simplejson
 
 
-class google_service(osv.osv):
+class google_service(osv.osv_memory):
     _name = 'google.service'
 
     def generate_refresh_token(self, cr, uid, service, authorization_code, context=None):
@@ -51,10 +51,10 @@ class google_service(osv.osv):
             content = simplejson.loads(content)
         return content.get('refresh_token')
 
-    def _get_google_token_uri(self, cr, uid, service, context=None):
+    def _get_google_token_uri(self, cr, uid, service, scope, context=None):
         ir_config = self.pool['ir.config_parameter']
         params = {
-            'scope': 'https://www.googleapis.com/auth/drive',
+            'scope': scope,
             'redirect_uri': ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri'),
             'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
             'response_type': 'code',
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 1dc6b25f27c..e7622595afd 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -57,55 +57,60 @@ class config(osv.osv):
             url = self.copy_doc(cr, uid, res_id, template_id, name_gdocs, model.model, context)
         return url
 
-    def copy_doc(self, cr, uid, res_id, template_id, name_gdocs, res_model, context=None):
+    def get_access_token(self, cr, uid, scope=None, context=None):
         ir_config = self.pool['ir.config_parameter']
         google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
         if not google_drive_refresh_token:
             raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
         google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
-        google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
-
         #For Getting New Access Token With help of old Refresh Token
-        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
-        data = dict(client_id=google_drive_client_id,
-                    refresh_token=google_drive_refresh_token,
-                    client_secret=google_drive_client_secret,
-                    grant_type="refresh_token")
 
-        data = urllib.urlencode(data)
+        data = urllib.urlencode(dict(client_id=google_drive_client_id,
+                                     refresh_token=google_drive_refresh_token,
+                                     client_secret=google_drive_client_secret,
+                                     grant_type="refresh_token",
+                                     scope=scope or 'https://www.googleapis.com/auth/drive'))
+        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
         try:
             req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
             content = urllib2.urlopen(req).read()
-        except urllib2.HTTPError:
+        except urllib2.HTTPError as e:
+            print vars(e)
+            print e.read()
             raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context)
         content = json.loads(content)
+        return content.get('access_token')
 
+    def copy_doc(self, cr, uid, res_id, template_id, name_gdocs, res_model, context=None):
+        ir_config = self.pool['ir.config_parameter']
+        google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
+        access_token = self.get_access_token(cr, uid, context=context)
         # Copy template in to drive with help of new access token
-        if 'access_token' in content:
-            request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, content['access_token'])
-            try:
-                req = urllib2.Request(request_url, None, headers)
-                parents = urllib2.urlopen(req).read()
-            except urllib2.HTTPError:
-                raise self.pool.get('res.config.settings').get_config_warning(cr, _("The Google Template cannot be found. Maybe it has been deleted."), context=context)
-            parents_dict = json.loads(parents)
+        request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, access_token)
+        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
+        try:
+            req = urllib2.Request(request_url, None, headers)
+            parents = urllib2.urlopen(req).read()
+        except urllib2.HTTPError:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("The Google Template cannot be found. Maybe it has been deleted."), context=context)
+        parents_dict = json.loads(parents)
 
-            record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
-            data = {"title": name_gdocs, "description": record_url, "parents": parents_dict['parents']}
-            request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, content['access_token'])
-            headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-            data_json = json.dumps(data)
-            # resp, content = Http().request(request_url, "POST", data_json, headers)
-            req = urllib2.Request(request_url, data_json, headers)
-            content = urllib2.urlopen(req).read()
-            content = json.loads(content)
-            res = False
-            if 'alternateLink' in content.keys():
-                attach_pool = self.pool.get("ir.attachment")
-                attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
-                attach_pool.create(cr, uid, attach_vals)
-                res = content['alternateLink']
+        record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
+        data = {"title": name_gdocs, "description": record_url, "parents": parents_dict['parents']}
+        request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, access_token)
+        headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+        data_json = json.dumps(data)
+        # resp, content = Http().request(request_url, "POST", data_json, headers)
+        req = urllib2.Request(request_url, data_json, headers)
+        content = urllib2.urlopen(req).read()
+        content = json.loads(content)
+        res = False
+        if 'alternateLink' in content.keys():
+            attach_pool = self.pool.get("ir.attachment")
+            attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
+            attach_pool.create(cr, uid, attach_vals)
+            res = content['alternateLink']
         return res
 
     def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
@@ -197,12 +202,15 @@ config()
 class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
 
+    def _get_google_scope(self):
+        return 'https://www.googleapis.com/auth/drive'
+
     _columns = {
         'google_drive_authorization_code': fields.char('Authorization Code', size=124),
         'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
-        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', context=c),
+        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', scope=s._get_google_scope(), context=c),
     }
 
     def set_google_authorization_code(self, cr, uid, ids, context=None):
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml
index c9266547969..b1f9883c149 100644
--- a/addons/google_drive/google_drive_data.xml
+++ b/addons/google_drive/google_drive_data.xml
@@ -4,12 +4,12 @@
   
          <record id="config_google_drive_client_id" model="ir.config_parameter">
             <field name="key">google_drive_client_id</field>
-            <field name="value">39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com</field>
+            <field name="value">598905559630.apps.googleusercontent.com</field>
         </record>
         
         <record id="config_google_drive_client_secret" model="ir.config_parameter">
             <field name="key">google_drive_client_secret</field>
-            <field name="value">Ul-PtmnSWs3euWs20fdono0e</field>
+            <field name="value">vTmou73c-njP-1qCxm7qx7QE</field>
         </record>
 
     </data>
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index 08a8fa8d2cd..4f0471eae19 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -18,13 +18,73 @@
 #
 ##############################################################################
 
+import simplejson
+from lxml import etree
+import requests
+
 from openerp.osv import osv
 
 
+class base_config_settings(osv.osv):
+    _inherit = "base.config.settings"
+
+    def _get_google_scope(self):
+        return 'https://www.googleapis.com/auth/drive https://spreadsheets.google.com/feeds'
+
+
 class config(osv.osv):
     _inherit = 'google.drive.config'
 
-    def set_spreadsheet(self, cr, uid, model, domain, groupbys, view_id, context=None):
+    def write_config_formula(self, cr, uid, spreadsheet_key, model, domain, groupbys, view_id, context=None):
+        access_token = self.get_access_token(cr, uid, scope='https://spreadsheets.google.com/feeds', context=context)
+
+        fields = self.pool.get(model).fields_view_get(cr, uid, view_id=view_id, view_type='tree')
+        doc = etree.XML(fields.get('arch'))
+        display_fields = []
+        for node in doc.xpath("//field"):
+            if node.get('modifiers'):
+                modifiers = simplejson.loads(node.get('modifiers'))
+                if not modifiers.get('invisible') and not modifiers.get('tree_invisible'):
+                    display_fields.append(node.get('name'))
+        fields = " ".join(display_fields)
+        domain = domain.replace("'", r"\'").replace('"', "'")
+        if groupbys:
+            fields = "%s %s" % (groupbys, fields)
+            formula = '=oe_read_group(&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;)' % (model, fields, groupbys, domain)
+        else:
+            formula = '=oe_browse(&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;)' % (model, fields, domain)
+        url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        dbname = cr.dbname
+        user = self.pool['res.users'].read(cr, uid, uid, ['login', 'password'], context=context)
+        username = user['login']
+        password = user['password']
+        config_formula = '=oe_settings(&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;)' % (url, dbname, username, password)
+        request = '''<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:batch="http://schemas.google.com/gdata/batch"
+      xmlns:gs="http://schemas.google.com/spreadsheets/2006">
+  <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full</id>
+  <entry>
+    <batch:id>A1</batch:id>
+    <batch:operation type="update"/>
+    <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1</id>
+    <link rel="edit" type="application/atom+xml"
+      href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1"/>
+    <gs:cell row="1" col="1" inputValue="%s"/>
+  </entry>
+  <entry>
+    <batch:id>A2</batch:id>
+    <batch:operation type="update"/>
+    <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15</id>
+    <link rel="edit" type="application/atom+xml"
+      href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15"/>
+    <gs:cell row="60" col="15" inputValue="%s"/>
+  </entry>
+</feed>''' % (spreadsheet_key, spreadsheet_key, spreadsheet_key, formula, spreadsheet_key, spreadsheet_key, config_formula)
+
+        requests.post('https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/batch?v=3&access_token=%s' % (spreadsheet_key, access_token), data=request, headers={'content-type': 'application/atom+xml', 'If-Match': '*'})
+        return True
+
+    def set_spreadsheet(self, cr, uid, model, context=None):
         try:
             config_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'google_spreadsheet', 'google_spreadsheet_template')[1]
         except ValueError:
diff --git a/addons/google_spreadsheet/static/src/js/search.js b/addons/google_spreadsheet/static/src/js/search.js
index beac52c4d6f..0812c12638e 100644
--- a/addons/google_spreadsheet/static/src/js/search.js
+++ b/addons/google_spreadsheet/static/src/js/search.js
@@ -34,9 +34,11 @@ openerp.google_spreadsheet = function(instance) {
 		        var groupbys = instance.web.pyeval.eval('groupbys', data.groupbys).join(" ");
 		        var view_id = view_id;
                 var ds = new instance.web.DataSet(self, 'google.drive.config');
-                ds.call('set_spreadsheet', [model, domain, groupbys, view_id]).done(function (url) {
+                ds.call('set_spreadsheet', [model]).done(function (url) {
         			if (url){
             			window.open(url, '_blank');
+            			var key = url.match("(key=|/d/)([A-Za-z0-9-_]+)")[2]
+						ds.call('write_config_formula', [key, model, domain, groupbys, view_id]);
         			}
 				});
 	        });

From 8fe619095bb4f4b5ddd1a379e1194bcb95a8bb5c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 22 Jul 2013 18:45:08 +0200
Subject: [PATCH 172/197] [ADD]google_spreadsheet: view (ir.attachement) in
 reporting, formula used in description of attachement

bzr revid: dle@openerp.com-20130722164508-1849vgrr6j0j6yhk
---
 addons/google_drive/google_drive.py           | 10 +++----
 addons/google_spreadsheet/__openerp__.py      |  2 +-
 .../google_spreadsheet/google_spreadsheet.py  | 28 ++++++++++++++-----
 .../static/src/js/search.js                   |  8 ++----
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index e7622595afd..fa697372901 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -54,7 +54,7 @@ class config(osv.osv):
             attachment = attach_pool.browse(cr, uid, attach_ids[0], context)
             url = attachment.url
         else:
-            url = self.copy_doc(cr, uid, res_id, template_id, name_gdocs, model.model, context)
+            url = self.copy_doc(cr, uid, res_id, template_id, name_gdocs, model.model, context).get('url')
         return url
 
     def get_access_token(self, cr, uid, scope=None, context=None):
@@ -105,12 +105,12 @@ class config(osv.osv):
         req = urllib2.Request(request_url, data_json, headers)
         content = urllib2.urlopen(req).read()
         content = json.loads(content)
-        res = False
-        if 'alternateLink' in content.keys():
+        res = {}
+        if content.get('alternateLink'):
             attach_pool = self.pool.get("ir.attachment")
             attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
-            attach_pool.create(cr, uid, attach_vals)
-            res = content['alternateLink']
+            res['id'] = attach_pool.create(cr, uid, attach_vals)
+            res['url'] = content['alternateLink']
         return res
 
     def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
diff --git a/addons/google_spreadsheet/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
index 10a9a28de76..1ae2d48d349 100644
--- a/addons/google_spreadsheet/__openerp__.py
+++ b/addons/google_spreadsheet/__openerp__.py
@@ -35,7 +35,7 @@ The module adds the possibility to display data from OpenERP in Google Spreadshe
         'static/src/js/search.js',
     ],
     'qweb': ['static/src/xml/*.xml'],
-    'data': ['google_spreadsheet_data.xml'],
+    'data': ['google_spreadsheet_view.xml', 'google_spreadsheet_data.xml'],
     'demo': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index 4f0471eae19..17de4a37e1b 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -20,6 +20,7 @@
 
 import simplejson
 from lxml import etree
+import re
 import requests
 
 from openerp.osv import osv
@@ -35,7 +36,7 @@ class base_config_settings(osv.osv):
 class config(osv.osv):
     _inherit = 'google.drive.config'
 
-    def write_config_formula(self, cr, uid, spreadsheet_key, model, domain, groupbys, view_id, context=None):
+    def write_config_formula(self, cr, uid, attachment_id, spreadsheet_key, model, domain, groupbys, view_id, context=None):
         access_token = self.get_access_token(cr, uid, scope='https://spreadsheets.google.com/feeds', context=context)
 
         fields = self.pool.get(model).fields_view_get(cr, uid, view_id=view_id, view_type='tree')
@@ -50,15 +51,15 @@ class config(osv.osv):
         domain = domain.replace("'", r"\'").replace('"', "'")
         if groupbys:
             fields = "%s %s" % (groupbys, fields)
-            formula = '=oe_read_group(&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;)' % (model, fields, groupbys, domain)
+            formula = '=oe_read_group("%s";"%s";"%s";"%s")' % (model, fields, groupbys, domain)
         else:
-            formula = '=oe_browse(&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;)' % (model, fields, domain)
+            formula = '=oe_browse("%s";"%s";"%s")' % (model, fields, domain)
         url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         dbname = cr.dbname
         user = self.pool['res.users'].read(cr, uid, uid, ['login', 'password'], context=context)
         username = user['login']
         password = user['password']
-        config_formula = '=oe_settings(&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;;&quot;%s&quot;)' % (url, dbname, username, password)
+        config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password)
         request = '''<feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:batch="http://schemas.google.com/gdata/batch"
       xmlns:gs="http://schemas.google.com/spreadsheets/2006">
@@ -79,16 +80,29 @@ class config(osv.osv):
       href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15"/>
     <gs:cell row="60" col="15" inputValue="%s"/>
   </entry>
-</feed>''' % (spreadsheet_key, spreadsheet_key, spreadsheet_key, formula, spreadsheet_key, spreadsheet_key, config_formula)
+</feed>''' % (spreadsheet_key, spreadsheet_key, spreadsheet_key, formula.replace('"', '&quot;'), spreadsheet_key, spreadsheet_key, config_formula.replace('"', '&quot;'))
 
         requests.post('https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/batch?v=3&access_token=%s' % (spreadsheet_key, access_token), data=request, headers={'content-type': 'application/atom+xml', 'If-Match': '*'})
+
+        description = '''
+        formula: %s
+        ''' % formula
+        if attachment_id:
+            self.pool['ir.attachment'].write(cr, uid, attachment_id, {'description': description}, context=context)
         return True
 
-    def set_spreadsheet(self, cr, uid, model, context=None):
+    def set_spreadsheet(self, cr, uid, model, domain, groupbys, view_id, context=None):
         try:
             config_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'google_spreadsheet', 'google_spreadsheet_template')[1]
         except ValueError:
             raise
         config = self.browse(cr, uid, config_id, context=context)
-        res = self.copy_doc(cr, uid, 1, config.google_drive_resource_id, 'Spreadsheet %s' % model, model, context=context)
+        title = 'Spreadsheet %s' % model
+        res = self.copy_doc(cr, uid, 1, config.google_drive_resource_id, title, model, context=context)
+
+        mo = re.search("(key=|/d/)([A-Za-z0-9-_]+)", res['url'])
+        if mo:
+            key = mo.group(2)
+
+        self.write_config_formula(cr, uid, res.get('id'), key, model, domain, groupbys, view_id, context=context)
         return res
diff --git a/addons/google_spreadsheet/static/src/js/search.js b/addons/google_spreadsheet/static/src/js/search.js
index 0812c12638e..c46ec615792 100644
--- a/addons/google_spreadsheet/static/src/js/search.js
+++ b/addons/google_spreadsheet/static/src/js/search.js
@@ -34,11 +34,9 @@ openerp.google_spreadsheet = function(instance) {
 		        var groupbys = instance.web.pyeval.eval('groupbys', data.groupbys).join(" ");
 		        var view_id = view_id;
                 var ds = new instance.web.DataSet(self, 'google.drive.config');
-                ds.call('set_spreadsheet', [model]).done(function (url) {
-        			if (url){
-            			window.open(url, '_blank');
-            			var key = url.match("(key=|/d/)([A-Za-z0-9-_]+)")[2]
-						ds.call('write_config_formula', [key, model, domain, groupbys, view_id]);
+                ds.call('set_spreadsheet', [model, domain, groupbys, view_id]).done(function (res) {
+        			if (res['url']){
+            			window.open(res['url'], '_blank');
         			}
 				});
 	        });

From 7415da971da1205c9ae1b9c9c4fce8f0915f9a4a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 22 Jul 2013 18:52:38 +0200
Subject: [PATCH 173/197] [FIX]google_spreadsheet: add missing file

bzr revid: dle@openerp.com-20130722165238-rreum7iphpaqx995
---
 .../google_spreadsheet_view.xml               | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 addons/google_spreadsheet/google_spreadsheet_view.xml

diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/google_spreadsheet_view.xml
new file mode 100644
index 00000000000..f247880e03a
--- /dev/null
+++ b/addons/google_spreadsheet/google_spreadsheet_view.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add google drive config field in user form -->
+
+        <record model="ir.ui.view" id="view_ir_attachment_google_spreadsheet_tree">
+            <field name="name">ir.attachment.google.spreadsheet.tree</field>
+            <field name="model">ir.attachment</field>
+            <field name="arch" type="xml">
+                <tree string="Google Spreadsheeets" version="7.0">
+                    <field name="name" string="Name"/>
+                    <field name="url" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_ir_attachment_google_spreadsheet_form">
+            <field name="name">ir.attachment.google.spreadsheet.form</field>
+            <field name="model">ir.attachment</field>
+            <field name="arch" type="xml">
+                <form string="Google Spreadsheets" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" string="Name"/>
+                                <field name="url" />
+                            </group>
+                            <group colspan="2">
+                                <label for="description" colspan="2"/>
+                                <field name="description" nolabel="1" colspan="2"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_ir_attachment_google_spreadsheet_tree" model="ir.actions.act_window">
+            <field name="name">Google Spreadsheets</field>
+            <field name="res_model">ir.attachment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{}</field>
+            <field name="domain">[('url', 'like', '/spreadsheet/')]</field>
+            <field name="help">Google Spreadsheets</field>
+        </record>
+
+        <record id="action_ir_attachment_google_spreadsheet_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_ir_attachment_google_spreadsheet_tree"/>
+            <field name="act_window_id" ref="action_ir_attachment_google_spreadsheet_tree"/>
+        </record>
+
+        <record id="action_ir_attachment_google_spreadsheet_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_ir_attachment_google_spreadsheet_form"/>
+            <field name="act_window_id" ref="action_ir_attachment_google_spreadsheet_tree"/>
+        </record>
+
+        <menuitem id="menu_reporting_dashboard_google_spreadsheets" parent="base.menu_reporting_dashboard" action="action_ir_attachment_google_spreadsheet_tree"/>
+    </data>
+</openerp>
\ No newline at end of file

From 1d82442202c9a632ef67b10e12d75c2ed9861a00 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 23 Jul 2013 05:01:46 +0000
Subject: [PATCH 174/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130722053434-s45ygm64hlnww4xu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130723050146-4be9ky5ndzjfs9km
---
 addons/crm/i18n/zh_CN.po                | 236 ++++++++++++++++++------
 addons/crm_partner_assign/i18n/zh_CN.po |  44 ++---
 addons/google_drive/i18n/pt_BR.po       |  99 +++++++---
 3 files changed, 274 insertions(+), 105 deletions(-)

diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index d7182841d8b..5dce358724e 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/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-12-19 07:22+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2013-07-23 03:21+0000\n"
+"Last-Translator: fanvil <fanvil@hotmail.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: 2013-03-16 05:10+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-23 05:01+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,7 +29,7 @@ msgid ""
 msgstr "允许你设置接收邮件服务器，并从收到的邮件中创建线索"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -54,6 +54,11 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"警告收到的新线索已超过5天未处理\n"
+"名称：[[object.name]]\n"
+"编号：[[object.id]]\n"
+"描述：[[object.description]]\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
@@ -64,7 +69,7 @@ msgstr "动作"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "设置团队 到销售部"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -151,7 +156,7 @@ msgstr "规则名称"
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "每次只能转换一个电话呼叫"
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -180,11 +185,11 @@ msgstr "预计结束月份"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
@@ -232,7 +237,7 @@ msgstr "状态"
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "#会议"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -252,7 +257,7 @@ msgstr "排除的答案:"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "合并商机"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -265,7 +270,7 @@ msgstr "线索分析"
 #: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s 一个电话</b> 为了 <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -293,7 +298,7 @@ msgid "Prospect Partner"
 msgstr "潜在业务伙伴"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
 msgstr "无主题"
@@ -323,6 +328,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                         "
+"点击创建新客户分组\n"
+"                                                                </p><p>\n"
+"                                                                         "
+"创建指定的分类用于赋值给你的联系人\n"
+"                                                                         "
+"以便更好管理你和他们的联系。分组工具\n"
+"                                                                         "
+"可以根据你预设的条件给联系人分配组。\n"
+"                                                                </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -445,16 +462,16 @@ msgid "#Opportunities"
 msgstr "#商机"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
-msgstr ""
+msgstr "请从列表视图中选择一个以上元素（线索或机会）。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
-msgstr ""
+msgstr "分配给我锁管理的某个销售队伍，或给我的线索。"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
@@ -473,6 +490,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                        "
+"点击创建新的销售团队\n"
+"                                                                <p></p>\n"
+"                                                                        "
+"使用销售团队，把不同销售员或部门组织成独立的团队。\n"
+"                                                                        "
+"每个团队会使用自己的商机列表工作。\n"
+"                                                               </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -511,7 +538,7 @@ msgstr "邮件"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "任务阶段已改变"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -572,7 +599,7 @@ msgstr "合并"
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
 msgid "Opportunity ${object.name | h})"
-msgstr ""
+msgstr "商机${object.name | h})"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -590,6 +617,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"线索：[[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or "
+"'']]的提醒"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -630,6 +659,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                         点击创建新类型\n"
+"                                                </p><p>\n"
+"                                                         "
+"创建指定的电话类型，更好地定义系统中记录的电话类型\n"
+"                                                </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -712,7 +748,7 @@ msgid "Statistics Dashboard"
 msgstr "统计控制台"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -738,7 +774,7 @@ msgstr "转为商机"
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -759,7 +795,7 @@ msgstr "查询电话访问"
 #: view:crm.lead.report:0
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
-msgstr ""
+msgstr "分配给我所管理的某个销售团队的线索/商机。"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
@@ -772,7 +808,7 @@ msgid "Exclusive"
 msgstr "唯一的"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
 msgstr "发自: %s:%s"
@@ -866,7 +902,7 @@ msgstr "标记为已赢得"
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "来自USA的线索"
 
 #. module: crm
 #: view:crm.lead:0
@@ -917,7 +953,7 @@ msgstr "参考"
 msgid ""
 "Opportunities that are assigned to either me or one of the sale teams I "
 "manage"
-msgstr ""
+msgstr "分配给我或者我管理的某个销售团队的商机。"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
@@ -940,7 +976,7 @@ msgid "Next Action"
 msgstr "下一动作"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
 msgstr ""
@@ -983,6 +1019,8 @@ msgid ""
 "Allows you to track your customers/suppliers claims and grievances.\n"
 "                    This installs the module crm_claim."
 msgstr ""
+"允许你记录客户/供应商的索赔和抱怨。\n"
+"                                                      将安装crm_claim模块"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -1030,10 +1068,10 @@ msgid "Creation Date"
 msgstr "创建日期"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr ""
+msgstr "线索 <b>已转换成商机</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1094,7 +1132,7 @@ msgstr "删除"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "商机已创建"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1123,6 +1161,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                               点击创建新的商机\n"
+"                                               </p><p>\n"
+"                                               OpenERP帮你记录你的销售管道\n"
+"                                               跟踪潜在销售并更好地预测未来收益\n"
+"                                              </p><p>\n"
+"                                              你可以对商机安排会议或电话，\n"
+"                                              将他们转化成报价单，附上相关\n"
+"                                              文档，跟踪所有的讨论等等。\n"
+"                                              </p>\n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1186,13 +1235,13 @@ msgstr "如果你勾选了这里，这个阶段会作为每个销售团队的默
 msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
-msgstr ""
+msgstr "此域用于区分用于线索的阶段和用于商机的阶段，或者指示同时可用于两个类型。"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "线索已创建"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1217,7 +1266,9 @@ msgid "Days to Close"
 msgstr "结束日期"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
 msgstr "未知"
 
@@ -1264,7 +1315,7 @@ msgid ""
 "progress the Status is set to 'Open'. When the case is over, the Status is "
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
-msgstr ""
+msgstr "当一个创建时，状态设为‘草稿’。如果此案在进行中，被设为‘打开‘。当案子结束，状态被设为’结束‘。如果需要被审阅，状态被设为’等待‘"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
@@ -1300,7 +1351,7 @@ msgid "Lead Description"
 msgstr "销售线索描述"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
 msgstr "合并商机"
@@ -1373,7 +1424,7 @@ msgstr "待办事项"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "丢掉的商机"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -1422,7 +1473,7 @@ msgstr "用户"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "阶段已改变"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -1495,7 +1546,7 @@ msgstr "信息和通信历史记录"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "显示国家"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1567,7 +1618,7 @@ msgid ""
 "The status of your document will automatically change regarding the selected "
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
-msgstr ""
+msgstr "文档的状态会根据选中的阶段自动改变。如果一个阶段关联了‘关闭’状态，当文档到达这个阶段就自动被关闭。"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -1588,7 +1639,7 @@ msgstr "通话月份"
 #: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "合作伙伴已<b>创建</b>"
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
@@ -1602,6 +1653,7 @@ msgid ""
 "the treatment delays or number of leads per state. You can sort out your "
 "leads analysis by different groups to get accurate grained analysis."
 msgstr ""
+"线索分析允许你检查不同的关联CRM的信息，例如延迟或每个状态的线索的数量。你可以使用不同的分组对线索分析进行整理已获得精确细致的分析结果。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -1822,7 +1874,7 @@ msgstr "销售团队"
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Default to New Sales Team"
-msgstr ""
+msgstr "默认分配给新建销售团队"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1861,10 +1913,10 @@ msgid "Leads"
 msgstr "线索"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "合并的线索"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1887,7 +1939,7 @@ msgstr "待办"
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "线索到商机"
 
 #. module: crm
 #: field:crm.lead,user_email:0
@@ -1955,7 +2007,6 @@ msgid "Global CC"
 msgstr "完整抄送"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
@@ -2089,7 +2140,7 @@ msgstr "转换选项"
 msgid ""
 "Follow this salesteam to automatically track the events associated to users "
 "of this team."
-msgstr ""
+msgstr "跟踪此销售团队，自动跟踪此团队中用户关联的事件。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2101,7 +2152,7 @@ msgstr "地址"
 msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
-msgstr ""
+msgstr "此邮件地址关联此团队。收到的新邮件将自动创建线索并分配给此团队。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2193,13 +2244,24 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                        点击安排一个销售电话\n"
+"                                               </p><p>\n"
+"                                                        "
+"OpenERP允许你容易地定义销售团队要打的\n"
+"                                                        电话并根据跟踪处理。           "
+"                                             \n"
+"                                               </p><p>  \n"
+"                                                        你可以使用导入功能来导入新列表\n"
+"                                                </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.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: crm
 #: field:crm.lead.report,nbr:0
@@ -2245,7 +2307,7 @@ msgstr "运行中"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
 msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "装换成商机的线索"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2255,7 +2317,7 @@ msgstr "未分配的线索"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
 msgid "Opportunity won"
-msgstr ""
+msgstr "获胜的商机"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2321,7 +2383,7 @@ msgstr "在这报表中，你能分析你的销售团队在电话访问上的业
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Fold by Default"
-msgstr ""
+msgstr "默认折叠"
 
 #. module: crm
 #: field:crm.case.stage,state:0
@@ -2357,7 +2419,7 @@ msgstr "已确认"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner_binding
 msgid "Handle partner binding or generation in CRM wizards."
-msgstr ""
+msgstr "在CRM向导中处理合作伙伴的绑定或生成。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
@@ -2408,11 +2470,23 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                       点击创建一个未验证的线索。\n"
+"                                              </p><p>\n"
+"                                                       如果你在创建一个商机或者客户前\n"
+"                                                       需要验证，使用线索。可以是一张收到的\n"
+"                                                       名片，网站上收到的一个联系方式，或者\n"
+"                                                       你导入系统的一个文件数据。\n"
+"                                               </p><p>\n"
+"                                                        一旦被确定，线索可以被装换成商机\n"
+"                                                        以及/或者你的地址簿中的新客户。\n"
+"                                               </p>\n"
+"        "
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "从收到的邮件创建线索"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2480,6 +2554,19 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                        点击创建电话总结\n"
+"                                               </p><p>\n"
+"                                                        OpenERP "
+"允许你快速记录打入的电话，用来\n"
+"                                                        "
+"跟踪与用户沟通的历史，或通知另一个销售团队。\n"
+"                                               </p><p>\n"
+"                                                        "
+"为了跟踪处理一个电话，你可以触发请求另一次电话，\n"
+"                                                        一次会议或者一个商机。\n"
+"                                                </p>\n"
+"        "
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -2526,6 +2613,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                       "
+"点击新建一个销售标签\n"
+"                                                             </p><p>\n"
+"                                                                       "
+"创建指定的适合公司活动的标签\n"
+"                                                                       "
+"用于更好地分析你的线索和商机。\n"
+"                                                                       "
+"标签分类可以反映你的商品结构或者\n"
+"                                                                       "
+"不同的销售类型。\n"
+"                                                            </p>\n"
+"            "
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -2538,7 +2639,7 @@ msgstr "8月"
 #: model:mail.message.subtype,name:crm.mt_lead_lost
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
 msgid "Opportunity Lost"
-msgstr ""
+msgstr "丢失的商机"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2634,7 +2735,7 @@ msgstr "通话日志"
 #: model:mail.message.subtype,name:crm.mt_lead_won
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
 msgid "Opportunity Won"
-msgstr ""
+msgstr "获胜的商机"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2773,7 +2874,7 @@ msgstr "电话访问"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
-msgstr ""
+msgstr "分配给某个我所管理的销售团队的电话。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2848,6 +2949,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                       "
+"点击定义一个新渠道\n"
+"                                                               </p><p>\n"
+"                                                                        "
+"使用渠道来记录你的线索和商机的来源。\n"
+"                                                                        "
+"主要用于市场工作相关的销售分析报告。\n"
+"                                                               </p><p>\n"
+"                                                                        "
+"渠道例子：公司网站，电话，市场活动，经销商等\n"
+"                                                               <p>\n"
+"            "
 
 #. module: crm
 #: view:crm.lead:0
@@ -2885,7 +2999,7 @@ msgid "Working Hours"
 msgstr "工作时间"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
@@ -3007,7 +3121,7 @@ msgstr "时事通信"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "商机状态已改变"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -3021,6 +3135,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                        "
+"点击设置你的线索/商机管道的新阶段。\n"
+"                                                                </p><p>\n"
+"                                                                        "
+"阶段允许销售人员记录特定的线索或商机\n"
+"                                                                        "
+"在销售循环中的位置。\n"
+"                                                                 </p>\n"
+"            "
 
 #~ msgid "My Draft "
 #~ msgstr "我的草稿 "
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index af764d72747..71dec202d52 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/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:05+0000\n"
-"PO-Revision-Date: 2012-12-14 13:50+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-23 03:45+0000\n"
+"Last-Translator: fanvil <fanvil@hotmail.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: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-23 05:01+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -37,7 +37,7 @@ msgstr "计划收入"
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
-msgstr ""
+msgstr "消息类型：Email 用于 邮件消息， 通知用户系统消息，评论用于其他消息，例如用户回复。"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
@@ -53,7 +53,7 @@ msgstr "分组..."
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "自动整理HTML内容"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -68,7 +68,7 @@ msgstr "geolocalization定位"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "加星号的邮件"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -80,7 +80,7 @@ msgstr "正文"
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
-msgstr ""
+msgstr "发送者的Email地址。当收取的email没有对应的合作伙伴时，此字段被设置"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -111,7 +111,7 @@ msgstr "公司"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
-msgstr ""
+msgstr "通知"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -123,7 +123,7 @@ msgstr "业务伙伴日期"
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
-msgstr ""
+msgstr "销售员"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -170,7 +170,7 @@ msgstr "指派的geolocalization"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email撰写向导"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
@@ -192,7 +192,7 @@ msgstr "为线索指定一个业务伙伴的概率（0表示没指派）"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
-msgstr ""
+msgstr "激活合作伙伴"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
@@ -203,7 +203,7 @@ msgstr "系统通知"
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
-msgstr ""
+msgstr "转发的线索"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
@@ -284,7 +284,7 @@ msgstr "最低"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
-msgstr ""
+msgstr "发票排程"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
@@ -309,7 +309,7 @@ msgstr "创建日期"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
@@ -344,7 +344,7 @@ msgstr "7月"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
-msgstr ""
+msgstr "回顾排程"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -356,12 +356,12 @@ msgstr "阶段"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "查看"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -416,12 +416,12 @@ msgstr "到期天数"
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "推送此通知消息进他们邮箱的合作伙伴"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
-msgstr ""
+msgstr "评论"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -449,7 +449,7 @@ msgstr "12月"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "投票给这条消息的用户"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -465,7 +465,7 @@ msgstr "开启日期"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "子信息"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
diff --git a/addons/google_drive/i18n/pt_BR.po b/addons/google_drive/i18n/pt_BR.po
index 574eb5abc0c..be9806e4c66 100644
--- a/addons/google_drive/i18n/pt_BR.po
+++ b/addons/google_drive/i18n/pt_BR.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-27 16:03+0000\n"
-"PO-Revision-Date: 2012-12-07 22:47+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-07-20 22:32+0000\n"
+"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-06-28 05:42+0000\n"
-"X-Generator: Launchpad (build 16681)\n"
+"X-Launchpad-Export-Date: 2013-07-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: google_drive
 #: model:ir.ui.menu,name:google_drive.menu_google_drive_config
 msgid "Google Drive configuration"
-msgstr ""
+msgstr "Configuração do Google Drive"
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:48
@@ -40,6 +39,13 @@ msgid ""
 "in your Google Drive and in OpenERP attachment will be named\n"
 "                                'Agrolait_SO0001_Sales'."
 msgstr ""
+"O nome do documento em anexo pode usar dados fixos ou variáveis. Para "
+"distinguir entre documentos\n"
+"                                Google Drive, usar palavras fixos e campos. "
+"Por exemplo, no exemplo acima, se escreveu Agrolait_% (nome) s_Sales\n"
+"                                no campo Nome da unidade do Google, o "
+"documento em seu Google Drive e em OpenERP anexo será nomeado\n"
+"                                'Agrolait_SO0001_Sales \"."
 
 #. module: google_drive
 #: view:google.drive.config:0
@@ -47,16 +53,18 @@ msgid ""
 "- If filter is not specified, link of google document will appear in "
 "\"More\" option for all users for all opportunities."
 msgstr ""
+"- Se o filtro não for especificado, ligação de documento google aparecerá na "
+"opção \"Mais\" para todos os usuários de todas as oportunidades."
 
 #. module: google_drive
 #: view:google.drive.config:0
 msgid "To create a new filter:"
-msgstr ""
+msgstr "Para criar um novo filtro:"
 
 #. module: google_drive
 #: model:ir.model,name:google_drive.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: google_drive
 #: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
@@ -74,17 +82,30 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Clique para adicionar um novo modelo.\n"
+"                </ P>\n"
+"                <p>\n"
+"                    Vincular seus próprios modelos Google Drive para "
+"qualquer registro de OpenERP. Se você tem documentos específicos que você "
+"realmente deseja que seu colaborador preencher, por exemplo, usar uma "
+"planilha para controlar a qualidade do seu produto ou rever a lista de "
+"entrega para cada ordem em um país estrangeiro, ... É muito fácil de "
+"gerenciá-los, associá-los a OpenERP e usá-los para colaborar com seus "
+"empregados.\n"
+"                </ P>\n"
+"            "
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:150
 #, python-format
 msgid "Incorrect URL!"
-msgstr ""
+msgstr "URL incorreto!"
 
 #. module: google_drive
 #: view:base.config.settings:0
 msgid "Configure your templates"
-msgstr ""
+msgstr "Configure seus modelos"
 
 #. module: google_drive
 #: help:google.drive.config,name_template:0
@@ -92,6 +113,8 @@ msgid ""
 "Choose how the new google drive will be named, on google side. Eg. "
 "gdoc_%(field_name)s"
 msgstr ""
+"Escolha como a nova unidade google será nomeado, no lado google. Por "
+"exemplo. gdoc_% (field_name) s"
 
 #. module: google_drive
 #: view:google.drive.config:0
@@ -99,6 +122,8 @@ msgid ""
 "- Go to the OpenERP document you want to filter. For instance, go to "
 "Opportunities and search on Sales Department."
 msgstr ""
+"- Vá para o documento OpenERP você deseja filtrar. Por exemplo, ir para "
+"Oportunidades e de pesquisa no Departamento de Vendas."
 
 #. module: google_drive
 #: view:google.drive.config:0
@@ -106,6 +131,8 @@ msgid ""
 "- In this \"Search\" view, select the option \"Save Current Filter\", enter "
 "the name (Ex: Sales Department)"
 msgstr ""
+"- Neste ponto de vista \"Pesquisar\", selecione a opção \"Salvar Filtro "
+"Atual\", digite o nome (Ex: Departamento de Vendas)"
 
 #. module: google_drive
 #: view:google.drive.config:0
@@ -114,6 +141,9 @@ msgid ""
 "\"More\" options will appear for all users in opportunities of Sales "
 "Department."
 msgstr ""
+"- Se você selecionar \"Compartilhar com todos os usuários\", ligação de "
+"documento google na opção \"Mais\" será exibido para todos os usuários em "
+"oportunidades do Departamento de Vendas."
 
 #. module: google_drive
 #: view:google.drive.config:0
@@ -122,23 +152,28 @@ msgid ""
 "\"More\" options will not appear for other users in opportunities of Sales "
 "Department."
 msgstr ""
+"- Se você não selecionar \"Compartilhar com todos os usuários\", link do "
+"documento google em \"More\" opções não aparecerá para outros usuários em "
+"oportunidades do Departamento de Vendas."
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:48
 #, python-format
 msgid "At least one key cannot be found in your Google Drive name pattern"
 msgstr ""
+"Pelo menos uma chave não pode ser encontrado em seu padrão de nome de Google "
+"Drive"
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:150
 #, python-format
 msgid "Please enter a valid Google Document URL."
-msgstr ""
+msgstr "Por favor insira um URL Documento Google válida."
 
 #. module: google_drive
 #: field:google.drive.config,google_drive_client_id:0
 msgid "Google Client "
-msgstr ""
+msgstr "Google Cliente "
 
 #. module: google_drive
 #: view:google.drive.config:0
@@ -146,43 +181,46 @@ msgid ""
 "https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
 "a4/edit"
 msgstr ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
 
 #. module: google_drive
 #: field:google.drive.config,filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #. module: google_drive
 #: field:google.drive.config,name_template:0
 msgid "Google Drive Name Pattern"
-msgstr ""
+msgstr "Nome Padrão Google Drive"
 
 #. module: google_drive
 #: help:base.config.settings,google_drive_uri:0
 msgid "The URL to generate the authorization code from Google"
-msgstr ""
+msgstr "O URL para gerar o código de autorização do Google"
 
 #. module: google_drive
 #: model:ir.filters,name:google_drive.filter_partner
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: google_drive
 #: field:google.drive.config,google_drive_resource_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "ID Recurso"
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:91
 #, python-format
 msgid "The Google Template cannot be found. Maybe it has been deleted."
 msgstr ""
+"O modelo do Google não pode ser encontrado. Talvez tenha sido excluído."
 
 #. module: google_drive
 #: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
 #: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
 msgid "Google Drive Templates"
-msgstr ""
+msgstr "Templates do Google Drive"
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:81
@@ -191,23 +229,25 @@ msgid ""
 "Something went wrong during the token generation. Please request again an "
 "authorization code in %(menu:base_setup.menu_general_configuration)s."
 msgstr ""
+"Algo deu errado durante a geração de token. Por favor, solicite novamente um "
+"código de autorização em%(menu:base_setup.menu_general_configuration)s."
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:124
 #, python-format
 msgid "Google Drive Error!"
-msgstr ""
+msgstr "Google Drive Error!"
 
 #. module: google_drive
 #: field:base.config.settings,google_drive_uri:0
 msgid "URI"
-msgstr ""
+msgstr "URL"
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:124
 #, python-format
 msgid "Creating google drive may only be done by one at a time."
-msgstr ""
+msgstr "Criação de unidade google só pode ser feito por um de cada vez."
 
 #. module: google_drive
 #: field:google.drive.config,model:0
@@ -218,38 +258,40 @@ msgstr "Modelo"
 #. module: google_drive
 #: view:google.drive.config:0
 msgid "Google Drive Configuration"
-msgstr ""
+msgstr "Configuração do acionamento Google"
 
 #. module: google_drive
 #: field:google.drive.config,name:0
 msgid "Template Name"
-msgstr ""
+msgstr "Nome do modelo"
 
 #. module: google_drive
 #: constraint:google.drive.config:0
 msgid ""
 "Model of selected filter is not matching with model of current template."
 msgstr ""
+"Modelo de filtro selecionado não está combinando com o modelo do modelo "
+"atual."
 
 #. module: google_drive
 #: field:google.drive.config,google_drive_template_url:0
 msgid "Template URL"
-msgstr ""
+msgstr "Modelo de URL"
 
 #. module: google_drive
 #: view:base.config.settings:0
 msgid "and paste it here"
-msgstr ""
+msgstr "e cole-o aqui"
 
 #. module: google_drive
 #: field:base.config.settings,google_drive_authorization_code:0
 msgid "Authorization Code"
-msgstr ""
+msgstr "Código de Autorização"
 
 #. module: google_drive
 #: model:ir.model,name:google_drive.model_google_drive_config
 msgid "Google Drive templates config"
-msgstr ""
+msgstr "Google Drive templates de configuração"
 
 #. module: google_drive
 #: code:addons/google_drive/google_drive.py:64
@@ -258,3 +300,6 @@ msgid ""
 "You haven't configured 'Authorization Code' generated from google, Please "
 "generate and configure it in %(menu:base_setup.menu_general_configuration)s."
 msgstr ""
+"Você não configurou \"Código de Autorização\" gerado a partir do Google, por "
+"favor, gerar e configurá-lo em "
+"%(menu:base_setup.menu_general_configuration)s."

From 68d1c2928fc1d0307726ed4d32555d68c4f330c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Jul 2013 11:55:09 +0200
Subject: [PATCH 175/197] [CLEAN] Cleaning befor merging No need to use an
 image for edition -> use webtypo font instead Small code cleaning in js /
 python

bzr revid: tde@openerp.com-20130723095509-knp45uvmlfmr27v9
---
 addons/mail/mail_thread.py                    |  19 ++++----
 addons/mail/static/src/css/mail.css           |  12 ++---
 addons/mail/static/src/img/icon-edit.gif      | Bin 129 -> 0 bytes
 addons/mail/static/src/js/mail_followers.js   |  43 ++++++++++++------
 addons/mail/static/src/xml/mail_followers.xml |  12 ++---
 5 files changed, 46 insertions(+), 40 deletions(-)
 delete mode 100644 addons/mail/static/src/img/icon-edit.gif

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b4e8ddee439..b61477ec7ca 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -157,18 +157,17 @@ class mail_thread(osv.AbstractModel):
         return res
 
     def read_followers_data(self, cr, uid, follower_ids, context=None):
-        datas = []
+        result = []
         technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one')
         for follower in self.pool.get('res.partner').browse(cr, uid, follower_ids, context=context):
-            is_editable = uid in map(lambda x:x.id, technical_group.users)
-            is_uid = uid in map(lambda x:x.id, follower.user_ids)
-            data = (
-                     follower.id,
-                     follower.name,
-                     {'is_editable': is_editable, 'is_uid': is_uid},
-            )
-            datas.append(data)
-        return datas
+            is_editable = uid in map(lambda x: x.id, technical_group.users)
+            is_uid = uid in map(lambda x: x.id, follower.user_ids)
+            data = (follower.id,
+                    follower.name,
+                    {'is_editable': is_editable, 'is_uid': is_uid},
+                    )
+            result.append(data)
+        return result
 
     def _get_subscription_data(self, cr, uid, ids, name, args, user_pid=None, context=None):
         """ Computes:
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 2554538a104..c6f7c911f8a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -632,14 +632,10 @@
 }
 .openerp .oe_followers .oe_partner {
     height: 32px;
-    margin-right: 8px;
+    margin-right: 24px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    margin-right: 10px;
-}
-.openerp .oe_followers .oe_partner_name {
-    margin-right: 26px;
 }
 .openerp .oe_followers .oe_partner img{
     width: 32px;
@@ -656,11 +652,9 @@
     cursor: pointer;
     position: absolute;
     right: 12px;
-    margin-top: 6px;
-    width: 10px !important;
-    height: 12px !important;
+    line-height: 20px;
 }
-.openerp .oe_followers .oe_partner img.hidden{
+.openerp .oe_followers .oe_partner .oe_hidden{
     display: none;
 }
 .openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
diff --git a/addons/mail/static/src/img/icon-edit.gif b/addons/mail/static/src/img/icon-edit.gif
deleted file mode 100644
index 6e9aa5ef6599bb02e966d34994cc9f42a126ea5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmZ?wbhEHb<YC}pc+Ab<=;%1}?EmEC<j~O2SquzzGw<JFW%&P}k%58X%uI&=XMk)J
zp!kyoD96vB15^Msfro*CMeoB&&CaD;X83;amTFh^66_FOImOj+<*7oI_fqG-YF%Er
UH<?40kK;!r12f}!VMYdP0I0|`zyJUM

diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index d40c000f53e..a0dad1fcdbc 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -169,6 +169,7 @@ openerp_mail_followers = function(session, mail) {
                 self.message_is_follower = (_.indexOf(self.value, pid) != -1);
             }).then(self.proxy('display_generic'));
         },
+
         _format_followers: function(count){
             var str = '';
             if(count <= 0){
@@ -180,6 +181,7 @@ openerp_mail_followers = function(session, mail) {
             }
             return str;
         },
+
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
@@ -198,15 +200,22 @@ openerp_mail_followers = function(session, mail) {
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                if (record.length < 3) { return; }
-                if (record[2].is_uid == true) { self.message_is_follower = record[2].is_uid; }
-                record[2].avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                partner = {
+                    'id': record[0],
+                    'name': record[1],
+                    'is_uid': record[2]['is_uid'],
+                    'is_editable': record[2]['is_editable'],
+                    'avatar_url': mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]),
+                }
+                if (partner.is_uid) {
+                    self.message_is_follower = partner.is_uid;
+                }
+                $(session.web.qweb.render('mail.followers.partner', {'record': partner, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
-                if (record[2].is_editable == true) {
-                    self.$el.find('div.oe_follower_list').on('mouseenter mouseleave', function(e) {
-                        self.$el.find('img.oe_edit_subtype').toggleClass('hidden', e.type == 'mouseleave');
-                        self.$el.find('div.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                if (partner.is_editable) {
+                    self.$('.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$('.oe_edit_subtype').toggleClass('oe_hidden', e.type == 'mouseleave');
+                        self.$('.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
                     });
                 }
             });
@@ -233,23 +242,27 @@ openerp_mail_followers = function(session, mail) {
         /** Fetch subtypes, only if current user is follower */
         fetch_subtypes: function (user_pid) {
             var self = this;
-            var mode = "";
+            var dialog = false;
             if (user_pid) {
-                mode = "edit_follower";
+                dialog = true;
             } else {
                 var subtype_list_ul = this.$('.oe_subtype_list').empty();
                 if (! this.message_is_follower) return;
             }
             var id = this.view.datarecord.id;
             this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id, mode);});
+                .then(function (data) {self.display_subtypes(data, id, dialog);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id, mode) {
+        display_subtypes:function (data, id, dialog) {
             var self = this;
-            var $list = this.$('.oe_subtype_list');
-            if (mode.length != 0){ $list = self.$dialog; }
+            if (dialog) {
+                var $list = self.$dialog;
+            }
+            else {
+                var $list = this.$('.oe_subtype_list');
+            }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
             this.records_length = $.map(records, function(value, index) { return index; }).length;
@@ -257,7 +270,7 @@ openerp_mail_followers = function(session, mail) {
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record,'mode': mode})).appendTo( $list );
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);
             });
             if (_.size(records) > 1) {
                 $list.show();
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 7628cdae7da..a936b8237d6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -29,10 +29,10 @@
         Template used to display a partner following the record
         -->
     <div t-name="mail.followers.partner" class='oe_partner'>
-        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record[2].avatar_url}"/>
-        <a t-attf-href="#model=res.partner&amp;id=#{record[0]}" t-att-title="record[1]"><t t-esc="record[1]"/></a>
-        <img t-if="record[2].is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype hidden" t-att-src='_s + "/mail/static/src/img/icon-edit.gif"' title="Edit Subtype" t-att-data-id="record[0]"/>
-        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record[0]">X</span>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
+        <span t-if="record.is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype oe_e oe_hidden" title="Edit subscription" t-att-data-id="record.id">&amp;</span>
+        <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
     <!--
@@ -42,8 +42,8 @@
     <t t-name="mail.followers.subtype">
         <table class='oe_subtype'>
             <tr>
-                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+mode+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+mode+record.id"><t t-raw="record.name"/></label></td>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
             </tr>
         </table>
     </t>

From 9ae6b18ded02771591c83e74807c1e4447a8d14f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 23 Jul 2013 15:04:53 +0200
Subject: [PATCH 176/197] [FIX]google_spreadsheet: add active field on google
 drive template and handle when auth_crypt is installed

bzr revid: dle@openerp.com-20130723130453-0vns37b89v622kh0
---
 addons/google_drive/google_drive.py                   | 2 ++
 addons/google_drive/res_config_user_view.xml          | 1 +
 addons/google_spreadsheet/google_spreadsheet.py       | 6 +++++-
 addons/google_spreadsheet/google_spreadsheet_data.xml | 1 +
 addons/google_spreadsheet/google_spreadsheet_view.xml | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index fa697372901..717c20007d4 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -171,6 +171,7 @@ class config(osv.osv):
         'google_drive_resource_id': fields.function(_resource_get, type="char", string='Resource Id'),
         'google_drive_client_id': fields.function(_client_id_get, type="char", string='Google Client '),
         'name_template': fields.char('Google Drive Name Pattern', size=64, help='Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
+        'active': fields.boolean('Active'),
     }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
@@ -184,6 +185,7 @@ class config(osv.osv):
 
     _defaults = {
         'name_template': 'Document %(name)s',
+        'active': True,
     }
 
     def _check_model_id(self, cr, uid, ids, context=None):
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index 728ef03c5dd..8e4cc5c60a5 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -23,6 +23,7 @@
                     <field name="model" invisible="1" />
                     <group>
                         <field name="name" />
+                        <field name="active" />
                         <field name="model_id" on_change="onchange_model_id(model_id)" />
                         <label for='filter_id' />
                         <div>
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index 17de4a37e1b..28e4ca8f880 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -24,6 +24,7 @@ import re
 import requests
 
 from openerp.osv import osv
+from openerp import SUPERUSER_ID
 
 
 class base_config_settings(osv.osv):
@@ -59,7 +60,10 @@ class config(osv.osv):
         user = self.pool['res.users'].read(cr, uid, uid, ['login', 'password'], context=context)
         username = user['login']
         password = user['password']
-        config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password)
+        if self.pool['ir.module.module'].search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_crypt'), ('state', '=', 'installed')]) == 1:
+            config_formula = '=oe_settings("%s";"%s")' % (url, dbname)
+        else:
+            config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password)
         request = '''<feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:batch="http://schemas.google.com/gdata/batch"
       xmlns:gs="http://schemas.google.com/spreadsheets/2006">
diff --git a/addons/google_spreadsheet/google_spreadsheet_data.xml b/addons/google_spreadsheet/google_spreadsheet_data.xml
index 04c2122fabb..19802e9d140 100644
--- a/addons/google_spreadsheet/google_spreadsheet_data.xml
+++ b/addons/google_spreadsheet/google_spreadsheet_data.xml
@@ -6,6 +6,7 @@
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0ApGVjjwUC-ygdDZ0TG5EQnRlLVFQNlFGdFN5b1ZrY1E</field>
             <field name="name_template">Reporting %(name)s</field>
+            <field name="active" eval="0" />
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/google_spreadsheet_view.xml
index f247880e03a..f12798cc4bc 100644
--- a/addons/google_spreadsheet/google_spreadsheet_view.xml
+++ b/addons/google_spreadsheet/google_spreadsheet_view.xml
@@ -24,7 +24,7 @@
                         <group>
                             <group>
                                 <field name="name" string="Name"/>
-                                <field name="url" />
+                                <field name="url" widget="url"/>
                             </group>
                             <group colspan="2">
                                 <label for="description" colspan="2"/>

From d69046f327b5fc0590a0f6274248107d3e04d62c Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 23 Jul 2013 15:30:55 +0200
Subject: [PATCH 177/197] [FIX]google_drive: add in more menu duplicate when
 clicking on form switch button

bzr revid: dle@openerp.com-20130723133055-evcyunmih9uma3k4
---
 addons/google_drive/static/src/js/gdrive.js | 29 ++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index 3267487b4e3..dbbe50d0794 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -29,19 +29,24 @@ openerp.google_drive = function (instance, m) {
                     ds.call('get_google_drive_config', [view.dataset.model, res_id, context]).done(function (r) {
                         if (!_.isEmpty(r)) {
                             _.each(r, function (res) {
-                                var g_item = _.indexOf(_.pluck(self.items.other, 'label'), res.name);
-                                if (g_item !== -1) {
-                                    self.items.other.splice(g_item, 1);
+                                var already_there = false;
+                                for (var i = 0;i < self.items.other.length;i++){
+                                    if (self.items.other[i].classname === "oe_share_gdoc" && self.items.other[i].label.indexOf(res.name) > -1){
+                                        already_there = true;
+                                        break;
+                                    }
+                                }
+                                if (!already_there){
+                                    self.add_items('other', [{
+                                            label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
+                                            config_id: res.id,
+                                            res_id: res_id,
+                                            res_model: view.dataset.model,
+                                            callback: self.on_google_doc,
+                                            classname: 'oe_share_gdoc'
+                                        },
+                                    ]);
                                 }
-                                self.add_items('other', [{
-                                        label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
-                                        config_id: res.id,
-                                        res_id: res_id,
-                                        res_model: view.dataset.model,
-                                        callback: self.on_google_doc,
-                                        classname: 'oe_share_gdoc'
-                                    },
-                                ]);
                             })
                         }
                     });

From 605a84efc7615455ac5eaa25b0c5dc763962a9f3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 23 Jul 2013 16:10:09 +0200
Subject: [PATCH 178/197] [FIX]google_spreadsheet: attach spreadsheet to its
 template

bzr revid: dle@openerp.com-20130723141009-1b301rk5txiihstl
---
 addons/google_spreadsheet/google_spreadsheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index 28e4ca8f880..bfc5d822817 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -102,7 +102,7 @@ class config(osv.osv):
             raise
         config = self.browse(cr, uid, config_id, context=context)
         title = 'Spreadsheet %s' % model
-        res = self.copy_doc(cr, uid, 1, config.google_drive_resource_id, title, model, context=context)
+        res = self.copy_doc(cr, uid, config.id, config.google_drive_resource_id, title, 'google.drive.config', context=context)
 
         mo = re.search("(key=|/d/)([A-Za-z0-9-_]+)", res['url'])
         if mo:

From 3fca3eaad2c9c71a605d9ab2c9a0093b7e232e75 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 23 Jul 2013 16:12:56 +0200
Subject: [PATCH 179/197] [FIX]google_drive: typo

bzr revid: dle@openerp.com-20130723141256-tohys9etqw6wbrxw
---
 addons/google_drive/res_config_user_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index 8e4cc5c60a5..dc563a76c2b 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -55,7 +55,7 @@
         </record>
 
         <record model='ir.actions.act_window' id='action_google_drive_users_config'>
-            <field name='name'>Google Drive Templates</field>
+            <field name='name'>Templates</field>
             <field name='res_model'>google.drive.config</field>
             <field name='type'>ir.actions.act_window</field>
             <field name='view_type'>form</field>
@@ -88,7 +88,7 @@
             </field>
         </record>
 
-        <menuitem name='Google Drive configuration' id='menu_google_drive_config' parent='base.menu_administration' />
+        <menuitem name='Google Drive' id='menu_google_drive_config' parent='base.menu_administration' />
         <menuitem id='menu_google_drive_model_config' parent='menu_google_drive_config' action='action_google_drive_users_config' />
     </data>
 </openerp>

From e0e3d985573e0b21c1e5affa57c89d75eb6ef351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Jul 2013 16:45:07 +0200
Subject: [PATCH 180/197] [IMP] mail: refactored check_mail_message_access

bzr revid: tde@openerp.com-20130723144507-bwwegheqofs7x1ox
---
 addons/hr/hr.py                       | 18 ++----------------
 addons/mail/mail_thread.py            | 21 ++++++++++++++++-----
 addons/project/project.py             | 12 +-----------
 addons/project_issue/project_issue.py | 12 +-----------
 4 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a8011e069c5..3a99d5c8b60 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -156,6 +156,8 @@ class hr_employee(osv.osv):
     _inherits = {'resource.resource': "resource_id"}
     _inherit = ['mail.thread']
 
+    _mail_post_access = 'read'
+
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
@@ -324,22 +326,6 @@ class hr_employee(osv.osv):
         (_check_recursion, 'Error! You cannot create recursive hierarchy of Employee(s).', ['parent_id']),
     ]
 
-    # ---------------------------------------------------
-    # Mail gateway
-    # ---------------------------------------------------
-
-    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
-        """ mail.message document permission rule: can post a new message if can read
-            because of portal document. """
-        if not model_obj:
-            model_obj = self
-        employee_ids = model_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
-        if employee_ids and operation == 'create':
-            model_obj.check_access_rights(cr, uid, 'read')
-            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
-        else:
-            return super(hr_employee, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
-
 
 class hr_department(osv.osv):
     _description = "Department"
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b61477ec7ca..306e5fd5905 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -70,6 +70,7 @@ class mail_thread(osv.AbstractModel):
     _name = 'mail.thread'
     _description = 'Email Thread'
     _mail_flat_thread = True
+    _mail_post_access = 'write'
 
     # Automatic logging system if mail installed
     # _track = {
@@ -509,12 +510,22 @@ class mail_thread(osv.AbstractModel):
             access rule on the document, for portal document such as issues. """
         if not model_obj:
             model_obj = self
-        if operation in ['create', 'write', 'unlink']:
-            model_obj.check_access_rights(cr, uid, 'write')
-            model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
+        if hasattr(self, '_mail_post_access'):
+            create_allow = self._mail_post_access
         else:
-            model_obj.check_access_rights(cr, uid, operation)
-            model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+            create_allow = 'write'
+
+        if operation in ['write', 'unlink']:
+            check_operation = 'write'
+        elif operation == 'create' and create_allow in ['create', 'read', 'write', 'unlink']:
+            check_operation = create_allow
+        elif operation == 'create':
+            check_operation = 'write'
+        else:
+            check_operation = operation
+
+        model_obj.check_access_rights(cr, uid, check_operation)
+        model_obj.check_access_rule(cr, uid, mids, check_operation, context=context)
 
     def _get_formview_action(self, cr, uid, id, model=None, context=None):
         """ Return an action to open the document. This method is meant to be
diff --git a/addons/project/project.py b/addons/project/project.py
index c8b900c9e84..d09e3476a96 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -545,6 +545,7 @@ class task(osv.osv):
     _date_name = "date_start"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
+    _mail_post_access = 'read'
     _track = {
         'stage_id': {
             'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
@@ -1106,17 +1107,6 @@ class task(osv.osv):
         return [task.project_id.message_get_reply_to()[0] if task.project_id else False
                     for task in self.browse(cr, uid, ids, context=context)]
 
-    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
-        """ mail.message document permission rule: can post a new message if can read
-            because of portal document. """
-        if not model_obj:
-            model_obj = self
-        if operation == 'create':
-            model_obj.check_access_rights(cr, uid, 'read')
-            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
-        else:
-            return super(task, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
-
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
         """ Override to updates the document according to the email. """
         if custom_values is None: custom_values = {}
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 30ca08c0ae7..ace27f13dd1 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -45,6 +45,7 @@ class project_issue(osv.Model):
     _order = "priority, create_date desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
+    _mail_post_access = 'read'
     _track = {
         'stage_id': {
             'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
@@ -477,17 +478,6 @@ class project_issue(osv.Model):
         return [issue.project_id.message_get_reply_to()[0] if issue.project_id else False
                     for issue in self.browse(cr, uid, ids, context=context)]
 
-    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
-        """ mail.message document permission rule: can post a new message if can read
-            because of portal document. """
-        if not model_obj:
-            model_obj = self
-        if operation == 'create':
-            model_obj.check_access_rights(cr, uid, 'read')
-            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
-        else:
-            return super(project_issue, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
-
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(project_issue, self).message_get_suggested_recipients(cr, uid, ids, context=context)
         try:

From 2784af19717286ce03b50fa228d15f9608e4900b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 23 Jul 2013 17:11:05 +0200
Subject: [PATCH 181/197] [DOC] mail: added changelog

bzr revid: tde@openerp.com-20130723151105-fk8c0rgi6xya0np5
---
 addons/mail/doc/changelog.rst | 11 +++++++++++
 addons/mail/doc/index.rst.inc |  9 +++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 addons/mail/doc/changelog.rst

diff --git a/addons/mail/doc/changelog.rst b/addons/mail/doc/changelog.rst
new file mode 100644
index 00000000000..f6674bb42ad
--- /dev/null
+++ b/addons/mail/doc/changelog.rst
@@ -0,0 +1,11 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - added ``_mail_post_access`` attribute that specifies the access right that
+   should have the user in order to post a new message on a given model. Values
+   are ``read`` (portal documents), ``write`` (default value), ``unlink`` or ``create``.
\ No newline at end of file
diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc
index 4b01d3ec7bd..7f56666336b 100644
--- a/addons/mail/doc/index.rst.inc
+++ b/addons/mail/doc/index.rst.inc
@@ -12,3 +12,12 @@ Mail Module documentation topics
    mail_partner
    mail_state
    mail_subtype
+
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst

From 761ba7505501b2ad9652dbec2e8b4cdd0730d428 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 24 Jul 2013 09:36:24 +0200
Subject: [PATCH 182/197] [IMP] Cleaned some more http.py, removed 'debug'
 handling and put it in the controller serving the home page

bzr revid: nicolas.vanhoren@openerp.com-20130724073624-uhshc0cn2m3rs7iq
---
 addons/web/controllers/main.py | 10 ++++++----
 addons/web/http.py             | 17 +----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2536f4d9f2f..0aafa6d4d2c 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -296,13 +296,13 @@ def manifest_glob(extension, addons=None, db=None, include_remotes=False):
                     r.append((path, fs2web(path[len(addons_path):])))
     return r
 
-def manifest_list(extension, mods=None, db=None):
+def manifest_list(extension, mods=None, db=None, debug=False):
     """ list ressources to load specifying either:
     mods: a comma separated string listing modules
     db: a database name (return all installed modules in that database)
     """
     files = manifest_glob(extension, addons=mods, db=db, include_remotes=True)
-    if not request.debug:
+    if not debug:
         path = '/web/webclient/' + extension
         if mods is not None:
             path += '?' + urllib.urlencode({'mods': mods})
@@ -540,8 +540,10 @@ class Home(http.Controller):
         if redir:
             return redirect_with_hash(redir)
 
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=db))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=db))
+        debug = "debug" in kw
+
+        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=db, debug=debug))
+        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=db, debug=debug))
 
         r = html_template % {
             'js': js,
diff --git a/addons/web/http.py b/addons/web/http.py
index d99f2982ec3..5eddfadcf48 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -85,10 +85,6 @@ class WebRequest(object):
 
         :class:`~collections.Mapping` of context values for the current request
 
-    .. attribute:: debug
-
-        ``bool``, indicates whether the debug mode is active on the client
-
     .. attribute:: db
 
         ``str``, the name of the database linked to the current request. Can be ``None``
@@ -112,7 +108,6 @@ class WebRequest(object):
         self._cr_cm = None
         self._cr = None
         self.func_request_type = None
-        self.debug = self.httprequest.args.get('debug', False) is not False
         with set_request(self):
             self.db = self.session.db or db_monodb()
         # set db/uid trackers - they're cleaned up at the WSGI
@@ -304,8 +299,6 @@ class JsonRequest(WebRequest):
         error = None
 
         try:
-            #if _logger.isEnabledFor(logging.DEBUG):
-            #    _logger.debug("--> %s.%s\n%s", func.im_class.__name__, func.__name__, pprint.pformat(self.jsonrequest))
             response['id'] = self.jsonrequest.get('id')
             response["result"] = self._call_function(**self.params)
         except AuthenticationError, e:
@@ -327,9 +320,6 @@ class JsonRequest(WebRequest):
         if error:
             response["error"] = error
 
-        if _logger.isEnabledFor(logging.DEBUG):
-            _logger.debug("<--\n%s", pprint.pformat(response))
-
         if self.jsonp:
             # If we use jsonp, that's mean we are called from another host
             # Some browser (IE and Safari) do no allow third party cookies
@@ -394,7 +384,7 @@ class HttpRequest(WebRequest):
     def __init__(self, *args):
         super(HttpRequest, self).__init__(*args)
         params = dict(self.httprequest.args)
-        ex = set(["session_id", "debug"])
+        ex = set(["session_id"])
         for k in params.keys():
             if k in ex:
                 del params[k]
@@ -409,7 +399,6 @@ class HttpRequest(WebRequest):
                 akw[key] = value
             else:
                 akw[key] = type(value)
-        #_logger.debug("%s --> %s.%s %r", self.httprequest.func, func.im_class.__name__, func.__name__, akw)
         try:
             r = self._call_function(**self.params)
         except werkzeug.exceptions.HTTPException, e:
@@ -426,10 +415,6 @@ class HttpRequest(WebRequest):
         else:
             if not r:
                 r = werkzeug.wrappers.Response(status=204)  # no content
-        if isinstance(r, (werkzeug.wrappers.BaseResponse, werkzeug.exceptions.HTTPException)):
-            _logger.debug('<-- %s', r)
-        else:
-            _logger.debug("<-- size: %s", len(r))
         return r
 
     def make_response(self, data, headers=None, cookies=None):

From 3b384da85840e9d3abbf9638cda08152e9a90f36 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 24 Jul 2013 12:00:30 +0200
Subject: [PATCH 183/197] [IMP] Removed http param 'db' handling from http.py
 and put it in the main controller in main.py

bzr revid: nicolas.vanhoren@openerp.com-20130724100030-yxbpntlz58kohy1n
---
 addons/web/controllers/main.py     | 16 ++++---
 addons/web/http.py                 | 71 +++++++++++++++++-------------
 addons/web/static/src/js/chrome.js | 12 -----
 3 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 0aafa6d4d2c..89c039b20c0 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -535,11 +535,15 @@ html_template = """<!DOCTYPE html>
 class Home(http.Controller):
 
     @http.route('/', type='http', auth="none")
-    def index(self, s_action=None, db=None, **kw):
-        db, redir = db_monodb_redirect()
-        if redir:
-            return redirect_with_hash(redir)
-
+    def index(self, s_action=None, **kw):
+        if 'db' in kw:
+            ndb = kw['db']
+            lst = http.db_list(True)
+            if ndb in lst and ndb != request.session.db:
+                request.session.logout()
+                request.session.db = ndb
+                
+        db = request.session.db
         debug = "debug" in kw
 
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=db, debug=debug))
@@ -821,7 +825,7 @@ class Session(http.Controller):
     @http.route('/web/session/get_session_info', type='json', auth="none")
     def get_session_info(self):
         request.uid = request.session.uid
-        request.db = request.session.db
+        request.disable_db = False
         return self.session_info()
 
     @http.route('/web/session/authenticate', type='json', auth="none")
diff --git a/addons/web/http.py b/addons/web/http.py
index 5eddfadcf48..ff080787739 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -101,15 +101,13 @@ class WebRequest(object):
         self.httpsession = httprequest.session
         self.session = httprequest.session
         self.session_id = httprequest.session.sid
-        self.db = None
+        self.disable_db = False
         self.uid = None
         self.func = None
         self.auth_method = None
         self._cr_cm = None
         self._cr = None
         self.func_request_type = None
-        with set_request(self):
-            self.db = self.session.db or db_monodb()
         # set db/uid trackers - they're cleaned up at the WSGI
         # dispatching phase in openerp.service.wsgi_server.application
         if self.db:
@@ -127,17 +125,16 @@ class WebRequest(object):
                 self.session.logout()
                 raise SessionExpiredException("Session expired for request %s" % self.httprequest)
         if self.auth_method == "none":
-            self.db = None
+            self.disable_db = True
             self.uid = None
         elif self.auth_method == "admin":
-            self.db = self.session.db or db_monodb()
+            self.disable_db = False
             if not self.db:
                 raise SessionExpiredException("No valid database for request %s" % self.httprequest)
             self.uid = openerp.SUPERUSER_ID
         else: # auth
-            self.db = self.session.db
+            self.disable_db = False
             self.uid = self.session.uid
-
     @property
     def registry(self):
         """
@@ -146,6 +143,14 @@ class WebRequest(object):
         """
         return openerp.modules.registry.RegistryManager.get(self.db) if self.db else None
 
+    @property
+    def db(self):
+        """
+        The registry to the database linked to this request. Can be ``None`` if the current request uses the
+        ``none'' authentication.
+        """
+        return self.session.db if not self.disable_db else None
+
     @property
     def cr(self):
         """
@@ -179,7 +184,7 @@ class WebRequest(object):
                 return self.func(*args, **kwargs)
         finally:
             # just to be sure no one tries to re-use the request
-            self.db = None
+            self.disable_db = True
             self.uid = None
 
 def route(route, type="http", auth="user"):
@@ -611,8 +616,8 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
         self.uid = uid
         self.login = login
         self.password = password
-        request.db = db
         request.uid = uid
+        request.disable_db = False
 
         if uid: self.get_context()
         return uid
@@ -885,6 +890,8 @@ class Root(object):
             else:
                 httprequest.session = self.session_store.get(sid)
 
+            self._find_db(httprequest)
+
             if not "lang" in httprequest.session.context:
                 lang = httprequest.accept_languages.best or "en_US"
                 lang = babel.core.LOCALE_ALIASES.get(lang, lang).replace('-', '_')
@@ -921,6 +928,12 @@ class Root(object):
         except werkzeug.exceptions.HTTPException, e:
             return e(environ, start_response)
 
+    def _find_db(self, httprequest):
+        db = db_monodb(httprequest)
+        if db != httprequest.session.db:
+            httprequest.session.logout()
+            httprequest.session.db = db
+
     def _build_request(self, httprequest):
         if httprequest.args.get('jsonp'):
             return JsonRequest(httprequest)
@@ -1035,43 +1048,39 @@ class Root(object):
 
 root = None
 
-def db_list(force=False):
-    proxy = request.session.proxy("db")
-    dbs = proxy.list(force)
-    h = request.httprequest.environ['HTTP_HOST'].split(':')[0]
+def db_list(force=False, httprequest=None):
+    httprequest = httprequest or request.httprequest
+    dbs = openerp.netsvc.dispatch_rpc("db", "list", [force])
+    h = httprequest.environ['HTTP_HOST'].split(':')[0]
     d = h.split('.')[0]
     r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d', d)
     dbs = [i for i in dbs if re.match(r, i)]
     return dbs
 
-def db_redirect(match_first_only_if_unique):
+def db_redirect(match_first_only_if_unique, httprequest=None):
+    httprequest = httprequest or request.httprequest
     db = None
     redirect = None
 
-    dbs = db_list(True)
+    dbs = db_list(True, httprequest)
 
-    # 1 try the db in the url
-    db_url = request.httprequest.args.get('db')
-    if db_url in dbs:
-        return (db_url, None)
+    # 1 try the db in the session
+    db_session = httprequest.session.db
+    if db_session in dbs:
+        return (db_session, None)
 
-    # 2 use the database from the cookie if it's listable and still listed
-    cookie_db = request.httprequest.cookies.get('last_used_database')
-    if cookie_db in dbs:
-        db = cookie_db
-
-    # 3 use the first db if user can list databases
-    if dbs and not db and (not match_first_only_if_unique or len(dbs) == 1):
+    # 2 use the first db if user can list databases
+    if dbs and (not match_first_only_if_unique or len(dbs) == 1):
         db = dbs[0]
 
     # redirect to the chosen db if multiple are available
     if db and len(dbs) > 1:
-        query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
+        query = dict(urlparse.parse_qsl(httprequest.query_string, keep_blank_values=True))
         query.update({'db': db})
-        redirect = request.httprequest.path + '?' + urllib.urlencode(query)
+        redirect = httprequest.path + '?' + urllib.urlencode(query)
     return (db, redirect)
 
-def db_monodb():
+def db_monodb(httprequest=None):
     """
         Magic function to find the current database.
 
@@ -1080,9 +1089,9 @@ def db_monodb():
         * Magic
         * More magic
 
-        Return ``None`` if the magic is not magic enough.
+        Returns ``None`` if the magic is not magic enough.
     """
-    return db_redirect(True)[0]
+    return db_redirect(True, httprequest=httprequest)[0]
 
 
 class CommonController(Controller):
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1c976cb619e..036f57eee7a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -705,20 +705,9 @@ instance.web.Login =  instance.web.Widget.extend({
         }
         return d;
     },
-    remember_last_used_database: function(db) {
-        // This cookie will be used server side in order to avoid db reloading on first visit
-        var ttl = 24 * 60 * 60 * 365;
-        document.cookie = [
-            'last_used_database=' + db,
-            'path=/',
-            'max-age=' + ttl,
-            'expires=' + new Date(new Date().getTime() + ttl * 1000).toGMTString()
-        ].join(';');
-    },
     database_selected: function(db) {
         var params = $.deparam.querystring();
         params.db = db;
-        this.remember_last_used_database(db);
         this.$('.oe_login_dbpane').empty().text(_t('Loading...'));
         this.$('[name=login], [name=password]').prop('readonly', true);
         instance.web.redirect('/?' + $.param(params));
@@ -769,7 +758,6 @@ instance.web.Login =  instance.web.Widget.extend({
         self.hide_error();
         self.$(".oe_login_pane").fadeOut("slow");
         return this.session.session_authenticate(db, login, password).then(function() {
-            self.remember_last_used_database(db);
             if (self.has_local_storage && self.remember_credentials) {
                 localStorage.setItem(db + '|last_login', login);
                 if (self.session.debug) {

From 2205c3021f38656411a2e55d6f29be651a870ac7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 24 Jul 2013 14:23:28 +0200
Subject: [PATCH 184/197] Some more correction to always have the db in the url

bzr revid: nicolas.vanhoren@openerp.com-20130724122328-kbnwq2uois37q74n
---
 addons/web/controllers/main.py | 20 ++++++++--------
 addons/web/http.py             | 42 +++++++++++++++-------------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 89c039b20c0..0f92d769fa2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -88,9 +88,6 @@ def rjsmin(script):
 
 db_list = http.db_list
 
-def db_monodb_redirect():
-    return http.db_redirect(not config['list_db'])
-
 db_monodb = http.db_monodb
 
 def redirect_with_hash(url, code=303):
@@ -535,16 +532,21 @@ html_template = """<!DOCTYPE html>
 class Home(http.Controller):
 
     @http.route('/', type='http', auth="none")
-    def index(self, s_action=None, **kw):
-        if 'db' in kw:
-            ndb = kw['db']
+    def index(self, s_action=None, db=None, debug=False, **kw):
+        debug = debug != False
+        if db is not None:
             lst = http.db_list(True)
-            if ndb in lst and ndb != request.session.db:
+            if db in lst and db != request.session.db:
                 request.session.logout()
-                request.session.db = ndb
+                request.session.db = db
+
+        if db != request.session.db:
+            query = dict(urlparse.parse_qsl(request.httprequest.query_string, keep_blank_values=True))
+            query.update({'db': request.session.db})
+            redirect = request.httprequest.path + '?' + urllib.urlencode(query)
+            return redirect_with_hash(redirect)
                 
         db = request.session.db
-        debug = "debug" in kw
 
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js', db=db, debug=debug))
         css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css', db=db, debug=debug))
diff --git a/addons/web/http.py b/addons/web/http.py
index ff080787739..687af164e72 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -1057,29 +1057,6 @@ def db_list(force=False, httprequest=None):
     dbs = [i for i in dbs if re.match(r, i)]
     return dbs
 
-def db_redirect(match_first_only_if_unique, httprequest=None):
-    httprequest = httprequest or request.httprequest
-    db = None
-    redirect = None
-
-    dbs = db_list(True, httprequest)
-
-    # 1 try the db in the session
-    db_session = httprequest.session.db
-    if db_session in dbs:
-        return (db_session, None)
-
-    # 2 use the first db if user can list databases
-    if dbs and (not match_first_only_if_unique or len(dbs) == 1):
-        db = dbs[0]
-
-    # redirect to the chosen db if multiple are available
-    if db and len(dbs) > 1:
-        query = dict(urlparse.parse_qsl(httprequest.query_string, keep_blank_values=True))
-        query.update({'db': db})
-        redirect = httprequest.path + '?' + urllib.urlencode(query)
-    return (db, redirect)
-
 def db_monodb(httprequest=None):
     """
         Magic function to find the current database.
@@ -1091,8 +1068,25 @@ def db_monodb(httprequest=None):
 
         Returns ``None`` if the magic is not magic enough.
     """
-    return db_redirect(True, httprequest=httprequest)[0]
+    httprequest = httprequest or request.httprequest
+    db = None
+    redirect = None
 
+    dbs = db_list(True, httprequest)
+
+    # 1 try the db already in the session
+    db_session = httprequest.session.db
+    if db_session in dbs:
+        return db_session
+
+    # 2 if there is only one db in the db filters, take it
+    if len(dbs) == 1:
+        return dbs[0]
+
+    # 3 if there are multiple dbs, take the first one only if we can list them
+    if len(dbs) > 1 and config['list_db']:
+        return dbs[0]
+    return None
 
 class CommonController(Controller):
 

From 54de4095ae4a3a0adeb437ed787b7cff34063399 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 24 Jul 2013 15:05:34 +0200
Subject: [PATCH 185/197] [FIX]google_drive, google_spreadsheet: go to
 configuration panel only for group settings,  spreadsheet attached to model
 without res_id

bzr revid: dle@openerp.com-20130724130534-axyvc0u0g1um07fg
---
 addons/google_drive/google_drive.py             | 16 +++++++++++-----
 addons/google_spreadsheet/google_spreadsheet.py |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 717c20007d4..f2b4979d8f8 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -60,8 +60,13 @@ class config(osv.osv):
     def get_access_token(self, cr, uid, scope=None, context=None):
         ir_config = self.pool['ir.config_parameter']
         google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
+        group_config = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_erp_manager')[1]
+        user = self.pool['res.users'].read(cr, uid, uid, "groups_id")
         if not google_drive_refresh_token:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
+            if group_config in user['groups_id']:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
+            else:
+                raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator."))
         google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
         google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
         #For Getting New Access Token With help of old Refresh Token
@@ -75,10 +80,11 @@ class config(osv.osv):
         try:
             req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
             content = urllib2.urlopen(req).read()
-        except urllib2.HTTPError as e:
-            print vars(e)
-            print e.read()
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context)
+        except urllib2.HTTPError:
+            if group_config in user['groups_id']:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context)
+            else:
+                raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator."))
         content = json.loads(content)
         return content.get('access_token')
 
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index bfc5d822817..62961ee9989 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -102,7 +102,7 @@ class config(osv.osv):
             raise
         config = self.browse(cr, uid, config_id, context=context)
         title = 'Spreadsheet %s' % model
-        res = self.copy_doc(cr, uid, config.id, config.google_drive_resource_id, title, 'google.drive.config', context=context)
+        res = self.copy_doc(cr, uid, False, config.google_drive_resource_id, title, model, context=context)
 
         mo = re.search("(key=|/d/)([A-Za-z0-9-_]+)", res['url'])
         if mo:

From a3f57cd43b4f6cd00ce06564f7fde1dbb6598d5f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 24 Jul 2013 15:09:36 +0200
Subject: [PATCH 186/197] [FIX]ir_attachement: if res_id = 0, allow to read if
 allowed to read model

bzr revid: dle@openerp.com-20130724130936-u1payhg18hcssj0z
---
 openerp/addons/base/ir/ir_attachment.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index f00cc3f85ed..704488f6938 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -233,10 +233,10 @@ class ir_attachment(osv.osv):
         targets = cr.dictfetchall()
         model_attachments = {}
         for target_dict in targets:
-            if not (target_dict['res_id'] and target_dict['res_model']):
+            if not target_dict['res_model']:
                 continue
             # model_attachments = { 'model': { 'res_id': [id1,id2] } }
-            model_attachments.setdefault(target_dict['res_model'],{}).setdefault(target_dict['res_id'],set()).add(target_dict['id'])
+            model_attachments.setdefault(target_dict['res_model'],{}).setdefault(target_dict['res_id'] or 0, set()).add(target_dict['id'])
 
         # To avoid multiple queries for each attachment found, checks are
         # performed in batch as much as possible.
@@ -250,7 +250,7 @@ class ir_attachment(osv.osv):
 
             # filter ids according to what access rules permit
             target_ids = targets.keys()
-            allowed_ids = self.pool[model].search(cr, uid, [('id', 'in', target_ids)], context=context)
+            allowed_ids = [0] + self.pool[model].search(cr, uid, [('id', 'in', target_ids)], context=context)
             disallowed_ids = set(target_ids).difference(allowed_ids)
             for res_id in disallowed_ids:
                 for attach_id in targets[res_id]:

From b105770bbc0f545a4dfd0482b5b310f534fc1033 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 24 Jul 2013 17:19:29 +0200
Subject: [PATCH 187/197] [IMP] removed hack to force disable the browser's
 cache and use http headers instead

bzr revid: nicolas.vanhoren@openerp.com-20130724151929-8j1bo1ae64lwkxdw
---
 addons/web/controllers/main.py     |  2 +-
 addons/web/static/src/js/chrome.js | 16 +++++++++++-----
 addons/web/static/src/xml/base.xml |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 0f92d769fa2..da3cc8b8d2a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -557,7 +557,7 @@ class Home(http.Controller):
             'modules': simplejson.dumps(module_boot(db=db)),
             'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
         }
-        return r
+        return request.make_response(r, {'Cache-Control': 'no-cache', 'Content-Type': 'text/html; charset=utf-8'})
 
     @http.route('/login', type='http', auth="user")
     def login(self, db, login, key):
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 036f57eee7a..89c44a9b7ed 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -792,10 +792,17 @@ instance.web.redirect = function(url, wait) {
         instance.client.crashmanager.active = false;
     }
 
-    var wait_server = function() {
-        instance.session.rpc("/web/webclient/version_info", {}).done(function() {
+    var load = function() {
+        var old = "" + window.location;
+        if (old === url) {
+            window.location.reload();
+        } else {
             window.location = url;
-        }).fail(function() {
+        }
+    };
+
+    var wait_server = function() {
+        instance.session.rpc("/web/webclient/version_info", {}).done(load).fail(function() {
             setTimeout(wait_server, 250);
         });
     };
@@ -803,7 +810,7 @@ instance.web.redirect = function(url, wait) {
     if (wait) {
         setTimeout(wait_server, 1000);
     } else {
-        window.location = url;
+        load();
     }
 };
 
@@ -818,7 +825,6 @@ instance.web.Reload = function(parent, action) {
     var l = window.location;
 
     var sobj = $.deparam(l.search.substr(1));
-    sobj.ts = new Date().getTime();
     if (params.url_search) {
         sobj = _.extend(sobj, params.url_search);
     }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 643bca0e798..fb622b056a1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -459,7 +459,7 @@
         <tr>
             <td class="oe_leftbar" valign="top">
                 <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
-                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}">
+                <a class="oe_logo" t-attf-href="/?#{debug}">
                     <span class="oe_logo_edit">Edit Company data</span>
                     <img t-att-src='widget.session.url("/web/binary/company_logo")'/>
                 </a>

From f3e189698d7401e3d4602e028fa2bb5c93f22919 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 24 Jul 2013 17:37:54 +0200
Subject: [PATCH 188/197] [FIX]google_drive, google_spreadsheet: move of
 get_google_scope in google objects instead of config

bzr revid: dle@openerp.com-20130724153754-thj2l0b1t4lw136j
---
 addons/google_drive/google_drive.py             |  8 ++++----
 addons/google_spreadsheet/google_spreadsheet.py | 11 ++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index f2b4979d8f8..8bc487ada7c 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -204,21 +204,21 @@ class config(osv.osv):
         (_check_model_id, 'Model of selected filter is not matching with model of current template.', ['model_id', 'filter_id']),
     ]
 
+    def get_google_scope(self):
+        return 'https://www.googleapis.com/auth/drive'
+
 config()
 
 
 class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
 
-    def _get_google_scope(self):
-        return 'https://www.googleapis.com/auth/drive'
-
     _columns = {
         'google_drive_authorization_code': fields.char('Authorization Code', size=124),
         'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
-        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', scope=s._get_google_scope(), context=c),
+        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', scope=s.pool['google.drive.config'].get_google_scope(), context=c),
     }
 
     def set_google_authorization_code(self, cr, uid, ids, context=None):
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index 62961ee9989..2333adf6751 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -27,16 +27,13 @@ from openerp.osv import osv
 from openerp import SUPERUSER_ID
 
 
-class base_config_settings(osv.osv):
-    _inherit = "base.config.settings"
-
-    def _get_google_scope(self):
-        return 'https://www.googleapis.com/auth/drive https://spreadsheets.google.com/feeds'
-
-
 class config(osv.osv):
     _inherit = 'google.drive.config'
 
+    def get_google_scope(self):
+        scope = super(config, self).get_google_scope()
+        return '%s https://spreadsheets.google.com/feeds' % scope
+
     def write_config_formula(self, cr, uid, attachment_id, spreadsheet_key, model, domain, groupbys, view_id, context=None):
         access_token = self.get_access_token(cr, uid, scope='https://spreadsheets.google.com/feeds', context=context)
 

From a892e25901eddd958388f6a5c1f1349ea6193d9b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 25 Jul 2013 05:13:15 +0000
Subject: [PATCH 189/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130724053159-8wdv92pt9hwa3qgp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130725051315-bc4hramkauuexjra
---
 addons/account_asset/i18n/th.po         |  86 ++--
 addons/crm/i18n/th.po                   | 630 ++++++++++++------------
 addons/crm/i18n/zh_CN.po                |   2 +-
 addons/crm_partner_assign/i18n/zh_CN.po |  38 +-
 addons/l10n_multilang/i18n/zh_CN.po     | 169 +++++++
 5 files changed, 553 insertions(+), 372 deletions(-)
 create mode 100644 addons/l10n_multilang/i18n/zh_CN.po

diff --git a/addons/account_asset/i18n/th.po b/addons/account_asset/i18n/th.po
index fdc6c7b4754..cd7967a5eb2 100644
--- a/addons/account_asset/i18n/th.po
+++ b/addons/account_asset/i18n/th.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: 2013-05-15 10:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-07-24 08:53+0000\n"
+"Last-Translator: Sumonchai ( เหลา ) <sumonchai@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
-"X-Generator: Launchpad (build 16626)\n"
+"X-Launchpad-Export-Date: 2013-07-25 05:13+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -42,7 +42,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "จัดกลุ่มตาม..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
@@ -58,7 +58,7 @@ msgstr ""
 #: field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
 msgid "Asset"
-msgstr ""
+msgstr "สินทรัพย์"
 
 #. module: account_asset
 #: help:account.asset.asset,prorata:0
@@ -72,7 +72,7 @@ msgstr ""
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Linear"
-msgstr ""
+msgstr "เชิงเส้น"
 
 #. module: account_asset
 #: field:account.asset.asset,company_id:0
@@ -80,24 +80,24 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "บริษัท"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "ปรับเปลี่ยน"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Running"
-msgstr ""
+msgstr "กำลังทำงานอยู่"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "กำหนดให้เป็นแบบร่าง"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: account_asset
 #: field:asset.modify,name:0
 msgid "Reason"
-msgstr ""
+msgstr "เหตุผล"
 
 #. module: account_asset
 #: field:account.asset.asset,method_progress_factor:0
@@ -122,7 +122,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
 msgid "Asset Categories"
-msgstr ""
+msgstr "หมวดหมู่สินทรัพย์"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -173,7 +173,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr ""
+msgstr "สินทรัพย์"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -187,7 +187,7 @@ msgstr ""
 #: view:asset.modify:0
 #: field:asset.modify,note:0
 msgid "Notes"
-msgstr ""
+msgstr "บันทึกย่อ"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_id:0
@@ -221,7 +221,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "อ้างถึง"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -246,7 +246,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ฉบับร่าง"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -273,13 +273,13 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "วิเคราะห์บัญชี"
 
 #. module: account_asset
 #: field:account.asset.asset,method:0
 #: field:account.asset.category,method:0
 msgid "Computation Method"
-msgstr ""
+msgstr "วิธีการคำนวณ"
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
@@ -308,7 +308,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
 msgid "Salvage Value"
-msgstr ""
+msgstr "มูลค่าซาก"
 
 #. module: account_asset
 #: field:account.asset.asset,category_id:0
@@ -364,20 +364,20 @@ msgstr ""
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr ""
+msgstr "วิธีการจัดการเวลา"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "หรือ"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
 #: field:account.asset.category,note:0
 #: field:account.asset.history,note:0
 msgid "Note"
-msgstr ""
+msgstr "บันทึกย่อ"
 
 #. module: account_asset
 #: help:account.asset.history,method_time:0
@@ -409,7 +409,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "ปิด"
 
 #. module: account_asset
 #: help:account.asset.asset,state:0
@@ -425,13 +425,13 @@ msgstr ""
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
 #: field:asset.asset.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "พาร์ทเนอร์"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.history,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ผู้ใช้"
 
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
@@ -482,12 +482,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,active:0
 msgid "Active"
-msgstr ""
+msgstr "เปิดใช้งาน"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr ""
+msgstr "สถานะของสินทรัพย์"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
@@ -498,12 +498,12 @@ msgstr ""
 #: view:account.asset.asset:0
 #: field:account.asset.asset,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "ประวัติ"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr ""
+msgstr "คำนวณสินทรัพย์"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
@@ -513,7 +513,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "ทั่วไป"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0
@@ -524,7 +524,7 @@ msgstr ""
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "ใบแจ้งหนี้"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -535,13 +535,13 @@ msgstr ""
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "Cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: selection:asset.asset.report,state:0
 msgid "Close"
-msgstr ""
+msgstr "ปิด"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
@@ -558,7 +558,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,purchase_date:0
 msgid "Purchase Date"
-msgstr ""
+msgstr "วันที่ซื้อ"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -606,7 +606,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "สกุลเงิน"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
@@ -637,7 +637,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,move_check:0
 msgid "Posted"
-msgstr ""
+msgstr "ลงบัญชีแล้ว"
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@@ -660,7 +660,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -672,7 +672,7 @@ msgstr ""
 #. module: account_asset
 #: field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "ปี"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -693,7 +693,7 @@ msgid "Amount of Depreciation Lines"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:50
 #, python-format
 msgid "Created Asset Moves"
 msgstr ""
@@ -701,7 +701,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "ลำดับ"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
@@ -711,7 +711,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "วันที่"
 
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
diff --git a/addons/crm/i18n/th.po b/addons/crm/i18n/th.po
index 082ed1efa6d..99c347c9ed3 100644
--- a/addons/crm/i18n/th.po
+++ b/addons/crm/i18n/th.po
@@ -8,29 +8,29 @@ 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: 2011-01-16 16:48+0000\n"
-"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
+"PO-Revision-Date: 2013-07-24 09:15+0000\n"
+"Last-Translator: Supakorn S <lanpartystudio@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-25 05:13+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "เป้าหมาย"
 
 #. module: crm
 #: help:sale.config.settings,fetchmail_lead:0
 msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
-msgstr ""
+msgstr "อนุญาตให้ปรับแต่งเมลเซิฟเวอร์ขาเข้า และสร้างเป้าหมายจากเมลที่เข้ามา"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -38,7 +38,7 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #, python-format
 msgid "Lead"
-msgstr ""
+msgstr "ผู้นำ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -55,22 +55,27 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"คำเตือน มีเป้าหมายที่ไม่ได้ประมวลผลที่เก่ากว่า 5 วัน\n"
+"ชื่อ:\n"
+"ID:\n"
+"รายละเอียด:\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr ""
+msgstr "การกระทำ"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "ตั้งทีมในแผนกขาย"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "เลือกโอกาส"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -96,12 +101,12 @@ msgstr "ชื่อขั้นตอน"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "พนักงานขาย"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "วิเคราะห์เป้าหมาย"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -113,12 +118,12 @@ msgstr "วัน"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "ชื่อบริษัท"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "หลักสูตรอบรม"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -136,7 +141,7 @@ msgstr ""
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "ถ้าการตรวจสอบข้อความใหม่ให้ระบุความสนใจของคุณ"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -167,7 +172,7 @@ msgstr "แคมเปญ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "ค้นหาโอกาส"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
@@ -184,8 +189,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
@@ -228,12 +233,12 @@ msgstr ""
 #: view:crm.lead:0
 #: field:crm.lead,state_id:0
 msgid "State"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "ประชุม"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -253,14 +258,14 @@ msgstr "คำตอบไม่รวม :"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "รวมโอกาส"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr "การวิเคราะห์ Lead"
+msgstr "การวิเคราะห์เป้าหมาย"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:1010
@@ -294,10 +299,10 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "ไม่มีชื่อเรื่อง"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
@@ -330,7 +335,7 @@ msgstr ""
 #: field:crm.phonecall,partner_id:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr "ชื่อผู้ติดต่อ"
+msgstr "รายชื่อ"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
@@ -357,7 +362,7 @@ msgstr ""
 #. module: crm
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "เป้าหมายและโอกาส"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.relate_partner_opportunities
@@ -381,7 +386,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "ไม่สำเร็จ"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -389,7 +394,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "ข้อความที่ยังไม่ได้อ่าน"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -403,7 +408,7 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "เชื่อมโยงกับลูกค้าที่มีอยู่"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -413,7 +418,7 @@ msgstr "วันที่ปรับปรุง"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "หัวหน้าทีม"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -435,10 +440,10 @@ msgstr "ประเภท"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "โอกาส"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
@@ -479,12 +484,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 msgid "Create Opportunity"
-msgstr ""
+msgstr "สร้างโอกาส"
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -504,7 +509,7 @@ msgstr ""
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "เปลี่ยนแปลงสถานะ"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -521,12 +526,12 @@ msgstr "ไม่ได้ทำงานอยู่"
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "รายได้ตามแผน"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "เป้าหมายรายได้"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -560,7 +565,7 @@ msgstr "สรุป"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "รวม"
 
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
@@ -592,7 +597,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
@@ -609,7 +614,7 @@ msgstr ""
 #: view:crm.lead:0
 #: selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "กำลังดำเนินการ"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -640,7 +645,7 @@ msgstr ""
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr ""
+msgstr "เวลาทำงาน"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -651,7 +656,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "วิเคราะห์การใช้โทรศัพท์"
 
 #. module: crm
 #: view:crm.lead:0
@@ -667,17 +672,17 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "สกุลเงิน"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "รายได้ที่น่าจะเป็น"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "เดือนที่สร้าง"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -687,7 +692,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "คาดว่า"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -697,15 +702,15 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "การสร้างเป้าหมาย"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "แดชบอร์ดสถิติ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -716,37 +721,37 @@ msgstr ""
 #: field:res.partner,opportunity_count:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "โอกาส"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "โทรทัศน์"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "ตั้งค่าระบบงานขาย"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Stop Process"
-msgstr ""
+msgstr "หยุดการทำงาน"
 
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "ชื่อแทน"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "ค้นหาการโทรศัพท์"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -757,15 +762,15 @@ msgstr ""
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "ชนิดเหตุการณ์"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "พิเศษ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
 msgstr ""
@@ -773,7 +778,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -782,18 +787,18 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "หรือ"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "อ้างอิงที่ 2"
 
 #. module: crm
 #: help:crm.case.stage,section_ids:0
@@ -801,22 +806,24 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"เชื่อมโยงระหว่างสถานะและทีมขาย "
+"เมื่อตั้งแล้วจะจำกัดสถานะปัจจุบันสำหรับทีมขายที่เลือก"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "ความต้องการ"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "รหัสไปรษณีย์"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "การโทรศัพท์ที่ไม่ได้กำหนดใด ๆ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -829,17 +836,17 @@ msgstr ""
 #: model:process.node,name:crm.process_node_opportunities0
 #: view:res.partner:0
 msgid "Opportunities"
-msgstr ""
+msgstr "โอกาส"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "ประเภทบริษัทคู่ค้า"
 
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "อัตราการสำเสร็จ"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -849,12 +856,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "ขาออก"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "เราทำได้สำเร็จ"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
@@ -864,24 +871,24 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "เราไม่สามารถทำได้"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "โอกาสที่ยังเป็นฉบับร่าง"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "มีนาคม"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "ส่งอีเมล"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -892,18 +899,18 @@ msgstr "คำเตือน !"
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "วันที่จะเปิด"
 
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "มือถือ"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "อ้างอิง"
 
 #. module: crm
 #: view:crm.lead:0
@@ -923,17 +930,17 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,meeting_ids:0
 msgid "Meetings"
-msgstr ""
+msgstr "การประชุม"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
 #: field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "การกระทำต่อไป"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
 msgstr ""
@@ -943,22 +950,22 @@ msgstr ""
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ฉบับร่าง"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "การจำแนกคู่ค้า"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "แสดงโอกาสเท่านั้น"
 
 #. module: crm
 #: field:crm.lead,name:0
 msgid "Subject"
-msgstr ""
+msgstr "ชื่อเรื่อง"
 
 #. module: crm
 #: view:crm.lead:0
@@ -968,7 +975,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "แสดงทีมขาย"
 
 #. module: crm
 #: help:sale.config.settings,module_crm_claim:0
@@ -981,7 +988,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead6
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "ชนะ"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
@@ -991,7 +998,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "ฝ่ายขาย"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -999,7 +1006,7 @@ msgstr ""
 #: field:crm.lead.report,type:0
 #: view:crm.opportunity2phonecall:0
 msgid "Type"
-msgstr ""
+msgstr "ประเภท"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1012,7 +1019,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "ต่ำสุด"
 
 #. module: crm
 #: field:crm.lead,create_date:0
@@ -1020,18 +1027,18 @@ msgstr ""
 #: field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr ""
+msgstr "แปลงเป้าหมายเป็นโอกาสแล้ว"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "จำนวนที่สั่งซื้อ"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1045,22 +1052,22 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "การโทรที่ได้รับมอบหมาย"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "ผู้ใช้เข้าสู่ระบบ"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "การโทรที่ค้างอยู่"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1070,7 +1077,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "ขั้นตอน"
 
 #. module: crm
 #: help:sale.config.settings,module_crm_helpdesk:0
@@ -1082,12 +1089,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "ลบ"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "โอกาสได้ถูกสร้างแล้ว"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1099,7 +1106,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr ""
+msgstr "กันยายน"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -1127,7 +1134,7 @@ msgstr ""
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "การตั้งค่าในขั้นตอนนี้จะเปลี่ยนความน่าจะเป็นโดยอัตโนมัติเมื่อมีโอกาส"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1137,28 +1144,28 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "รูปแบบการชำระเงิน"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "วันที่เปิด"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "ระยะเวลา (นาที)"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "ช่องทาง"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "วันที่คาดว่าจะปิด"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1166,6 +1173,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"ถ้าเขตข้อมูลที่ใช้งานอยู่จะถูกกำหนดเป็นจริง "
+"จะทำให้คุณสามารถซ่อนทีมขายโดยไม่ลบออก"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1173,6 +1182,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"หากเลือกตัวเลือกนี้ ในขั้นตอนนี้จะได้รับการเสนอโดยเริ่มต้นในแต่ละทีมขาย "
+"มันจะไม่ได้กำหนดในขั้นตอนนี้ไปยังทีมงานที่มีอยู่"
 
 #. module: crm
 #: help:crm.case.stage,type:0
@@ -1185,7 +1196,7 @@ msgstr ""
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "เป้าหมายถูกสร้างแล้ว"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1197,29 +1208,31 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "สถานะการทำงาน"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "บันทึกการโทร"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "วันที่จะปิด"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
-msgstr ""
+msgstr "ไม่มีข้อมูล"
 
 #. module: crm
 #: field:crm.case.section,message_is_follower:0
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "เป็นผู้ติดตาม"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1227,28 +1240,28 @@ msgstr ""
 #: field:crm.phonecall,date:0
 #: field:crm.phonecall2phonecall,date:0
 msgid "Date"
-msgstr ""
+msgstr "วันที่"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "การสนับสนุนออนไลน์"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "ตัวกรองเพิ่มเติม"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "การโทรที่ปิดแล้ว"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "ค้นหา"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -1262,12 +1275,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "ฝ่ายขายและการตลาด"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "วันที่โทร"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1293,45 +1306,45 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "โอกาสที่รวมแล้ว"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "ให้คำปรึกษา"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "รหัส"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "คุณสมบัติ"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "ทีมลูก"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "การโทรที่เป็นฉบับร่างและเปิด"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "พนักงานขาย"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr ""
+msgstr "อ้างอิง"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -1341,7 +1354,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1351,7 +1364,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "ข้อมูล"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1361,36 +1374,36 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "สิ่งที่จะทำ"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "โอกาสที่พลาด"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2opportunity.partner.mass,action:0
 #: field:crm.partner.binding,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "ลูกค้าที่เกี่ยวข้อง"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "อื่น ๆ"
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "เป้าหมาย / โอกาส"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "รวมเป้าหมาย / โอกาส"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -1400,7 +1413,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "ประเภทการโทร"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1410,12 +1423,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "ผู้ใช้งาน"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "สถานะเปลี่ยนแปลง"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -1431,18 +1444,18 @@ msgstr ""
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "บันทึกการโทร"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "ยอดขาย"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "การโทรศัพท์"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1459,7 +1472,7 @@ msgstr ""
 #: field:crm.payment.mode,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1470,7 +1483,7 @@ msgstr ""
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "วันปิด"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1482,18 +1495,18 @@ msgstr ""
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "ข้อความและประวัติการติดต่อ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "แสดงประเทศ"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "การสร้าง"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1501,7 +1514,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "สูง"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1529,7 +1542,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "จัดกลุ่มตาม..."
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -1598,7 +1611,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "บริการ"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1606,7 +1619,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "สูงสุด"
 
 #. module: crm
 #: help:crm.lead.report,creation_year:0
@@ -1617,12 +1630,12 @@ msgstr ""
 #: view:crm.case.section:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "บันทึก"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr ""
+msgstr "มูลค่า"
 
 #. module: crm
 #: field:crm.lead,partner_name:0
@@ -1632,12 +1645,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "ตอบกลับไปยัง"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "แสดงผล"
 
 #. module: crm
 #: view:board.board:0
@@ -1655,7 +1668,7 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "ช่อง"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1663,12 +1676,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Held"
-msgstr ""
+msgstr "ถูกพักรอแล้ว"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr ""
+msgstr "ข้อมูลเพิ่มเติม"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1678,7 +1691,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "แก้ไข..."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1699,7 +1712,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "ความสำคัญ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -1732,7 +1745,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
@@ -1748,12 +1761,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "การขายทางโทรศัพท์"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "เป้าหมายที่ได้รับมอบหมาย"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1764,17 +1777,17 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "วันที่ตามแผน"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "รายได้ที่คาดหวัง"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "ที่อ้างถึง"
 
 #. module: crm
 #: help:crm.lead,type:0
@@ -1787,29 +1800,29 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "กรกฎาคม"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "เป้าหมาย / ลูกค้า"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "แผนกบริการ"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "แสดงเฉพาะเป้าหมาย"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "ทีมขาย"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
@@ -1819,7 +1832,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "ทีม"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1835,14 +1848,14 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "ความน่าจะเป็น"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "เดือน"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1850,18 +1863,18 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "เป้าหมาย"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "รวมเป้าหมาย"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "ออกแบบ"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -1873,18 +1886,18 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
-msgstr ""
+msgstr "สิ่งที่จะทำ"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "เป้าหมายเป็นโอกาส"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "อีเมลของผู้ใช้"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1897,7 +1910,7 @@ msgstr ""
 #: field:crm.opportunity2phonecall,note:0
 #: field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "บันทึก"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1905,7 +1918,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "ต่ำ"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -1915,7 +1928,7 @@ msgstr ""
 #: selection:crm.lead.report,state:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "ปิดแล้ว"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1934,7 +1947,7 @@ msgstr ""
 #: selection:crm.lead.report,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "รอดำเนินการ"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -1947,18 +1960,17 @@ msgid "Global CC"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
 msgid "Phone Calls"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "ค้นหาตามสถานะ"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0
@@ -1973,7 +1985,7 @@ msgstr ""
 #: field:crm.phonecall,partner_phone:0
 #: field:crm.phonecall2phonecall,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "โทรศัพท์"
 
 #. module: crm
 #: field:crm.case.channel,active:0
@@ -1981,7 +1993,7 @@ msgstr ""
 #: field:crm.lead,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr ""
+msgstr "เปิดใช้งาน"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -1991,7 +2003,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Mail"
-msgstr ""
+msgstr "ส่งเมล์"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2008,7 +2020,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "ซอฟต์แวร์"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2025,51 +2037,51 @@ msgstr "การวิเคราะห์โอกาส"
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "เบ็ดเตล็ด"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "เปิด"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "จังหวัด"
 
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "ทั้งสองอย่าง"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "โทรแล้ว"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "รับผิดชอบ"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "ขายตรง"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "ผลิตภัณฑ์"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "ปีที่สร้าง"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -2086,7 +2098,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "ที่อยู่"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2103,7 +2115,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "ค้นหา"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2116,12 +2128,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "การโทรที่ได้ววางแผนไว้"
 
 #. module: crm
 #: field:crm.lead,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: help:crm.lead,type_id:0
@@ -2143,32 +2155,32 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "ทำงานต่อ"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "มอบหมายถึง"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "การกระทำล่าสุด"
 
 #. module: crm
 #: field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "ระยะเวลา"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2207,17 +2219,17 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "ป้ายโฆษณา"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "เป้าหมาย / โอกาส"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "แฟกซ์"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2227,12 +2239,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "บริษัท"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr ""
+msgstr "กำลังทำงานอยู่"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
@@ -2242,50 +2254,50 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "เป้าหมายที่ยังไม่ได้มีการมอบหมาย"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
 msgid "Opportunity won"
-msgstr ""
+msgstr "โอกาสสำเร็จแล้ว"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "ชื่อออปเจ็กต์"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "การโทรที่ได้รับมอบหมาย"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "คืนค่าเดิม"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "บริการหลังการขาย"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "ข้อความ"
 
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "ช่องทางการติดต่อ (จดหมาย,โดยตรง,โทรศัพท์,...)"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "สรุปการโทร"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2294,12 +2306,12 @@ msgstr ""
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ยกเลิกแล้ว"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "ดัชนีสี"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2318,33 +2330,33 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "สถานะที่เกี่ยวข้อง"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 msgid "Call Summary"
-msgstr ""
+msgstr "สรุปการโทร"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr ""
+msgstr "ผู้ปฏิบัติการ"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "แผน/บันทึกการโทร"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "เลือกเป้าหมาย / โอกาส"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "ยืนยันแล้ว"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner_binding
@@ -2359,17 +2371,17 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Confirm"
-msgstr ""
+msgstr "ยืนยัน"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "ข้อความที่ยังไม่ได้อ่าน"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "หัวข้อ"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2381,7 +2393,7 @@ msgstr ""
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "ผู้ติดตาม"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2404,14 +2416,14 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "สร้างเป้าหมายจากโทรศัพท์ที่เข้ามา"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "อีเมล"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -2420,19 +2432,19 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr ""
+msgstr "ช่องทาง"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr ""
+msgstr "แผนการโทร"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "ทีมขายของฉัน"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2446,12 +2458,12 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "สร้างโอกาสจากเป้าหมาย"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "อีเมลแคมเปญ - สินค้า"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2479,7 +2491,7 @@ msgstr ""
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "การคุยสาย"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2489,12 +2501,12 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "การโทรของฉัน"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Qualification"
-msgstr ""
+msgstr "คุณสมบัติ"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -2522,13 +2534,13 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "สิงหาคม"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_lost
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
 msgid "Opportunity Lost"
-msgstr ""
+msgstr "โอกาสที่ล้มเหลว"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2540,12 +2552,12 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr ""
+msgstr "ธันวาคม"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "วันที่โทร"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2566,7 +2578,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "ตารางเวลาการประชุม"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
@@ -2582,24 +2594,24 @@ msgstr ""
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "เปิดแล้ว"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "สมาชิกในทีม"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "ตาราง / บันทึกการโทร"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "ต้นทุนที่วางแผนไว้"
 
 #. module: crm
 #: help:crm.lead,date_deadline:0
@@ -2618,18 +2630,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "บันทึกการใช้โทรศัพท์"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_won
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
 msgid "Opportunity Won"
-msgstr ""
+msgstr "โอกาสสำเร็จแล้ว"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "เรื่องโดยทีมขาย"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2637,12 +2649,12 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "การประชุม"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "หมวดของเรื่อง"
 
 #. module: crm
 #: view:board.board:0
@@ -2655,17 +2667,17 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "ปกติ"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "ตำบล"
 
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "จัดการการสนับสนุน"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
@@ -2676,47 +2688,47 @@ msgstr ""
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ผู้ใช้"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "พฤศจิกายน"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "โอกาสโดยขั้นตอน"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr ""
+msgstr "มกราคม"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "สัญญา"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "โฆษณา Twitter"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "เป้าหมายรายได้"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2737,17 +2749,17 @@ msgstr ""
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "วางแผนการโทร"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Categorization"
-msgstr ""
+msgstr "การจัดประเภท"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
-msgstr ""
+msgstr "บันทึกการโทร"
 
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
@@ -2758,7 +2770,7 @@ msgstr ""
 #: field:crm.meeting,phonecall_id:0
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -2768,12 +2780,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "ที่"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -2782,19 +2794,19 @@ msgstr ""
 #: selection:crm.lead,state:0
 #: view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "ใหม่"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "ฟังก์ชั่น"
 
 #. module: crm
 #: field:crm.case.section,note:0
 #: field:crm.phonecall,description:0
 #: field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "รายละเอียด"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
@@ -2813,14 +2825,14 @@ msgstr ""
 #: field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "ทีมขาย"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "พฤษภาคม"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -2842,27 +2854,27 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "บันทึกภายใน"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "โอกาสใหม่"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "บังคับ / เพิ่มเติม"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "ที่อยู่"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "อ้างอิงโดย"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2872,35 +2884,35 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "ชั่วโมงทำงาน"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
 #: field:crm.partner.binding,partner_id:0
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "ลูกค้า"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "กุมภาพันธ์"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "วางแผนการประชุม"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead8
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "ไม่สำเร็จ"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -2914,7 +2926,7 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "ประเทศ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2922,7 +2934,7 @@ msgstr ""
 #: view:crm.lead2opportunity.partner.mass:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: help:crm.phonecall,email_from:0
@@ -2934,17 +2946,17 @@ msgstr "คนเหล่านี้จะได้รับอีเมล์
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "เมษายน"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "ชื่อแคมเปญ"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "ทำประวัติย่อ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -2954,7 +2966,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Negotiation"
-msgstr ""
+msgstr "กำลังเจรจา"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
@@ -2964,40 +2976,40 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "ลำดับ"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "ตัวแปรควบคุม"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Proposition"
-msgstr ""
+msgstr "ข้อเสนอ"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "ปี"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "ข่าวสาร"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "เปลี่ยนสถานะของโอกาสแล้ว"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 5dce358724e..9064502ba33 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-23 05:01+0000\n"
+"X-Launchpad-Export-Date: 2013-07-24 05:31+0000\n"
 "X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index 71dec202d52..d69d52029fc 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -8,13 +8,13 @@ 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: 2013-07-23 03:45+0000\n"
+"PO-Revision-Date: 2013-07-23 06:22+0000\n"
 "Last-Translator: fanvil <fanvil@hotmail.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: 2013-07-23 05:01+0000\n"
+"X-Launchpad-Export-Date: 2013-07-24 05:31+0000\n"
 "X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm_partner_assign
@@ -471,7 +471,7 @@ msgstr "子信息"
 #: field:crm.partner.report.assign,date_review:0
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
-msgstr ""
+msgstr "最新合作伙伴评论"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
@@ -481,17 +481,17 @@ msgstr "主题"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
-msgstr ""
+msgstr "内容"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "投票"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -501,13 +501,13 @@ msgstr "#商机"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
-msgstr ""
+msgstr "当前用户用 星号 提醒关联到这条消息"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
-msgstr ""
+msgstr "合作关系日期"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -661,7 +661,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
-msgstr ""
+msgstr "发票期间"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
@@ -682,7 +682,7 @@ msgstr "附件"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "消息记录名称"
 
 #. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
@@ -696,7 +696,7 @@ msgstr "序列"
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
-msgstr ""
+msgstr "无法连接地理信息服务器。请确保你的互联网链接畅通(%s)。"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -722,7 +722,7 @@ msgstr "开启"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
-msgstr ""
+msgstr "子类型"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -737,12 +737,12 @@ msgstr "当前的"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "线索/商机"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "已通知的合作伙伴"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -773,7 +773,7 @@ msgstr "可能收入"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "激活"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -784,12 +784,12 @@ msgstr "指定的业务伙伴"
 #. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
-msgstr ""
+msgstr "合作伙伴级别"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
-msgstr ""
+msgstr "当前用户有关联到这条消息的未读的提醒"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
@@ -815,7 +815,7 @@ msgstr "名称"
 #: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
 #: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
-msgstr ""
+msgstr "合作伙伴激活"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -872,7 +872,7 @@ msgstr "客户关系管理 线索报表"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "写作模式"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
diff --git a/addons/l10n_multilang/i18n/zh_CN.po b/addons/l10n_multilang/i18n/zh_CN.po
new file mode 100644
index 00000000000..bb1f5830977
--- /dev/null
+++ b/addons/l10n_multilang/i18n/zh_CN.po
@@ -0,0 +1,169 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2013-07-24 12:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2013-07-25 05:13+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "财务结构模板"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "该科目的代码，每家公司必须是唯一的！"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"配置错误！ \n"
+"上级科目必须是“视图”类型的科目！ "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "辅助核算类型"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "错误！您不能创建递归的科目模板。"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "分录序时薄"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "科目一览表模板"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "此说明必须是每个公司唯一的"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "错误！您不能创建递归的税编码。"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "科目"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "设置错误！所选币种应与默认科目共享。"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "科目模板"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "错误!您不能创建递归的科目"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"配置错误！\n"
+"对于内部类型是‘应收/应付’的会计科目，你需要选择结转方式是‘未核销’的科目类型。 "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "每个公司的日记账名称必须唯一！"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "辅助核算项目"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "每个公司的日记账代码必须唯一！"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "财务结构"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"配置错误！ \n"
+"您不能给 非“视图”类型的科目定义一个子科目。 "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "错误! 你不能创建递归的辅助核算项目"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "税编码模板"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "交流语言"

From 42e493e73efd603002feb92703a82f34c6bc6aea Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Jul 2013 12:07:49 +0200
Subject: [PATCH 190/197] Added Gruntfile with jshint and corrected most js
 errors

bzr revid: nicolas.vanhoren@openerp.com-20130725100749-0i82gf3k3nvt4r44
---
 .bzrignore                                    | 34 ++++++-------
 addons/web/Gruntfile.js                       | 22 +++++++++
 addons/web/package.json                       |  6 +++
 addons/web/static/src/js/chrome.js            |  2 +-
 addons/web/static/src/js/corelib.js           | 20 +++-----
 addons/web/static/src/js/coresetup.js         |  4 +-
 addons/web/static/src/js/data.js              |  4 +-
 addons/web/static/src/js/data_export.js       |  4 +-
 addons/web/static/src/js/formats.js           | 35 ++++++++++++-
 addons/web/static/src/js/pyeval.js            | 17 +++++--
 addons/web/static/src/js/search.js            | 22 ++++-----
 addons/web/static/src/js/view_form.js         | 49 ++++++++++---------
 addons/web/static/src/js/view_list.js         | 34 +++++++------
 .../web/static/src/js/view_list_editable.js   |  6 +--
 addons/web/static/src/js/views.js             | 13 +++--
 15 files changed, 164 insertions(+), 108 deletions(-)
 create mode 100644 addons/web/Gruntfile.js
 create mode 100644 addons/web/package.json

diff --git a/.bzrignore b/.bzrignore
index e7618c7b0ce..86a1881981f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,21 +1,15 @@
-.*.swp
-.bzrignore
-.idea
-.project
-.pydevproject
-.ropeproject
-.settings
-.DS_Store
-openerp/addons/*
-openerp/filestore*
-.Python
-*.pyc
-*.pyo
-bin/*
+.*
+*.egg-info
+*.orig
+*.vim
 build/
-include/
-lib/
-share/
-doc/_build/*
-win32/*.bat
-win32/meta.py
+RE:^bin/
+RE:^dist/
+RE:^include/
+
+RE:^share/
+RE:^man/
+RE:^lib/
+
+RE:^addons/\w+/doc/_build/
+RE:^.*?/node_modules
diff --git a/addons/web/Gruntfile.js b/addons/web/Gruntfile.js
new file mode 100644
index 00000000000..6561aecd3bd
--- /dev/null
+++ b/addons/web/Gruntfile.js
@@ -0,0 +1,22 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    jshint: {
+      files: ['static/src/**/*.js'],
+      options: {
+        sub: true, //[] instead of .
+        asi: true, //semicolons
+        evil: true, //eval
+        laxbreak: true, //unsafe line breaks
+        loopfunc: true, // functions in loops
+      },
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+
+  grunt.registerTask('test', ['jshint']);
+
+  grunt.registerTask('default', ['jshint']);
+
+};
\ No newline at end of file
diff --git a/addons/web/package.json b/addons/web/package.json
new file mode 100644
index 00000000000..f8dfc2879d6
--- /dev/null
+++ b/addons/web/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "grunt": "~0.4.1",
+    "grunt-contrib-jshint": "~0.6.0"
+  }
+}
\ No newline at end of file
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 89c44a9b7ed..5ecfb5a9943 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1108,7 +1108,7 @@ instance.web.Menu =  instance.web.Widget.extend({
                     add_menu_ids(menu);
                 });
             }
-        };
+        }
         add_menu_ids(menu);
         self.do_load_needaction(menu_ids).then(function () {
             self.trigger("need_action_reloaded");
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 58c2969bb20..a8846018e3e 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -73,7 +73,7 @@ openerp.web.corelib = function(instance) {
  */
 (function() {
     var initializing = false,
-        fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
+        fnTest = /xyz/.test(function(){xyz();}) ? /\b_super\b/ : /.*/;
     // The web Class implementation (does nothing)
     instance.web.Class = function(){};
 
@@ -123,7 +123,6 @@ openerp.web.corelib = function(instance) {
         function Class() {
             if(this.constructor !== instance.web.Class){
                 throw new Error("You can only instanciate objects with the 'new' operator");
-                return null;
             }
             // All construction is actually done in the init method
             if (!initializing && this.init) {
@@ -297,7 +296,7 @@ var Events = instance.web.Class.extend({
         var ev;
         events = events.split(/\s+/);
         var calls = this._callbacks || (this._callbacks = {});
-        while (ev = events.shift()) {
+        while ((ev = events.shift())) {
             var list = calls[ev] || (calls[ev] = {});
             var tail = list.tail || (list.tail = list.next = {});
             tail.callback = callback;
@@ -311,9 +310,9 @@ var Events = instance.web.Class.extend({
         var ev, calls, node;
         if (!events) {
             delete this._callbacks;
-        } else if (calls = this._callbacks) {
+        } else if ((calls = this._callbacks)) {
             events = events.split(/\s+/);
-            while (ev = events.shift()) {
+            while ((ev = events.shift())) {
                 node = calls[ev];
                 delete calls[ev];
                 if (!callback || !node)
@@ -347,7 +346,7 @@ var Events = instance.web.Class.extend({
         all = calls['all'];
         (events = events.split(/\s+/)).push(null);
         // Save references to the current heads & tails.
-        while (event = events.shift()) {
+        while ((event = events.shift())) {
             if (all)
                 events.push({
                     next : all.next,
@@ -362,7 +361,7 @@ var Events = instance.web.Class.extend({
             });
         }
         rest = Array.prototype.slice.call(arguments, 1);
-        while (node = events.pop()) {
+        while ((node = events.pop())) {
             tail = node.tail;
             args = node.event ? [ node.event ].concat(rest) : rest;
             while ((node = node.next) !== tail) {
@@ -692,11 +691,6 @@ instance.web.Widget = instance.web.Controller.extend({
         insertion(target);
         return this.start();
     },
-    /**
-     * This is the method to implement to render the Widget.
-     */
-    renderElement: function() {
-    },
     /**
      * Method called after rendering. Mostly used to bind actions, perform asynchronous
      * calls, etc...
@@ -966,7 +960,7 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, {
     init: function() {
         instance.web.PropertiesMixin.init.call(this);
         this.server = null;
-        this.debug = ($.deparam($.param.querystring()).debug != undefined);
+        this.debug = ($.deparam($.param.querystring()).debug !== undefined);
         this.override_session = false;
         this.session_id = undefined;
     },
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index c9c6f82a98d..b3adea81a60 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -250,7 +250,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
                 continue;
             instance[mod] = {};
             // init module mod
-            if(instance._openerp[mod] != undefined) {
+            if(instance._openerp[mod] !== undefined) {
                 instance._openerp[mod](instance,instance[mod]);
                 this.module_loaded[mod] = true;
             }
@@ -585,7 +585,7 @@ instance.web.qweb.preprocess_node = function() {
         case Node.ELEMENT_NODE:
             // Element
             var attr, attrs = ['label', 'title', 'alt', 'placeholder'];
-            while (attr = attrs.pop()) {
+            while ((attr = attrs.pop())) {
                 if (this.attributes[attr]) {
                     this.attributes[attr] = instance.web._t(this.attributes[attr]);
                 }
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 679afe77bcd..79ec160eb70 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -100,7 +100,7 @@ instance.web.Query = instance.web.Class.extend({
      * @returns {jQuery.Deferred<Number>}
      */
     count: function () {
-        if (this._count != undefined) { return $.when(this._count); }
+        if (this._count !== undefined) { return $.when(this._count); }
         return this._model.call(
             'search_count', [this._filter], {
                 context: this._model.context(this._context)});
@@ -747,7 +747,7 @@ instance.web.DataSetSearch =  instance.web.DataSet.extend({
         });
     },
     size: function () {
-        if (this._length != null) {
+        if (this._length !== null) {
             return this._length;
         }
         return this._super();
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index fb5e391effd..7a390d0819f 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -93,7 +93,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
                 self.$el.find('#fields_list option').remove();
                 var export_id = self.$el.find('#saved_export_list option:selected').val();
                 if (export_id) {
-                    self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}).done(self.do_load_export_field);
+                    self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id, 10)}).done(self.do_load_export_field);
                 }
             });
             self.$el.find('#delete_export_list').click(function() {
@@ -215,7 +215,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
             self.$el.find("tr[id='treerow-" + record.id + "']").click(function(e) {
                 if (e.shiftKey) {
                     var frst_click, scnd_click = '';
-                    if (self.row_index == 0) {
+                    if (self.row_index === 0) {
                         self.row_index = this.rowIndex;
                         frst_click = self.$el.find("tr[id^='treerow-']")[self.row_index-1];
                         $(frst_click).addClass("ui-selected");
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 851b60af229..f4df990675c 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -141,6 +141,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
                 return '';
             }
             console.warn('Field', descriptor, 'had an empty string as value, treating as false...');
+            return value_if_empty === undefined ?  '' : value_if_empty;
         case false:
         case Infinity:
         case -Infinity:
@@ -219,9 +220,9 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
         case "":
             return value_if_empty === undefined ?  false : value_if_empty;
     }
+    var tmp;
     switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'integer':
-            var tmp;
             do {
                 tmp = value;
                 value = value.replace(instance.web._t.database.parameters.thousands_sep, "");
@@ -231,7 +232,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
                 throw new Error(_.str.sprintf(_t("'%s' is not a correct integer"), value));
             return tmp;
         case 'float':
-            var tmp = Number(value);
+            tmp = Number(value);
             if (!isNaN(tmp))
                 return tmp;
 
@@ -314,4 +315,34 @@ instance.web.auto_date_to_str = function(value, type) {
     }
 };
 
+/**
+ * performs a half up rounding with arbitrary precision, correcting for float loss of precision
+ * See the corresponding float_round() in server/tools/float_utils.py for more info
+ * @param {Number} the value to be rounded
+ * @param {Number} a non zero precision parameter. eg: 0.01 rounds to two digits.
+ */
+instance.web.round_precision = function(value, precision){
+    if(!value){
+        return 0;
+    }else if(!precision){
+        throw new Error('round_precision(...):  Cannot round value: '+value+' with a precision of zero (or undefined)');
+    }
+    var normalized_value = value / precision;
+    var epsilon_magnitude = Math.log(Math.abs(normalized_value))/Math.log(2);
+    var epsilon = Math.pow(2, epsilon_magnitude - 53);
+    normalized_value += normalized_value >= 0 ? epsilon : -epsilon;
+    var rounded_value = Math.round(normalized_value);
+    return rounded_value * precision;
+};
+
+/**
+ * performs a half up rounding with a fixed amount of decimals, correcting for float loss of precision
+ * See the corresponding float_round() in server/tools/float_utils.py for more info
+ * @param {Number} the value to be rounded
+ * @param {Number} the number of decimals. eg: round_decimals(3.141592,2) -> 3.14
+ */
+instance.web.round_decimals = function(value, decimals){
+    return instance.web.round_precision(value, Math.pow(10,-decimals));
+};
+
 };
diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index 6ce85f8d4a3..02d828001c0 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -795,11 +795,18 @@ openerp.web.pyeval = function (instance) {
 
         //noinspection FallthroughInSwitchStatementJS
         switch(type) {
-        case 'context': object = [object];
-        case 'contexts': return eval_contexts((options.no_user_context ? [] : [instance.session.user_context]).concat(object), context);
-        case 'domain': object = [object];
-        case 'domains': return eval_domains(object, context);
-        case 'groupbys': return eval_groupbys(object, context);
+        case 'context':
+        case 'contexts':
+            if (type === 'context')
+                object = [object];
+            return eval_contexts((options.no_user_context ? [] : [instance.session.user_context]).concat(object), context);
+        case 'domain':
+        case 'domains':
+            if (type === 'domain')
+                object = [object];
+            return eval_domains(object, context);
+        case 'groupbys':
+            return eval_groupbys(object, context);
         }
         throw new Error("Unknow evaluation type " + type)
     };
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 5d06d75573f..12e1c2bc0ec 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -65,7 +65,7 @@ my.SearchQuery = B.Collection.extend({
         }, this);
     },
     add: function (values, options) {
-        options || (options = {});
+        options = options || {};
         if (!(values instanceof Array)) {
             values = [values];
         }
@@ -85,7 +85,7 @@ my.SearchQuery = B.Collection.extend({
         return this;
     },
     toggle: function (value, options) {
-        options || (options = {});
+        options = options || {};
 
         var facet = this.detect(function (facet) {
             return facet.get('category') === value.category
@@ -1107,7 +1107,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
 
         if (!contexts.length) { return; }
         if (contexts.length === 1) { return contexts[0]; }
-        return _.extend(new instance.web.CompoundContext, {
+        return _.extend(new instance.web.CompoundContext(), {
             __contexts: contexts
         });
     },
@@ -1276,7 +1276,7 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
 
         if (contexts.length === 1) { return contexts[0]; }
 
-        return _.extend(new instance.web.CompoundContext, {
+        return _.extend(new instance.web.CompoundContext(), {
             __contexts: contexts
         });
     },
@@ -1321,7 +1321,7 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc
             domains.unshift(['|']);
         }
 
-        return _.extend(new instance.web.CompoundDomain, {
+        return _.extend(new instance.web.CompoundDomain(), {
             __domains: domains
         });
     }
@@ -1919,7 +1919,7 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @
     },
     changed: function() {
         var nval = this.$(".searchview_extended_prop_field").val();
-        if(this.attrs.selected == null || nval != this.attrs.selected.name) {
+        if(this.attrs.selected === null || this.attrs.selected === undefined || nval != this.attrs.selected.name) {
             this.select_field(_.detect(this.fields, function(x) {return x.name == nval;}));
         }
     },
@@ -1941,13 +1941,13 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @
      */
     select_field: function(field) {
         var self = this;
-        if(this.attrs.selected != null) {
+        if(this.attrs.selected !== null && this.attrs.selected !== undefined) {
             this.value.destroy();
             this.value = null;
             this.$('.searchview_extended_prop_op').html('');
         }
         this.attrs.selected = field;
-        if(field == null) {
+        if(field === null || field === undefined) {
             return;
         }
 
@@ -1967,7 +1967,7 @@ instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @
 
     },
     get_proposition: function() {
-        if ( this.attrs.selected == null)
+        if (this.attrs.selected === null || this.attrs.selected === undefined)
             return null;
         var field = this.attrs.selected;
         var op_select = this.$('.searchview_extended_prop_op')[0];
@@ -2097,7 +2097,7 @@ instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.Exte
     get_value: function() {
         try {
             var val =this.$el.val();
-            return instance.web.parse_value(val == "" ? 0 : val, {'widget': 'integer'});
+            return instance.web.parse_value(val === "" ? 0 : val, {'widget': 'integer'});
         } catch (e) {
             return "";
         }
@@ -2124,7 +2124,7 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend
     get_value: function() {
         try {
             var val =this.$el.val();
-            return instance.web.parse_value(val == "" ? 0.0 : val, {'widget': 'float'});
+            return instance.web.parse_value(val === "" ? 0.0 : val, {'widget': 'float'});
         } catch (e) {
             return "";
         }
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index d2f55c0901e..0f33de0814e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -346,7 +346,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             self.on_form_changed();
             self.rendering_engine.init_fields();
             self.is_initialized.resolve();
-            self.do_update_pager(record.id == null);
+            self.do_update_pager(record.id === null || record.id === undefined);
             if (self.sidebar) {
                self.sidebar.do_attachement_update(self.dataset, self.datarecord.id);
             }
@@ -465,7 +465,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             // form field
             if (self.fields[field]) {
                 var value_ = self.fields[field].get_value();
-                return value_ == null ? false : value_;
+                return value_ === null || value_ === undefined ? false : value_;
             }
             // parent field
             var splitted = field.split('.');
@@ -475,7 +475,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 }
                 var p_val = parent_fields[_.str.trim(splitted[1])];
                 if (p_val !== undefined) {
-                    return p_val == null ? false : p_val;
+                    return p_val === null || p_val === undefined ? false : p_val;
                 }
             }
             // string literal
@@ -621,7 +621,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     }
                     return $.when();
                 });
-            };
+            }
             return iterate();
         });
     },
@@ -943,11 +943,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
     reload: function() {
         var self = this;
         return this.reload_mutex.exec(function() {
-            if (self.dataset.index == null) {
+            if (self.dataset.index === null || self.dataset.index === undefined) {
                 self.trigger("previous_view");
                 return $.Deferred().reject().promise();
             }
-            if (self.dataset.index == null || self.dataset.index < 0) {
+            if (self.dataset.index < 0) {
                 return $.when(self.on_button_new());
             } else {
                 var fields = _.keys(self.fields_view.fields);
@@ -1714,7 +1714,7 @@ instance.web.form.compute_domain = function(expr, fields) {
 };
 
 instance.web.form.is_bin_size = function(v) {
-    return /^\d+(\.\d*)? \w+$/.test(v);
+    return (/^\d+(\.\d*)? \w+$/).test(v);
 };
 
 /**
@@ -2642,7 +2642,7 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
         if (! this.get("effective_readonly")) {
             var show_value = instance.web.format_value(this.get('value'), this, '');
             if (show_value === '') {
-                this.$textarea.css('height', parseInt(this.default_height)+"px");
+                this.$textarea.css('height', parseInt(this.default_height, 10)+"px");
             }
             this.$textarea.val(show_value);
             if (! this.auto_sized) {
@@ -3265,7 +3265,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.$input.keydown(input_changed);
         this.$input.change(input_changed);
         this.$drop_down.click(function() {
-        	self.$input.focus();
+            self.$input.focus();
             if (self.$input.autocomplete("widget").is(":visible")) {
                 self.$input.autocomplete("close");                
             } else {
@@ -3740,7 +3740,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     },
     reload_current_view: function() {
         var self = this;
-        return self.is_loaded = self.is_loaded.then(function() {
+        self.is_loaded = self.is_loaded.then(function() {
             var active_view = self.viewmanager.active_view;
             var view = self.viewmanager.views[active_view].controller;
             if(active_view === "list") {
@@ -3758,13 +3758,15 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 return view.do_search(self.build_domain(), self.dataset.get_context(), []);
             }
         }, undefined);
+        return self.is_loaded;
     },
     set_value: function(value_) {
         value_ = value_ || [];
         var self = this;
         this.dataset.reset_ids([]);
+        var ids;
         if(value_.length >= 1 && value_[0] instanceof Array) {
-            var ids = [];
+            ids = [];
             _.each(value_, function(command) {
                 var obj = {values: command[2]};
                 switch (command[0]) {
@@ -3795,7 +3797,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             this._super(ids);
             this.dataset.set_ids(ids);
         } else if (value_.length >= 1 && typeof(value_[0]) === "object") {
-            var ids = [];
+            ids = [];
             this.dataset.delete_all = true;
             _.each(value_, function(command) {
                 var obj = {values: command};
@@ -3850,7 +3852,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             this.viewmanager.views[this.viewmanager.active_view].controller) {
             var view = this.viewmanager.views[this.viewmanager.active_view].controller;
             if (this.viewmanager.active_view === "form") {
-                if (!view.is_initialized.state() === 'resolved') {
+                if (view.is_initialized.state() !== 'resolved') {
                     return $.when(false);
                 }
                 return $.when(view.save());
@@ -3870,7 +3872,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                 .invoke('is_valid')
                 .all(_.identity)
                 .value();
-            break;
         case 'list':
             return view.is_valid();
         }
@@ -4256,7 +4257,7 @@ instance.web.form.FieldMany2ManyTags = instance.web.form.AbstractField.extend(in
                 },
                 core: {
                     onSetInputData: function(e, data) {
-                        if (data == '') {
+                        if (data === '') {
                             this._plugins.autocomplete._suggestions = null;
                         }
                         this.input().val(data);
@@ -4578,8 +4579,9 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
         if (type !== "form")
             return;
         var self = this;
+        var pop;
         if (this.dataset.index === null) {
-            var pop = new instance.web.form.SelectCreatePopup(this);
+            pop = new instance.web.form.SelectCreatePopup(this);
             pop.select_element(
                 this.field.relation,
                 {
@@ -4599,7 +4601,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
             });
         } else {
             var id = self.dataset.ids[self.dataset.index];
-            var pop = new instance.web.form.FormOpenPopup(this);
+            pop = new instance.web.form.FormOpenPopup(this);
             pop.show_element(self.field.relation, id, self.build_context(), {
                 title: _t("Open: ") + self.string,
                 write_function: function(id, data, options) {
@@ -4935,7 +4937,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
                     self.select_elements(self.selected_ids);
                     self.destroy();
                 });
-                var $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-create");
+                $cbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-create");
                 $cbutton.click(function() {
                     self.new_object();
                 });
@@ -5190,18 +5192,18 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         }
     },
     render_value: function() {
+        var show_value;
         if (!this.get("effective_readonly")) {
-            var show_value;
             if (this.node.attrs.filename) {
                 show_value = this.view.datarecord[this.node.attrs.filename] || '';
             } else {
-                show_value = (this.get('value') != null && this.get('value') !== false) ? this.get('value') : '';
+                show_value = (this.get('value') !== null && this.get('value') !== undefined && this.get('value') !== false) ? this.get('value') : '';
             }
             this.$el.find('input').eq(0).val(show_value);
         } else {
             this.$el.find('a').toggle(!!this.get('value'));
             if (this.get('value')) {
-                var show_value = _t("Download")
+                show_value = _t("Download")
                 if (this.view)
                     show_value += " " + (this.view.datarecord[this.node.attrs.filename] || '');
                 this.$el.find('a').text(show_value);
@@ -5553,11 +5555,12 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     on_click_stage: function (ev) {
         var self = this;
         var $li = $(ev.currentTarget);
+        var val;
         if (this.field.type == "many2one") {
-            var val = parseInt($li.data("id"));
+            val = parseInt($li.data("id"), 10);
         }
         else {
-            var val = $li.data("id");
+            val = $li.data("id");
         }
         if (val != self.get('value')) {
             this.view.recursive_save().done(function() {
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 4f58b002328..991f4db6852 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -171,11 +171,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
             current_date: new Date().toString('yyyy-MM-dd')
             // TODO: time, datetime, relativedelta
         });
-
+        var i;
+        var pair;
+        var expression;
         if (this.fonts) {
-            for(var i=0, len=this.fonts.length; i<len; ++i) {
-                var pair = this.fonts[i],
-                font = pair[0],
+            for(i=0, len=this.fonts.length; i<len; ++i) {
+                pair = this.fonts[i];
+                var font = pair[0];
                 expression = pair[1];
                 if (py.evaluate(expression, context).toJSON()) {
                     switch(font) {
@@ -194,10 +196,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         }
 
         if (!this.colors) { return style; }
-        for(var i=0, len=this.colors.length; i<len; ++i) {
-            var pair = this.colors[i],
-                color = pair[0],
-                expression = pair[1];
+        for(i=0, len=this.colors.length; i<len; ++i) {
+            pair = this.colors[i];
+            var color = pair[0];
+            expression = pair[1];
             if (py.evaluate(expression, context).toJSON()) {
                 return style += 'color: ' + color + ';';
             }
@@ -394,7 +396,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
 
         var total = dataset.size();
         var limit = this.limit() || total;
-        if (total == 0)
+        if (total === 0)
             this.$pager.hide();
         else
             this.$pager.css("display", "");
@@ -454,7 +456,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      * @param {String} [view="page"] the view type to switch to
      */
     select_record:function (index, view) {
-        view = view || index == null ? 'form' : 'form';
+        view = view || index === null || index === undefined ? 'form' : 'form';
         this.dataset.index = index;
         _.delay(_.bind(function () {
             this.do_switch_view(view);
@@ -503,7 +505,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         var reloaded = $.Deferred();
         this.$el.find('.oe_list_content').append(
             this.groups.render(function () {
-                if (self.dataset.index == null && self.records.length ||
+                if ((self.dataset.index === null || self.dataset.index === undefined) && self.records.length ||
                     self.dataset.index >= self.records.length) {
                         self.dataset.index = 0;
                 }
@@ -1517,7 +1519,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     // if drag to 1st row (to = 0), start sequencing from 0
                     // (exclusive lower bound)
                     seq = to ? list.records.at(to - 1).get(seqname) : 0;
-                while (++seq, record = list.records.at(index++)) {
+                while (++seq, (record = list.records.at(index++))) {
                     // write are independent from one another, so we can just
                     // launch them all at the same time and we don't really
                     // give a fig about when they're done
@@ -1825,7 +1827,7 @@ var Collection = instance.web.Class.extend(/** @lends Collection# */{
             var instance_ = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
             instance_.bind(null, this._onRecordEvent);
             this._byId[instance_.get('id')] = instance_;
-            if (options.at == undefined) {
+            if (options.at === undefined || options.at === null) {
                 this.records.push(instance_);
                 if (!options.silent) {
                     this.trigger('add', this, instance_, this.records.length-1);
@@ -1867,7 +1869,8 @@ var Collection = instance.web.Class.extend(/** @lends Collection# */{
         if (!_(this._proxies).isEmpty()) {
             var record = null;
             _(this._proxies).detect(function (proxy) {
-                return record = proxy.get(id);
+                record = proxy.get(id);
+                return record;
             });
             return record;
         }
@@ -1881,10 +1884,11 @@ var Collection = instance.web.Class.extend(/** @lends Collection# */{
      * @returns {Collection}
      */
     proxy: function (section) {
-        return this._proxies[section] = new Collection(null, {
+        this._proxies[section] = new Collection(null, {
             parent: this,
             key: section
         }).bind(null, this._onRecordEvent);
+        return this._proxies[section];
     },
     /**
      * @param {Array} [records]
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 512fc4ff373..1a06720a274 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -515,10 +515,6 @@ openerp.web.list_editable = function (instance) {
                 };
             } else if (document.body.createTextRange) {
                 throw new Error("Implement text range handling for MSIE");
-                var sel = document.body.createTextRange();
-                if (sel.parentElement() === el) {
-
-                }
             }
             // Element without selection ranges (select, div/@contenteditable)
             return null;
@@ -697,7 +693,7 @@ openerp.web.list_editable = function (instance) {
                 throw new Error("Editor delegate's #edition_view must have a" +
                                 " non-empty arch")
             }
-            if (!(arch.tag === "form")) {
+            if (arch.tag !== "form") {
                 throw new Error("Editor delegate's #edition_view must have a" +
                                 " 'form' root node");
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 48a108b2f01..fc67c7da24d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -49,7 +49,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
         if (last) {
             last.hide();
         }
-        var item = _.extend({
+        item = _.extend({
             show: function(index) {
                 this.widget.$el.show();
             },
@@ -423,7 +423,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
 
         if (!(ClientWidget.prototype instanceof instance.web.Widget)) {
             var next;
-            if (next = ClientWidget(this, action)) {
+            if ((next = ClientWidget(this, action))) {
                 return this.do_action(next, options);
             }
             return $.when();
@@ -677,7 +677,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         this.$el.find('.oe_view_title_text:first').text(title);
     },
     add_breadcrumb: function(options) {
-        var options = options || {};
+        options = options || {};
         var self = this;
         var views = [this.active_view || this.views_src[0].view_type];
         this.on('switch_mode', self, function(mode) {
@@ -958,7 +958,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
                     view_type : 'list',
                     view_mode : 'list'
                 });
-                break;
             case 'edit':
                 this.do_edit_resource($option.data('model'), $option.data('id'), { name : $option.text() });
                 break;
@@ -1000,7 +999,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
         evt.currentTarget.selectedIndex = 0;
     },
     do_edit_resource: function(model, id, action) {
-        var action = _.extend({
+        action = _.extend({
             res_model : model,
             res_id : id,
             type : 'ir.actions.act_window',
@@ -1038,7 +1037,7 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
     },
     get_action_manager: function() {
         var cur = this;
-        while (cur = cur.getParent()) {
+        while ((cur = cur.getParent())) {
             if (cur instanceof instance.web.ActionManager) {
                 return cur;
             }
@@ -1176,7 +1175,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
         var self = this;
         self.getParent().sidebar_eval_context().done(function (sidebar_eval_context) {
             var ids = self.getParent().get_selected_ids();
-            if (ids.length == 0) {
+            if (ids.length === 0) {
                 instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
                 return false;
             }

From c767a0d34c3bb451246e2d546f6c602aae50d245 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Jul 2013 12:33:01 +0200
Subject: [PATCH 191/197] Added semicolons

bzr revid: nicolas.vanhoren@openerp.com-20130725103301-65nld10p1if7k0zt
---
 addons/web/Gruntfile.js                       |  1 -
 addons/web/static/src/js/chrome.js            |  8 +--
 addons/web/static/src/js/corelib.js           | 10 ++--
 addons/web/static/src/js/coresetup.js         | 16 +++---
 addons/web/static/src/js/data.js              | 10 ++--
 addons/web/static/src/js/data_export.js       |  2 +-
 addons/web/static/src/js/formats.js           |  2 +-
 addons/web/static/src/js/pyeval.js            | 22 ++++----
 addons/web/static/src/js/search.js            | 16 +++---
 addons/web/static/src/js/test_support.js      |  2 +-
 addons/web/static/src/js/testing.js           |  6 +--
 addons/web/static/src/js/view_form.js         | 51 ++++++++++---------
 addons/web/static/src/js/view_list.js         | 14 ++---
 .../web/static/src/js/view_list_editable.js   |  8 +--
 addons/web/static/src/js/views.js             | 19 +++----
 15 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/addons/web/Gruntfile.js b/addons/web/Gruntfile.js
index 6561aecd3bd..372feb2d9c0 100644
--- a/addons/web/Gruntfile.js
+++ b/addons/web/Gruntfile.js
@@ -5,7 +5,6 @@ module.exports = function(grunt) {
       files: ['static/src/**/*.js'],
       options: {
         sub: true, //[] instead of .
-        asi: true, //semicolons
         evil: true, //eval
         laxbreak: true, //unsafe line breaks
         loopfunc: true, // functions in loops
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 5ecfb5a9943..3c8e1e0956a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -438,7 +438,7 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
         self.$el.html(QWeb.render("DatabaseManager", { widget : self }));
         $('.oe_user_menu_placeholder').append(QWeb.render("DatabaseManager.user_menu",{ widget : self }));
         $('.oe_secondary_menus_container').append(QWeb.render("DatabaseManager.menu",{ widget : self }));
-        $('ul.oe_secondary_submenu > li:first').addClass('oe_active')
+        $('ul.oe_secondary_submenu > li:first').addClass('oe_active');
         $('ul.oe_secondary_submenu > li').bind('click', function (event) {
             var menuitem = $(this);
             menuitem.addClass('oe_active').siblings().removeClass('oe_active');
@@ -869,7 +869,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
         $button.appendTo(this.getParent().$buttons);
         $button.eq(2).click(function(){
            self.getParent().close();
-        })
+        });
         $button.eq(0).click(function(){
           self.rpc("/web/session/change_password",{
                'fields': $("form[name=change_password_form]").serializeArray()
@@ -881,7 +881,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
                    instance.webclient.on_logout();
                }
           });
-       })
+       });
     },
     display_error: function (error) {
         return instance.web.dialog($('<div>'), {
@@ -892,7 +892,7 @@ instance.web.ChangePassword =  instance.web.Widget.extend({
             ]
         }).html(error.error);
     },
-})
+});
 instance.web.client_actions.add("change_password", "instance.web.ChangePassword");
 
 instance.web.Menu =  instance.web.Widget.extend({
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index a8846018e3e..07874f763af 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -145,7 +145,7 @@ openerp.web.corelib = function(instance) {
                             var ret = fn.apply(this, arguments);
                             this._super = tmp;
                             return ret;
-                        }
+                        };
                     })(name, properties[name], prototype[name]);
                 } else if (typeof _super[name] === 'function') {
                     prototype[name] = (function (name, fn) {
@@ -155,7 +155,7 @@ openerp.web.corelib = function(instance) {
                             var ret = fn.apply(this, arguments);
                             this._super = tmp;
                             return ret;
-                        }
+                        };
                     })(name, properties[name]);
                 }
             }
@@ -503,7 +503,7 @@ instance.web.Controller = instance.web.Class.extend(instance.web.PropertiesMixin
         return function () {
             var fn = (typeof method === 'string') ? self[method] : method;
             return fn.apply(self, arguments);
-        }
+        };
     },
     /**
      * Informs the action manager to do an action. This supposes that
@@ -883,7 +883,7 @@ instance.web.Registry = instance.web.Class.extend({
     contains: function (key) {
         if (key === undefined) { return false; }
         if (key in this.map) {
-            return true
+            return true;
         }
         if (this.parent) {
             return this.parent.contains(key);
@@ -1148,6 +1148,6 @@ instance.web.py_eval = function(expr, context) {
     return py.eval(expr, _.extend({}, context || {}, {"true": true, "false": false, "null": null}));
 };
 
-}
+};
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index b3adea81a60..8eea24345d2 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -88,7 +88,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
             this.session_id = this.get_cookie('session_id');
         }
         return def.then(function() {
-            return self.rpc("/web/session/get_session_info", {})
+            return self.rpc("/web/session/get_session_info", {});
         }).then(function(result) {
             // If immediately follows a login (triggered by trying to restore
             // an invalid session or no session at all), refresh session data
@@ -343,7 +343,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
                     $input = $('<input type="hidden" name="' + key + '">')
                         .appendTo($form_data);
                 }
-                $input.val(value)
+                $input.val(value);
             });
 
         $form
@@ -404,7 +404,7 @@ instance.web.Bus = instance.web.Class.extend(instance.web.EventDispatcherMixin,
             });
         });
     }
-})
+});
 instance.web.bus = new instance.web.Bus();
 
 /** OpenERP Translations */
@@ -466,12 +466,12 @@ $.fn.getAttributes = function() {
     var o = {};
     if (this.length) {
         for (var attr, i = 0, attrs = this[0].attributes, l = attrs.length; i < l; i++) {
-            attr = attrs.item(i)
+            attr = attrs.item(i);
             o[attr.nodeName] = attr.nodeValue;
         }
     }
     return o;
-}
+};
 $.fn.openerpClass = function(additionalClass) {
     // This plugin should be applied on top level elements
     additionalClass = additionalClass || '';
@@ -557,7 +557,7 @@ instance.web._t = new instance.web.TranslationDataBase().build_translation_funct
  * @returns {Object} lazy translation object
  */
 instance.web._lt = function (s) {
-    return {toString: function () { return instance.web._t(s); }}
+    return {toString: function () { return instance.web._t(s); }};
 };
 instance.web.qweb = new QWeb2.Engine();
 instance.web.qweb.debug = instance.session.debug;
@@ -692,13 +692,13 @@ instance.web.blockUI = function() {
     instance.web.Throbber.throbbers.push(throbber);
     throbber.appendTo($(".oe_blockui_spin_container"));
     return tmp;
-}
+};
 instance.web.unblockUI = function() {
     _.each(instance.web.Throbber.throbbers, function(el) {
         el.destroy();
     });
     return $.unblockUI.apply($, arguments);
-}
+};
 
 /**
  * Registry for all the client actions key: tag value: widget
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 79ec160eb70..b63d44a408d 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -494,7 +494,7 @@ instance.web.DataSet =  instance.web.Class.extend(instance.web.PropertiesMixin,
         return this._model.call('create', [data], {
             context: this.get_context()
         }).done(function () {
-            self.trigger('dataset_changed', data, options)
+            self.trigger('dataset_changed', data, options);
         });
     },
     /**
@@ -514,7 +514,7 @@ instance.web.DataSet =  instance.web.Class.extend(instance.web.PropertiesMixin,
         return this._model.call('write', [[id], data], {
             context: this.get_context(options.context)
         }).done(function () {
-            self.trigger('dataset_changed', id, data, options)
+            self.trigger('dataset_changed', id, data, options);
         });
     },
     /**
@@ -527,7 +527,7 @@ instance.web.DataSet =  instance.web.Class.extend(instance.web.PropertiesMixin,
         return this._model.call('unlink', [ids], {
             context: this.get_context()
         }).done(function () {
-            self.trigger('dataset_changed', ids)
+            self.trigger('dataset_changed', ids);
         });
     },
     /**
@@ -810,7 +810,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
         var self = this;
         _.each(ids, function(id) {
             if (! _.detect(self.to_create, function(x) { return x.id === id; })) {
-                self.to_delete.push({id: id})
+                self.to_delete.push({id: id});
             }
         });
         this.to_create = _.reject(this.to_create, function(x) { return _.include(ids, x.id);});
@@ -838,7 +838,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                 _.each(fields, function(x) {if (cached.values[x] === undefined)
                     cached.values[x] = created.defaults[x] || false;});
             } else {
-                if (!cached || !_.all(fields, function(x) {return cached.values[x] !== undefined}))
+                if (!cached || !_.all(fields, function(x) {return cached.values[x] !== undefined;}))
                     to_get.push(id);
             }
         });
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 7a390d0819f..0540a0acbe8 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -71,7 +71,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
                 opt.replaceChild(
                     document.createTextNode(
                         _.str.sprintf("%s — %s", format.label, format.error)),
-                    opt.childNodes[0])
+                    opt.childNodes[0]);
             }
             $fmts.append(opt);
         });
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index f4df990675c..664ca60e8e8 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -200,7 +200,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]
+                 value = value[0];
             }
             var result = _(descriptor.selection).detect(function (choice) {
                 return choice[0] === value;
diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index 02d828001c0..06dc7ae1815 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -97,7 +97,7 @@ openerp.web.pyeval = function (instance) {
                     divmod(n, 365, function (_n1, n) {
                         n1 = _n1;
                         n0 = n;
-                    })
+                    });
                 });
             });
         });
@@ -139,7 +139,7 @@ openerp.web.pyeval = function (instance) {
         if (microsecond < 0 || microsecond > 999999) {
             divmod(microsecond, 1000000, function (carry, ms) {
                 microsecond = ms;
-                second += carry
+                second += carry;
             });
         }
         if (second < 0 || second > 59) {
@@ -152,13 +152,13 @@ openerp.web.pyeval = function (instance) {
             divmod(minute, 60, function (carry, m) {
                 minute = m;
                 hour += carry;
-            })
+            });
         }
         if (hour < 0 || hour > 23) {
             divmod(hour, 24, function (carry, h) {
                 hour = h;
                 day += carry;
-            })
+            });
         }
         // That was easy.  Now it gets muddy:  the proper range for day
         // can't be determined without knowing the correct month and year,
@@ -170,7 +170,7 @@ openerp.web.pyeval = function (instance) {
             divmod(month-1, 12, function (carry, m) {
                 month = m + 1;
                 year += carry;
-            })
+            });
         }
         // Now only day can be out of bounds (year may also be out of bounds
         // for a datetime object, but we don't care about that here).
@@ -247,7 +247,7 @@ openerp.web.pyeval = function (instance) {
             });
             divmod(seconds, 24*3600, function (days, seconds) {
                 d += days;
-                s += seconds
+                s += seconds;
             });
             // seconds isn't referenced again before redefinition
 
@@ -358,7 +358,7 @@ openerp.web.pyeval = function (instance) {
             return py.float.fromJSON(
                 this.days * 86400
               + this.seconds
-              + this.microseconds / 1000000)
+              + this.microseconds / 1000000);
         },
         __nonzero__: function () {
             return (!!this.days || !!this.seconds || !!this.microseconds)
@@ -466,7 +466,7 @@ openerp.web.pyeval = function (instance) {
             return py.float.fromJSON(ymd2ord(this.year, this.month, this.day));
         },
         fromJSON: function (year, month, day) {
-            return py.PY_call(datetime.date, [year, month, day])
+            return py.PY_call(datetime.date, [year, month, day]);
         }
     });
     /**
@@ -505,7 +505,7 @@ openerp.web.pyeval = function (instance) {
     var args = _.map(('year month day hour minute second microsecond '
                     + 'years months weeks days hours minutes secondes microseconds '
                     + 'weekday leakdays yearday nlyearday').split(' '), function (arg) {
-        return [arg, null]
+        return [arg, null];
     });
     args.unshift('*');
     var relativedelta = py.type('relativedelta', null, {
@@ -808,7 +808,7 @@ openerp.web.pyeval = function (instance) {
         case 'groupbys':
             return eval_groupbys(object, context);
         }
-        throw new Error("Unknow evaluation type " + type)
+        throw new Error("Unknow evaluation type " + type);
     };
 
     var eval_arg = function (arg) {
@@ -863,5 +863,5 @@ openerp.web.pyeval = function (instance) {
                 }});
             }
         }, 0); });
-    }
+    };
 };
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 12e1c2bc0ec..b16d1c29f5b 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -148,7 +148,7 @@ my.InputView = instance.web.Widget.extend({
             range.setStart(root, 0);
         }
         if (range.endContainer === this.el && range.endOffset === 1) {
-            range.setEnd(root, root.length)
+            range.setEnd(root, root.length);
         }
         assert(range.startContainer === root,
                "selection should be in the input view");
@@ -157,7 +157,7 @@ my.InputView = instance.web.Widget.extend({
         return {
             start: range.startOffset,
             end: range.endOffset
-        }
+        };
     },
     onKeydown: function (e) {
         this.el.normalize();
@@ -401,7 +401,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             });
 
             $.when(load_view).then(function (r) {
-                return self.search_view_loaded(r)
+                return self.search_view_loaded(r);
             }).fail(function () {
                 self.ready.reject.apply(null, arguments);
             });
@@ -950,7 +950,7 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan
      * @returns {jQuery.Deferred<null|Array>}
      */
     complete: function (value) {
-        return $.when(null)
+        return $.when(null);
     },
     /**
      * Returns a Facet instance for the provided defaults if they apply to
@@ -1073,7 +1073,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
             icon: this.icon,
             values: values,
             field: this
-        }
+        };
     },
     make_value: function (filter) {
         return {
@@ -1176,7 +1176,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
                 label: _.str.sprintf(self.completion_label.toString(),
                                      _.escape(facet_value.label)),
                 facet: self.make_facet([facet_value])
-            }
+            };
         }));
     }
 });
@@ -1198,7 +1198,7 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
                 get_context: this.proxy('get_context'),
                 get_domain: this.proxy('get_domain'),
                 get_groupby: this.proxy('get_groupby')
-            }
+            };
         }
     },
     match_facet: function (facet) {
@@ -1564,7 +1564,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
         return this.model.call('name_get', [value]).then(function (names) {
             if (_(names).isEmpty()) { return null; }
             return facet_from(self, names[0]);
-        })
+        });
     },
     value_from: function (facetValue) {
         return facetValue.get('label');
diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js
index 82c1d6fa26e..67b961208db 100644
--- a/addons/web/static/src/js/test_support.js
+++ b/addons/web/static/src/js/test_support.js
@@ -73,6 +73,6 @@ openerp.test_support = {
                 return;
             }
             fn(e.data.name);
-        })
+        });
     }
 };
diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index e7aad43ffc7..ed26238028e 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -176,9 +176,9 @@ openerp.testing = {};
         });
 
         QUnit.module(testing.current_module + '.' + name, {_oe: options});
-        body(testing.case);
+        body(testing['case']);
     };
-    testing.case = function (name, options, callback) {
+    testing['case'] = function (name, options, callback) {
         if (_.isFunction(options)) {
             callback = options;
             options = {};
@@ -359,7 +359,7 @@ openerp.testing = {};
 
                 return $.Deferred(function (d) {
                     $.when(result).then(function () {
-                        d.resolve.apply(d, arguments)
+                        d.resolve.apply(d, arguments);
                     }, function () {
                         d.reject.apply(d, arguments);
                     });
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0f33de0814e..09daecfdd59 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -437,7 +437,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
 
         var method = call[1];
         if (!_.str.trim(call[2])) {
-            return {method: method, args: []}
+            return {method: method, args: []};
         }
 
         var argument_replacement = {
@@ -778,7 +778,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
             } else {
                 $.async_when().done(function () {
                     def.reject();
-                })
+                });
             }
         });
         return def.promise();
@@ -1028,7 +1028,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                 return field.get_displayed();
             }
             return value;
-        }
+        };
         var fields = _.chain(this.fields)
             .map(function (field) {
                 var value = field.get_value();
@@ -1049,7 +1049,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     string: field.string,
                     value: value,
                     displayed: display(field, value),
-                }
+                };
             })
             .compact()
             .sortBy(function (field) { return field.string; })
@@ -1063,7 +1063,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
                     string: field.string,
                     value: value,
                     displayed: display(field, value),
-                }
+                };
             })
             .value();
 
@@ -1429,7 +1429,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
                 row_cols = cols;
             } else if (tagName==='group') {
                 // When <group> <group/><group/> </group>, we need a spacing between the two groups
-                $td.addClass('oe_group_right')
+                $td.addClass('oe_group_right');
             }
             row_cols -= colspan;
 
@@ -1852,7 +1852,8 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                     return QWeb.render(template, {
                         debug: instance.session.debug,
                         widget: widget
-                })},
+                    });
+                },
                 gravity: $.fn.tipsy.autoBounds(50, 'nw'),
                 html: true,
                 opacity: 0.85,
@@ -2073,7 +2074,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
      * @param node
      */
     init: function(field_manager, node) {
-        var self = this
+        var self = this;
         this._super(field_manager, node);
         this.name = this.node.attrs.name;
         this.field = this.field_manager.get_field_desc(this.name);
@@ -2937,7 +2938,7 @@ instance.web.form.FieldRadio = instance.web.form.AbstractField.extend(instance.w
     set_value: function (value_) {
         if (value_) {
             if (this.field.type == "selection") {
-                value_ = _.find(this.field.selection, function (sel) { return sel[0] == value_});
+                value_ = _.find(this.field.selection, function (sel) { return sel[0] == value_;});
             }
             else if (!this.selection.length) {
                 this.selection = [value_];
@@ -2954,7 +2955,7 @@ instance.web.form.FieldRadio = instance.web.form.AbstractField.extend(instance.w
         this.$el.toggleClass("oe_readonly", this.get('effective_readonly'));
         this.$("input:checked").prop("checked", false);
         if (this.get_value()) {
-            this.$("input").filter(function () {return this.value == self.get_value()}).prop("checked", true);
+            this.$("input").filter(function () {return this.value == self.get_value();}).prop("checked", true);
             this.$(".oe_radio_readonly").text(this.get('value') ? this.get('value')[1] : "");
         }
     }
@@ -3090,7 +3091,7 @@ instance.web.form.CompletionFieldMixin = {
             self.field.relation,
             {
                 title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string,
-                initial_ids: ids ? _.map(ids, function(x) {return x[0]}) : undefined,
+                initial_ids: ids ? _.map(ids, function(x) {return x[0];}) : undefined,
                 initial_view: view,
                 disable_multiple_selection: true
             },
@@ -3455,7 +3456,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         var self = this;
         if (value_ instanceof Array) {
             this.display_value = {};
-            this.display_value_backup = {}
+            this.display_value_backup = {};
             if (! this.options.always_reload) {
                 this.display_value["" + value_[0]] = value_[1];
             }
@@ -3720,7 +3721,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
                  });
                 controller.on('pager_action_executed',self,self.save_any_view);
             } else if (view_type == "graph") {
-                self.reload_current_view()
+                self.reload_current_view();
             }
             def.resolve();
         });
@@ -3963,7 +3964,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({
         var form = editor.form;
         // If no edition is pending, the listview can not be invalid (?)
         if (!editor.record) {
-            return true
+            return true;
         }
         // If the form has not been modified, the view can only be valid
         // NB: is_dirty will also be set on defaults/onchanges/whatever?
@@ -4168,7 +4169,7 @@ instance.web.form.One2ManyList = instance.web.ListView.List.extend({
         if ($padding.length) {
             $padding.before($newrow);
         } else {
-            this.$current.append($newrow)
+            this.$current.append($newrow);
         }
     }
 });
@@ -5022,8 +5023,8 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
         this.selection.on("change:value", this, this.on_selection_changed);
         this.selection.appendTo(this.$(".oe_form_view_reference_selection"));
         this.selection
-            .on('focused', null, function () {self.trigger('focused')})
-            .on('blurred', null, function () {self.trigger('blurred')});
+            .on('focused', null, function () {self.trigger('focused');})
+            .on('blurred', null, function () {self.trigger('blurred');});
 
         this.m2o = new instance.web.form.FieldMany2One(fm, { attrs: {
             name: 'm2o',
@@ -5032,8 +5033,8 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan
         this.m2o.on("change:value", this, this.data_changed);
         this.m2o.appendTo(this.$(".oe_form_view_reference_m2o"));
         this.m2o
-            .on('focused', null, function () {self.trigger('focused')})
-            .on('blurred', null, function () {self.trigger('blurred')});
+            .on('focused', null, function () {self.trigger('focused');})
+            .on('blurred', null, function () {self.trigger('blurred');});
     },
     on_selection_changed: function() {
         if (this.reference_ready) {
@@ -5203,7 +5204,7 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         } else {
             this.$el.find('a').toggle(!!this.get('value'));
             if (this.get('value')) {
-                show_value = _t("Download")
+                show_value = _t("Download");
                 if (this.view)
                     show_value += " " + (this.view.datarecord[this.node.attrs.filename] || '');
                 this.$el.find('a').text(show_value);
@@ -5422,7 +5423,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
             values.push(result.id);
             this.set({'value': values});
         }
-        this.render_value()
+        this.render_value();
     },
     on_file_delete: function (event) {
         event.stopPropagation();
@@ -5476,7 +5477,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         var self = this;
         var content = QWeb.render("FieldStatus.content", {
             'widget': self, 
-            'value_folded': _.find(self.selection.folded, function(i){return i[0] === self.get('value')})
+            'value_folded': _.find(self.selection.folded, function(i){return i[0] === self.get('value');})
         });
         self.$el.html(content);
     },
@@ -5508,7 +5509,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
                     return new instance.web.DataSetSearch(self, self.field.relation, self.build_context(), self.get("evaluated_selection_domain"))
                         .read_slice(fields.fold ? ['fold'] : ['id'], {}).then(function (records) {
 
-                            var ids = _.map(records, function (val) {return val.id});
+                            var ids = _.map(records, function (val) {return val.id;});
                             return self.dataset.name_get(ids).then(function (records_name) {
                                 _.each(records, function (record) {
                                     var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
@@ -5518,7 +5519,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
                                         selection_unfolded.push([record.id, name]);
                                     }
                                 });
-                            })
+                            });
                         });
                 });
             } else {
@@ -5550,7 +5551,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
         return new instance.web.Model(self.field.relation).call("fields_get", [["fold"]]).then(function(fields) {
             self.distant_fields = fields;
             return fields;
-        })
+        });
     },
     on_click_stage: function (ev) {
         var self = this;
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 991f4db6852..3e34a895321 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -363,7 +363,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
     sort_by_column: function (e) {
         e.stopPropagation();
         var $column = $(e.currentTarget);
-        var col_name = $column.data('id')
+        var col_name = $column.data('id');
         var field = this.fields_view.fields[col_name];
         // test if the field is a function field with store=false, since it's impossible
         // for the server to sort those fields we desactivate the feature
@@ -1430,7 +1430,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                d = new $.Deferred(),
             page = this.datagroup.openable ? this.page : view.page;
 
-        var fields = _.pluck(_.select(this.columns, function(x) {return x.tag == "field"}), 'name');
+        var fields = _.pluck(_.select(this.columns, function(x) {return x.tag == "field";}), 'name');
         var options = { offset: page * limit, limit: limit, context: {bin_size: true} };
         //TODO xmo: investigate why we need to put the setTimeout
         $.async_when().done(function() {
@@ -1545,7 +1545,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
 
         this.datagroup.list(
             _(this.view.visible_columns).chain()
-                .filter(function (column) { return column.tag === 'field' })
+                .filter(function (column) { return column.tag === 'field';})
                 .pluck('name').value(),
             function (groups) {
                 $el[0].appendChild(
@@ -1590,7 +1590,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
             return {
                 count: this.datagroup.length,
                 values: this.datagroup.aggregates
-            }
+            };
         }
         return _(this.children).chain()
             .map(function (child) {
@@ -1958,7 +1958,7 @@ var Collection = instance.web.Class.extend(/** @lends Collection# */{
         var record;
         for(var section in this._proxies) {
             if (!this._proxies.hasOwnProperty(section)) {
-                continue
+                continue;
             }
             if ((record = this._proxies[section].find(callback))) {
                 return record;
@@ -2075,7 +2075,7 @@ instance.web.list.columns.for_ = function (id, field, node) {
         tag + '.'+ description.type,
         tag
     ]);
-    return new Type(id, node.tag, description)
+    return new Type(id, node.tag, description);
 };
 
 instance.web.list.Column = instance.web.Class.extend({
@@ -2238,7 +2238,7 @@ instance.web.list.Char = instance.web.list.Column.extend({
     _format: function (row_data, options) {
         var value = row_data[this.id].value;
         if (value && this.password === 'True') {
-            return value.replace(/[\s\S]/g, _.escape(this.replacement))
+            return value.replace(/[\s\S]/g, _.escape(this.replacement));
         }
         return this._super(row_data, options);
     }
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 1a06720a274..2634cec350f 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -202,7 +202,7 @@ openerp.web.list_editable = function (instance) {
         make_empty_record: function (id) {
             var attrs = {id: id};
             _(this.columns).chain()
-                .filter(function (x) { return x.tag === 'field'})
+                .filter(function (x) { return x.tag === 'field';})
                 .pluck('name')
                 .each(function (field) { attrs[field] = false; });
             return new instance.web.list.Record(attrs);
@@ -260,7 +260,7 @@ openerp.web.list_editable = function (instance) {
         get_cells_for: function ($row) {
             var cells = {};
             $row.children('td').each(function (index, el) {
-                cells[el.getAttribute('data-field')] = el
+                cells[el.getAttribute('data-field')] = el;
             });
             return cells;
         },
@@ -346,7 +346,7 @@ openerp.web.list_editable = function (instance) {
                         var record = self.records.get(attrs.id);
                         if (!record) {
                             // Record removed by third party during edition
-                            return
+                            return;
                         }
                         return self.reload_record(record);
                     }
@@ -691,7 +691,7 @@ openerp.web.list_editable = function (instance) {
             var arch = edition_view.arch;
             if (!(arch && arch.children instanceof Array)) {
                 throw new Error("Editor delegate's #edition_view must have a" +
-                                " non-empty arch")
+                                " non-empty arch");
             }
             if (arch.tag !== "form") {
                 throw new Error("Editor delegate's #edition_view must have a" +
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index fc67c7da24d..d7f38373594 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -459,7 +459,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             action_id: action.id,
             context: action.context || {}
         }).done(function (action) {
-            self.do_action(action, options)
+            self.do_action(action, options);
         });
     },
     ir_actions_report_xml: function(action, options) {
@@ -478,8 +478,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
                 var params = {
                     action: JSON.stringify(action),
                     token: new Date().getTime()
-                }
-                var url = self.session.url('/web/report', params)
+                };
+                var url = self.session.url('/web/report', params);
                 instance.web.unblockUI();
                 $('<a href="'+url+'" target="_blank"></a>')[0].click();
                 return;
@@ -502,7 +502,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                         c.rpc_error.apply(c, arguments);
                         d.reject();
                     }
-                })
+                });
             });
         });
     },
@@ -1121,7 +1121,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
         self.$("[title]").tipsy({
             'html': true,
             'delayIn': 500,
-        })
+        });
     },
     /**
      * For each item added to the section:
@@ -1165,7 +1165,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
                         label: items[i]['name'],
                         action: items[i],
                         classname: 'oe_sidebar_' + type
-                    }
+                    };
                 }
                 self.add_items(type=='print' ? 'print' : 'other', items);
             }
@@ -1425,7 +1425,7 @@ instance.web.View = instance.web.Widget.extend({
             if (self.is_active()) {
                 fn.apply(self, arguments);
             }
-        }
+        };
     },
     do_push_state: function(state) {
         if (this.getParent() && this.getParent().do_push_state) {
@@ -1536,9 +1536,10 @@ instance.web.xml_to_json = function(node, strip_whitespace) {
                 children: _.compact(_.map(node.childNodes, function(node) {
                     return instance.web.xml_to_json(node, strip_whitespace);
                 })),
-            }
+            };
     }
-}
+};
+
 instance.web.json_node_to_xml = function(node, human_readable, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     indent = indent || 0;

From 17ba69eb5229c81a771c88f376c122b333642fc6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Jul 2013 13:24:16 +0200
Subject: [PATCH 192/197] Applied jshint on test files and corrected errors

bzr revid: nicolas.vanhoren@openerp.com-20130725112416-j6wbm254yx05i890
---
 addons/web/Gruntfile.js                 |   2 +-
 addons/web/static/test/Widget.js        |  34 +++----
 addons/web/static/test/data.js          |  76 +++++++++++++++
 addons/web/static/test/evals.js         |   8 +-
 addons/web/static/test/formats.js       |   4 +-
 addons/web/static/test/list-editable.js |   6 +-
 addons/web/static/test/list-utils.js    |  10 +-
 addons/web/static/test/rpc.js           |   2 +-
 addons/web/static/test/search.js        | 123 +++++++++++++++++++-----
 addons/web/static/test/testing.js       |   2 +-
 10 files changed, 208 insertions(+), 59 deletions(-)
 create mode 100644 addons/web/static/test/data.js

diff --git a/addons/web/Gruntfile.js b/addons/web/Gruntfile.js
index 372feb2d9c0..d1e897d8e20 100644
--- a/addons/web/Gruntfile.js
+++ b/addons/web/Gruntfile.js
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
 
   grunt.initConfig({
     jshint: {
-      files: ['static/src/**/*.js'],
+      files: ['static/src/**/*.js', 'static/test/**/*.js'],
       options: {
         sub: true, //[] instead of .
         evil: true, //eval
diff --git a/addons/web/static/test/Widget.js b/addons/web/static/test/Widget.js
index 44b7cfe0dfa..858044f8cb0 100644
--- a/addons/web/static/test/Widget.js
+++ b/addons/web/static/test/Widget.js
@@ -7,7 +7,7 @@ openerp.testing.section('Widget.proxy', {
                 this.executed = true;
             }
         });
-        var w = new W;
+        var w = new W();
         var fn = w.proxy('exec');
         fn();
         ok(w.executed, 'should execute the named method in the right context');
@@ -18,7 +18,7 @@ openerp.testing.section('Widget.proxy', {
                 this.executed = arg;
             }
         });
-        var w = new W;
+        var w = new W();
         var fn = w.proxy('exec');
         fn(42);
         ok(w.executed, "should execute the named method in the right context");
@@ -32,7 +32,7 @@ openerp.testing.section('Widget.proxy', {
                 this.executed = 1;
             }
         });
-        var w = new W;
+        var w = new W();
         var fn = w.proxy('exec');
         W.include({
             exec: function () { this.executed = 2; }
@@ -43,14 +43,14 @@ openerp.testing.section('Widget.proxy', {
     });
 
     test('(Function)', function (instance) {
-        var w = new (instance.web.Widget.extend({ }));
+        var w = new (instance.web.Widget.extend({ }))();
 
         var fn = w.proxy(function () { this.executed = true; });
         fn();
         ok(w.executed, "should set the function's context (like Function#bind)");
     });
     test('(Function)(*args)', function (instance) {
-        var w = new (instance.web.Widget.extend({ }));
+        var w = new (instance.web.Widget.extend({ }))();
 
         var fn = w.proxy(function (arg) { this.executed = arg; });
         fn(42);
@@ -79,7 +79,7 @@ openerp.testing.section('Widget.renderElement', {
     }
 }, function (test) {
     test('no template, default', function (instance) {
-        var w = new (instance.web.Widget.extend({ }));
+        var w = new (instance.web.Widget.extend({ }))();
 
         var $original = w.$el;
         ok($original, "should initially have a root element");
@@ -96,7 +96,7 @@ openerp.testing.section('Widget.renderElement', {
     test('no template, custom tag', function (instance) {
         var w = new (instance.web.Widget.extend({
             tagName: 'ul'
-        }));
+        }))();
         w.renderElement();
 
         equal(w.el.nodeName, 'UL', "should have generated the custom element tag");
@@ -104,7 +104,7 @@ openerp.testing.section('Widget.renderElement', {
     test('no template, @id', function (instance) {
         var w = new (instance.web.Widget.extend({
             id: 'foo'
-        }));
+        }))();
         w.renderElement();
 
         equal(w.el.attributes.length, 1, "should have one attribute");
@@ -114,7 +114,7 @@ openerp.testing.section('Widget.renderElement', {
     test('no template, @className', function (instance) {
         var w = new (instance.web.Widget.extend({
             className: 'oe_some_class'
-        }));
+        }))();
         w.renderElement();
 
         equal(w.el.className, 'oe_some_class', "should have the right property");
@@ -129,7 +129,7 @@ openerp.testing.section('Widget.renderElement', {
                 'clark': 'gable',
                 'spoiler': 'snape kills dumbledore'
             }
-        }));
+        }))();
         w.renderElement();
 
         equal(w.el.attributes.length, 5, "should have all the specified attributes");
@@ -150,7 +150,7 @@ openerp.testing.section('Widget.renderElement', {
     test('template', function (instance) {
         var w = new (instance.web.Widget.extend({
             template: 'test.widget.template'
-        }));
+        }))();
         w.renderElement();
 
         equal(w.el.nodeName, 'OL');
@@ -160,7 +160,7 @@ openerp.testing.section('Widget.renderElement', {
     test('repeated', { asserts: 4 }, function (instance, $fix) {
         var w = new (instance.web.Widget.extend({
             template: 'test.widget.template-value'
-        }));
+        }))();
         w.value = 42;
         return w.appendTo($fix)
             .done(function () {
@@ -194,7 +194,7 @@ openerp.testing.section('Widget.$', {
     test('basic-alias', function (instance) {
         var w = new (instance.web.Widget.extend({
             template: 'test.widget.template'
-        }));
+        }))();
         w.renderElement();
 
         ok(w.$('li:eq(3)').is(w.$el.find('li:eq(3)')),
@@ -226,13 +226,13 @@ openerp.testing.section('Widget.events', {
             events: {
                 'click': function () {
                     a[0] = true;
-                    strictEqual(this, w, "should trigger events in widget")
+                    strictEqual(this, w, "should trigger events in widget");
                 },
                 'click li.class-3': 'class3',
                 'change input': function () { a[2] = true; }
             },
             class3: function () { a[1] = true; }
-        }));
+        }))();
         w.renderElement();
 
         w.$el.click();
@@ -248,9 +248,9 @@ openerp.testing.section('Widget.events', {
         var w = new (instance.web.Widget.extend({
             template: 'test.widget.template',
             events: { 'click li': function () { clicked = true; } }
-        }));
+        }))();
         w.renderElement();
-        w.$el.on('click', 'li', function () { newclicked = true });
+        w.$el.on('click', 'li', function () { newclicked = true; });
 
         w.$('li').click();
         ok(clicked, "should trigger bound events");
diff --git a/addons/web/static/test/data.js b/addons/web/static/test/data.js
new file mode 100644
index 00000000000..d7a957ad920
--- /dev/null
+++ b/addons/web/static/test/data.js
@@ -0,0 +1,76 @@
+openerp.testing.section('data.model.group_by', {
+    rpc: 'mock',
+    dependencies: ['web.data'],
+}, function (test) {
+    var group_result = [{
+        bar: 3, bar_count: 5, __context: {}, __domain: [['bar', '=', 3]],
+    }, {
+        bar: 5, bar_count: 3, __context: {}, __domain: [['bar', '=', 5]],
+    }, {
+        bar: 8, bar_count: 0, __context: {}, __domain: [['bar', '=', 8]],
+    }];
+    test('basic', {asserts: 7}, function (instance, $fix, mock) {
+        var m = new instance.web.Model('foo');
+        mock('foo:read_group', function (args, kwargs) {
+            deepEqual(kwargs.fields, ['bar'],
+                      "should read grouping field");
+            deepEqual(kwargs.groupby, ['bar'],
+                      "should have single grouping field");
+            return group_result;
+        });
+        mock('/web/dataset/search_read', function (args) {
+            deepEqual(args.params.domain, [['bar', '=', 3]],
+                      "should have domain matching that of group_by result");
+            return {records: [
+                {bar: 3, id: 1},
+                {bar: 3, id: 2},
+                {bar: 3, id: 4},
+                {bar: 3, id: 8},
+                {bar: 3, id: 16}
+            ], length: 5};
+        });
+
+        return m.query().group_by('bar')
+        .then(function (groups) {
+            ok(groups, "should have data");
+            equal(groups.length, 3, "should have three results");
+            var first = groups[0];
+            ok(first.attributes.has_children, "should have children");
+            return  first.query().all();
+        }).done(function (first) {
+            equal(first.length, 5, "should have 5 records");
+        });
+    });
+    test('noleaf', {asserts: 5}, function (instance, $fix, mock) {
+        var m = new instance.web.Model('foo', {group_by_no_leaf: true});
+        mock('foo:read_group', function (args, kwargs) {
+            deepEqual(kwargs.fields, ['bar'],
+                      "should read grouping field");
+            deepEqual(kwargs.groupby, ['bar'],
+                      "should have single grouping field");
+
+            return  group_result;
+        });
+        return m.query().group_by('bar')
+        .then(function (groups) {
+            ok(groups, "should have data");
+            equal(groups.length, 3, "should have three results");
+            ok(!groups[0].attributes.has_children,
+                "should not have children because no_leaf");
+        });
+    });
+    test('nogroup', {rpc: false}, function (instance, $f, mock) {
+        var m = new instance.web.Model('foo');
+        strictEqual(m.query().group_by(), null, "should not group");
+    });
+    test('empty.noleaf', {asserts: 1}, function (instance, $f, mock) {
+        var m = new instance.web.Model('foo',  {group_by_no_leaf: true});
+        mock('foo:read_group', function (args, kwargs) {
+            return [{__context: [], __domain: []}];
+        });
+        return m.query().group_by().done(function (groups) {
+            strictEqual(groups.length, 1,
+                        "should generate a single fake-ish group");
+        });
+    });
+});
diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index 8e9fb682e0c..405589e1be8 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -9,9 +9,9 @@ openerp.testing.section('eval.types', {
         return function (expr, func, message) {
             // evaluate expr between two calls to new Date(), and check that
             // the result is between the transformed dates
-            var d0 = new Date;
+            var d0 = new Date();
             var result = py.eval(expr, context);
-            var d1 = new Date;
+            var d1 = new Date();
             ok(func(d0) <= result && result <= func(d1), message);
         };
     };
@@ -118,7 +118,7 @@ openerp.testing.section('eval.types', {
         // Issue #11576
         eq('td(999999999, 86399, 999999) - td(999999999, 86399, 999998)', 'td(0, 0, 1)');
         eq('td(999999999, 1, 1) - td(999999999, 1, 0)',
-           'td(0, 0, 1)')
+           'td(0, 0, 1)');
     });
     test('timedelta.test_basic_attributes', function (instance) {
         var ctx = instance.web.pyeval.context();
@@ -264,7 +264,7 @@ openerp.testing.section('eval.types', {
             py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=-1)).strftime('%Y-%m-%d 23:59:59')",
                     instance.web.pyeval.context()),
             "2012-02-14 23:59:59");
-    })
+    });
 });
 openerp.testing.section('eval.edc', {
     dependencies: ['web.data'],
diff --git a/addons/web/static/test/formats.js b/addons/web/static/test/formats.js
index ac602e4b693..fe8388c8929 100644
--- a/addons/web/static/test/formats.js
+++ b/addons/web/static/test/formats.js
@@ -126,8 +126,8 @@ openerp.testing.section('web-formats', {
         var str = "134,112.1234";
         var val = instance.web.parse_value(str, {type:"float"});
         equal(val, 134112.1234);
-        var str = "-134,112.1234";
-        var val = instance.web.parse_value(str, {type:"float"});
+        str = "-134,112.1234";
+        val = instance.web.parse_value(str, {type:"float"});
         equal(val, -134112.1234);
         _.extend(instance.web._t.database.parameters, {
             decimal_point: ',',
diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index 89907aa16ee..20a14cb24d5 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -49,7 +49,7 @@ openerp.testing.section('editor', {
                         readonly: field.readonly
                     })
                 }
-            }
+            };
         });
         return {
             arch: {
@@ -108,7 +108,7 @@ openerp.testing.section('editor', {
             .done(function (record) {
                 ok(!e.is_editing(), "should have stopped editing");
                 equal(record.id, 42, "should have newly created id");
-            })
+            });
     });
     test('toggle-edition-cancel', { asserts: 2 }, function (instance, $fix) {
         var e = new instance.web.list.Editor({
@@ -131,7 +131,7 @@ openerp.testing.section('editor', {
             .done(function (record) {
                 ok(!e.is_editing(), "should have stopped editing");
                 ok(!record.id, "should have no id");
-            })
+            });
     });
     test('toggle-save-required', {
         asserts: 2,
diff --git a/addons/web/static/test/list-utils.js b/addons/web/static/test/list-utils.js
index 84661138315..01777cd5a18 100644
--- a/addons/web/static/test/list-utils.js
+++ b/addons/web/static/test/list-utils.js
@@ -7,7 +7,7 @@ openerp.testing.section('list.events', {
         }
         function Cls() {}
         Cls.prototype = o;
-        return new Cls;
+        return new Cls();
     };
     test('Simple event triggering', function (instance) {
         var e = create(instance.web.list.Events), passed = false;
@@ -23,9 +23,9 @@ openerp.testing.section('list.events', {
     });
     test('Propagate trigger params', function (instance) {
        var e = create(instance.web.list.Events), p = false;
-        e.bind(null, function (_, param) { p = param });
+        e.bind(null, function (_, param) { p = param; });
         e.trigger('foo', true);
-        strictEqual(p, true)
+        strictEqual(p, true);
     });
     test('Bind multiple callbacks', function (instance) {
         var e = create(instance.web.list.Events), count;
@@ -53,7 +53,7 @@ openerp.testing.section('list.events', {
             method: function () { this.trigger('e'); }
         });
         cls.include(instance.web.list.Events);
-        var i = new cls, triggered = false;
+        var i = new cls(), triggered = false;
 
         i.bind('e', function () { triggered = true; });
         i.method();
@@ -97,7 +97,7 @@ openerp.testing.section('list.records', {
     test('Change all the things', function (instance) {
         var r = new instance.web.list.Record(), changed = false, field;
         r.bind('change', function () { changed = true; });
-        r.bind(null, function (e) { field = field || e.split(':')[1]});
+        r.bind(null, function (e) { field = field || e.split(':')[1]; });
         r.set('foo', 1);
         strictEqual(r.get('foo'), 1);
         ok(changed);
diff --git a/addons/web/static/test/rpc.js b/addons/web/static/test/rpc.js
index 85f562ef225..410c041633d 100644
--- a/addons/web/static/test/rpc.js
+++ b/addons/web/static/test/rpc.js
@@ -122,6 +122,6 @@ openerp.testing.section('misordered resolution managemeng', {
             ok(!fail2);
             done.resolve();
         }, 400);
-        return $.when(d1, d2, done)
+        return $.when(d1, d2, done);
     });
 });
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 5c02d1f16db..268fe4d1c0c 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -2,7 +2,7 @@ openerp.testing.section('search.query', {
     dependencies: ['web.search']
 }, function (test) {
     test('Adding a facet to the query creates a facet and a value', function (instance) {
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         var field = {};
         query.add({
             category: 'Foo',
@@ -16,7 +16,7 @@ openerp.testing.section('search.query', {
         deepEqual(facet.get('values'), [{label: 'Value', value: 3}]);
     });
     test('Adding two facets', function (instance) {
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         query.add([
             { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] },
             { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] }
@@ -27,7 +27,7 @@ openerp.testing.section('search.query', {
         equal(query.at(1).values.length, 1);
     });
     test('If a facet already exists, add values to it', function (instance) {
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         var field = {};
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
         query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
@@ -40,18 +40,18 @@ openerp.testing.section('search.query', {
         ]);
     });
     test('Facet being implicitly changed should trigger change, not add', function (instance) {
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         var field = {}, added = false, changed = false;
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
         query.on('add', function () { added = true; })
-             .on('change', function () { changed = true });
+             .on('change', function () { changed = true; });
         query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
 
         ok(!added, "query.add adding values to a facet should not trigger an add");
         ok(changed, "query.add adding values to a facet should not trigger a change");
     });
     test('Toggling a facet, value which does not exist should add it', function (instance) {
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         var field = {};
         query.toggle({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
 
@@ -63,7 +63,7 @@ openerp.testing.section('search.query', {
     });
     test('Toggling a facet which exists with a value which does not should add the value to the facet', function (instance) {
         var field = {};
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
         query.toggle({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
 
@@ -77,7 +77,7 @@ openerp.testing.section('search.query', {
     });
     test('Toggling a facet which exists with a value which does as well should remove the value from the facet', function (instance) {
         var field = {};
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
         query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]});
 
@@ -92,7 +92,7 @@ openerp.testing.section('search.query', {
     });
     test('Toggling off the last value of a facet should remove the facet', function (instance) {
         var field = {};
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
 
         query.toggle({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
@@ -101,7 +101,7 @@ openerp.testing.section('search.query', {
     });
     test('Intermediate emptiness should not remove the facet', function (instance) {
         var field = {};
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]});
 
         query.toggle({category: 'A', field: field, values: [
@@ -118,7 +118,7 @@ openerp.testing.section('search.query', {
     });
 
     test('Reseting with multiple facets should still work to load defaults', function (instance) {
-        var query = new instance.web.search.SearchQuery;
+        var query = new instance.web.search.SearchQuery();
         var field = {};
         query.reset([
             {category: 'A', field: field, values: [{label: 'V1', value: 0}]},
@@ -129,7 +129,7 @@ openerp.testing.section('search.query', {
         deepEqual(query.at(0).get('values'), [
             {label: 'V1', value: 0},
             {label: 'V2', value: 1}
-        ])
+        ]);
     });
 });
 
@@ -346,7 +346,7 @@ openerp.testing.section('search.defaults', {
             {attrs: {name: 'dummy', string: 'Dummy'}},
             {relation: 'dummy.model.name'},
             view);
-        mock('dummy.model.name:name_get', function () { return [] });
+        mock('dummy.model.name:name_get', function () { return []; });
         return f.facet_for_defaults({dummy: id})
             .done(function (facet) {
                 ok(!facet, "an invalid m2o default should yield a non-facet");
@@ -358,9 +358,9 @@ openerp.testing.section('search.defaults', {
             {attrs: {name: 'dummy', string: 'Dummy'}},
             {relation: 'dummy.model.name'},
             view);
-        raises(function () { f.facet_for_defaults({dummy: [6, 7]}) },
+        raises(function () { f.facet_for_defaults({dummy: [6, 7]}); },
                "should not accept multiple default values");
-    })
+    });
 });
 openerp.testing.section('search.completions', {
     dependencies: ['web.search'],
@@ -614,6 +614,59 @@ openerp.testing.section('search.completions', {
             {relation: 'dummy.model'}, view);
         return f.complete("bob");
     });
+    test('Integer: invalid', {asserts: 1}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.IntegerField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("qux")
+            .done(function (completions) {
+                ok(!completions, "non-number => no completion");
+            });
+    });
+    test('Integer: non-zero', {asserts: 5}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.IntegerField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("-2")
+            .done(function (completions) {
+                equal(completions.length, 1, "number fields provide 1 completion only");
+                var facet = new instance.web.search.Facet(completions[0].facet);
+                equal(facet.get('category'), f.attrs.string);
+                equal(facet.get('field'), f);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "-2");
+                equal(value.get('value'), -2);
+            });
+    });
+    test('Integer: zero', {asserts: 3}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.IntegerField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("0")
+            .done(function (completions) {
+                equal(completions.length, 1, "number fields provide 1 completion only");
+                var facet = new instance.web.search.Facet(completions[0].facet);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "0");
+                equal(value.get('value'), 0);
+            });
+    });
+    test('Float: non-zero', {asserts: 5}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.FloatField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("42.37")
+            .done(function (completions) {
+                equal(completions.length, 1, "float fields provide 1 completion only");
+                var facet = new instance.web.search.Facet(completions[0].facet);
+                equal(facet.get('category'), f.attrs.string);
+                equal(facet.get('field'), f);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "42.37");
+                equal(value.get('value'), 42.37);
+            });
+    });
+    
 });
 openerp.testing.section('search.serialization', {
     dependencies: ['web.search'],
@@ -651,7 +704,7 @@ openerp.testing.section('search.serialization', {
 
                 ok(!got_groupby, "no facet, should not have fetched groupby");
                 ok(_(gs).isEmpty(), "groupby list should be empty");
-            })
+            });
     });
     test('London, calling', {asserts: 8}, function (instance, $fix) {
         var got_domain = false, got_context = false, got_groupby = false;
@@ -686,7 +739,7 @@ openerp.testing.section('search.serialization', {
 
                 ok(got_groupby, "should have fetched groupby");
                 ok(_(gs).isEmpty(), "groupby list should be empty");
-            })
+            });
     });
     test('Generate domains', {asserts: 1}, function (instance, $fix) {
         var view = makeSearchView(instance, {
@@ -1065,7 +1118,7 @@ openerp.testing.section('search.groupby', {
                             '<filter string="Baz" context="{\'group_by\': \'baz\'}"/>',
                         '</search>'
                     ].join(''),
-                }
+                };
             });
         }
     }, function (instance, $fix) {
@@ -1076,7 +1129,7 @@ openerp.testing.section('search.groupby', {
             equal(view.inputs.length, 7,
                   'should have 7 inputs total');
             var group = _.find(view.inputs, function (f) {
-                return f instanceof instance.web.search.GroupbyGroup
+                return f instanceof instance.web.search.GroupbyGroup;
             });
             ok(group, "should have a GroupbyGroup input");
             strictEqual(group.getParent(), view,
@@ -1095,7 +1148,7 @@ openerp.testing.section('search.groupby', {
             deepEqual(results.groupbys, [
                 "{'group_by': 'foo'}",
                 "{'group_by': 'baz'}"
-            ], "should have sequence of contexts")
+            ], "should have sequence of contexts");
         });
     });
     test('unified multiple groupby groups', {
@@ -1114,7 +1167,7 @@ openerp.testing.section('search.groupby', {
                             '<filter string="Baz" context="{\'group_by\': \'baz\'}"/>',
                         '</search>'
                     ].join(''),
-                }
+                };
             });
         }
     }, function (instance, $fix) {
@@ -1125,7 +1178,7 @@ openerp.testing.section('search.groupby', {
             equal(view.inputs.length, 9, "should have 9 inputs total");
 
             var groups = _.filter(view.inputs, function (f) {
-                return f instanceof instance.web.search.GroupbyGroup
+                return f instanceof instance.web.search.GroupbyGroup;
             });
             equal(groups.length, 3, "should have 3 GroupbyGroups");
 
@@ -1169,7 +1222,7 @@ openerp.testing.section('search.filters.saved', {
                     "displayed label should be the name of the filter");
                 equal(values.at(0).get('value'), null,
                     "should have no value set");
-            })
+            });
     });
     test('removal', {asserts: 1}, function (instance, $fix, mock) {
         var view = makeSearchView(instance);
@@ -1361,7 +1414,7 @@ openerp.testing.section('search.invisible', {
         }, ['<search>',
                 '<field name="field0"/>',
                 '<field name="field1" modifiers="{&quot;invisible&quot;: true}"/>',
-            '</search>'].join());
+            '</search>'].join(''));
         return view.appendTo($fix)
         .then(function () {
             var done = $.Deferred();
@@ -1380,7 +1433,7 @@ openerp.testing.section('search.invisible', {
             '<search>',
                 '<filter string="filter 0"/>',
                 '<filter string="filter 1" modifiers="{&quot;invisible&quot;: true}"/>',
-            '</search>'].join());
+            '</search>'].join(''));
         return view.appendTo($fix)
         .then(function () {
             var $fs = $fix.find('.oe_searchview_filters ul');
@@ -1400,6 +1453,26 @@ openerp.testing.section('search.invisible', {
             return done;
         });
     });
+    test('invisible-previous-sibling', {asserts: 3}, function (instance, $fix, mock) {
+        var view = makeView(instance, mock, {}, [
+            '<search>',
+                '<filter string="filter 0" context="{&quot;test&quot;: 0}"/>',
+                '<filter string="filter 1" modifiers="{&quot;invisible&quot;: true}" context="{&quot;test&quot;: 1}"/>',
+                '<filter string="filter 2" modifiers="{&quot;invisible&quot;: true}" context="{&quot;test&quot;: 2}"/>',
+                '<filter string="filter 3" context="{&quot;test&quot;: 3}"/>',
+            '</search>'].join(''));
+        return view.appendTo($fix)
+        .done(function () {
+            // Select filter 3
+            $fix.find('.oe_searchview_filters ul li:contains("filter 3")').click();
+            equal(view.query.length, 1, "should have selected a filter");
+            var facet = view.query.at(0);
+            strictEqual(facet.values.at(0).get('label'), "filter 3",
+                        "should have correctly labelled the facet");
+            deepEqual(view.build_search_data().contexts, [{test: 3}],
+                      "should have built correct context");
+        });
+    });
     // Invisible filter groups should not appear in the drawer
     // Group invisibility should be inherited by children
     test('group-invisibility', {asserts: 6}, function (instance, $fix, mock) {
diff --git a/addons/web/static/test/testing.js b/addons/web/static/test/testing.js
index 5bd008ad7ec..ff1aae22663 100644
--- a/addons/web/static/test/testing.js
+++ b/addons/web/static/test/testing.js
@@ -21,7 +21,7 @@ openerp.testing.section('testing.stack', function (test) {
         return s.execute(function () {
             return $.when(42);
         }).then(function (val) {
-            strictEqual(val, 42, "should return the handler value")
+            strictEqual(val, 42, "should return the handler value");
         });
     });
     test('direct, deferred, failure', {asserts: 1}, function () {

From ec9ae7ec813999f721136f8006c5028e376b37da Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Jul 2013 13:30:41 +0200
Subject: [PATCH 193/197] Does not allow functions in loops anymore

bzr revid: nicolas.vanhoren@openerp.com-20130725113041-n6u9gyo1vbv1blw5
---
 addons/web/Gruntfile.js               |  1 -
 addons/web/static/src/js/corelib.js   |  8 ++++----
 addons/web/static/src/js/view_list.js | 15 ++++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/web/Gruntfile.js b/addons/web/Gruntfile.js
index d1e897d8e20..e821504c4d1 100644
--- a/addons/web/Gruntfile.js
+++ b/addons/web/Gruntfile.js
@@ -7,7 +7,6 @@ module.exports = function(grunt) {
         sub: true, //[] instead of .
         evil: true, //eval
         laxbreak: true, //unsafe line breaks
-        loopfunc: true, // functions in loops
       },
     }
   });
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 07874f763af..6ab7a30c642 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -96,7 +96,7 @@ openerp.web.corelib = function(instance) {
         initializing = false;
 
         // Copy the properties over onto the new prototype
-        for (var name in prop) {
+        _.each(prop, function(val, name) {
             // Check if we're overwriting an existing function
             prototype[name] = typeof prop[name] == "function" &&
                               fnTest.test(prop[name]) ?
@@ -117,7 +117,7 @@ openerp.web.corelib = function(instance) {
                         };
                     })(name, prop[name]) :
                     prop[name];
-        }
+        });
 
         // The dummy class constructor
         function Class() {
@@ -132,7 +132,7 @@ openerp.web.corelib = function(instance) {
             return this;
         }
         Class.include = function (properties) {
-            for (var name in properties) {
+            _.each(properties, function(val, name) {
                 if (typeof properties[name] !== 'function'
                         || !fnTest.test(properties[name])) {
                     prototype[name] = properties[name];
@@ -158,7 +158,7 @@ openerp.web.corelib = function(instance) {
                         };
                     })(name, properties[name]);
                 }
-            }
+            });
         };
 
         // Populate our constructed prototype object
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 3e34a895321..75c8f3c7e84 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1519,6 +1519,13 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     // if drag to 1st row (to = 0), start sequencing from 0
                     // (exclusive lower bound)
                     seq = to ? list.records.at(to - 1).get(seqname) : 0;
+                var fct = function (dataset, id, seq) {
+                    $.async_when().done(function () {
+                        var attrs = {};
+                        attrs[seqname] = seq;
+                        dataset.write(id, attrs);
+                    });
+                };
                 while (++seq, (record = list.records.at(index++))) {
                     // write are independent from one another, so we can just
                     // launch them all at the same time and we don't really
@@ -1526,13 +1533,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we
                     // FIXME: breaks on o2ms (e.g. Accounting > Financial
                     //        Accounting > Taxes > Taxes, child tax accounts)
                     //        when synchronous (without setTimeout)
-                    (function (dataset, id, seq) {
-                        $.async_when().done(function () {
-                            var attrs = {};
-                            attrs[seqname] = seq;
-                            dataset.write(id, attrs);
-                        });
-                    }(dataset, record.get('id'), seq));
+                    fct(dataset, record.get('id'), seq);
                     record.set(seqname, seq);
                 }
             }

From faffe8805cc17b30c239f8399432b48daf1a6a6b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 25 Jul 2013 14:07:42 +0200
Subject: [PATCH 194/197] Minor modifs to grunt file

bzr revid: nicolas.vanhoren@openerp.com-20130725120742-0omjb6l80kwon2vi
---
 addons/web/Gruntfile.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/web/Gruntfile.js b/addons/web/Gruntfile.js
index e821504c4d1..cbc650492b6 100644
--- a/addons/web/Gruntfile.js
+++ b/addons/web/Gruntfile.js
@@ -1,20 +1,20 @@
 module.exports = function(grunt) {
 
-  grunt.initConfig({
-    jshint: {
-      files: ['static/src/**/*.js', 'static/test/**/*.js'],
-      options: {
-        sub: true, //[] instead of .
-        evil: true, //eval
-        laxbreak: true, //unsafe line breaks
-      },
-    }
-  });
+    grunt.initConfig({
+        jshint: {
+            src: ['static/src/**/*.js', 'static/test/**/*.js'],
+            options: {
+                sub: true, //[] instead of .
+                evil: true, //eval
+                laxbreak: true, //unsafe line breaks
+            },
+        }
+    });
 
-  grunt.loadNpmTasks('grunt-contrib-jshint');
+    grunt.loadNpmTasks('grunt-contrib-jshint');
 
-  grunt.registerTask('test', ['jshint']);
+    grunt.registerTask('test', ['jshint']);
 
-  grunt.registerTask('default', ['jshint']);
+    grunt.registerTask('default', ['jshint']);
 
 };
\ No newline at end of file

From da25e7858db08b34bc8ca9cca2449c7a6aafcb0e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 25 Jul 2013 14:28:04 +0200
Subject: [PATCH 195/197] [FIX]google_spreadsheet: i18n add pot file

bzr revid: dle@openerp.com-20130725122804-sx4airv20d7a278s
---
 .../i18n/google_spreadsheet.pot               | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 addons/google_spreadsheet/i18n/google_spreadsheet.pot

diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
new file mode 100644
index 00000000000..c90358af80c
--- /dev/null
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -0,0 +1,47 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* google_spreadsheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 8.0alpha1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-25 12:25+0000\n"
+"PO-Revision-Date: 2013-07-25 12:25+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: google_spreadsheet
+#: view:ir.attachment:0
+msgid "Google Spreadsheeets"
+msgstr ""
+
+#. module: google_spreadsheet
+#. openerp-web
+#: code:addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml:3
+#, python-format
+msgid "Add to Google Spreadsheet"
+msgstr ""
+
+#. module: google_spreadsheet
+#: view:ir.attachment:0
+msgid "Name"
+msgstr ""
+
+#. module: google_spreadsheet
+#: model:ir.actions.act_window,help:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
+#: model:ir.actions.act_window,name:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:google_spreadsheet.menu_reporting_dashboard_google_spreadsheets
+msgid "Google Spreadsheets"
+msgstr ""
+
+#. module: google_spreadsheet
+#: model:ir.model,name:google_spreadsheet.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+

From 2dc79142255bc9965b122d011583c9fb45f898af Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Thu, 25 Jul 2013 14:42:59 +0200
Subject: [PATCH 196/197] [FIX]google_spreadsheet: typo

bzr revid: dle@openerp.com-20130725124259-h6apjfjpu579tl6z
---
 .../google_spreadsheet_view.xml                 |  2 +-
 .../i18n/google_spreadsheet.pot                 | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/google_spreadsheet_view.xml
index f12798cc4bc..e99826dae52 100644
--- a/addons/google_spreadsheet/google_spreadsheet_view.xml
+++ b/addons/google_spreadsheet/google_spreadsheet_view.xml
@@ -8,7 +8,7 @@
             <field name="name">ir.attachment.google.spreadsheet.tree</field>
             <field name="model">ir.attachment</field>
             <field name="arch" type="xml">
-                <tree string="Google Spreadsheeets" version="7.0">
+                <tree string="Google Spreadsheets" version="7.0">
                     <field name="name" string="Name"/>
                     <field name="url" />
                 </tree>
diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
index c90358af80c..3cf39bd8df5 100644
--- a/addons/google_spreadsheet/i18n/google_spreadsheet.pot
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 8.0alpha1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-25 12:25+0000\n"
-"PO-Revision-Date: 2013-07-25 12:25+0000\n"
+"POT-Creation-Date: 2013-07-25 12:39+0000\n"
+"PO-Revision-Date: 2013-07-25 12:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,11 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: google_spreadsheet
+#: model:ir.actions.act_window,help:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
+#: model:ir.actions.act_window,name:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
 #: view:ir.attachment:0
-msgid "Google Spreadsheeets"
+#: model:ir.ui.menu,name:google_spreadsheet.menu_reporting_dashboard_google_spreadsheets
+msgid "Google Spreadsheets"
 msgstr ""
 
 #. module: google_spreadsheet
@@ -32,14 +35,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: google_spreadsheet
-#: model:ir.actions.act_window,help:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
-#: model:ir.actions.act_window,name:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
-#: view:ir.attachment:0
-#: model:ir.ui.menu,name:google_spreadsheet.menu_reporting_dashboard_google_spreadsheets
-msgid "Google Spreadsheets"
-msgstr ""
-
 #. module: google_spreadsheet
 #: model:ir.model,name:google_spreadsheet.model_google_drive_config
 msgid "Google Drive templates config"

From ff8af0b04d6015921aeb197d8d04321c0fa5202e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 26 Jul 2013 05:14:50 +0000
Subject: [PATCH 197/197] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130725051258-3nzwdk9vxqbek8el
bzr revid: launchpad_translations_on_behalf_of_openerp-20130726051450-12v8h0so01s5y7xn
---
 openerp/addons/base/i18n/es_MX.po | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index 9ea0e445a62..abcaf3a5e09 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-09-07 01:11+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-07-25 03:08+0000\n"
+"Last-Translator: Federico Manuel Echeverri Choux -  (  Vauxoo  ) "
+"<echeverrifm@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-07-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16696)\n"
+"X-Launchpad-Export-Date: 2013-07-26 05:14+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -613,7 +614,7 @@ msgstr ""
 #. module: base
 #: field:res.country,name:0
 msgid "Country Name"
-msgstr ""
+msgstr "Nombre del país"
 
 #. module: base
 #: model:res.country,name:base.co